Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-30 13:57:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into EGL

Browse Source
This commit is contained in:
Camilla Berglund 2012-07-23 18:04:32 +02:00
commit 3bb04b3a76
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cocoa_native.m
View File

@ -41,7 +41,7 @@
// Returns the X11 handle of the specified window // Returns the X11 handle of the specified window
//======================================================================== //========================================================================
GLFWAPI id glfwGetCocoaWindow(GLFWwindow window) GLFWAPI id glfwGetCocoaWindow(GLFWwindow handle)
{ {
_GLFWwindow* window = (_GLFWwindow*) handle; _GLFWwindow* window = (_GLFWwindow*) handle;
@ -59,7 +59,7 @@ GLFWAPI id glfwGetCocoaWindow(GLFWwindow window)
// Return the GLX context of the specified window // Return the GLX context of the specified window
//======================================================================== //========================================================================
GLFWAPI id glfwGetNSGLContext(GLFWwindow window) GLFWAPI id glfwGetNSGLContext(GLFWwindow handle)
{ {
_GLFWwindow* window = (_GLFWwindow*) handle; _GLFWwindow* window = (_GLFWwindow*) handle;

2
src/cocoa_window.m
View File

@ -1170,7 +1170,7 @@ void _glfwPlatformSetCursorPos(_GLFWwindow* window, int x, int y)
{ {
if (window->mode == GLFW_FULLSCREEN) if (window->mode == GLFW_FULLSCREEN)
{ {
NSPoint globalPoint = NSMakePoint(x, y); CGPoint globalPoint = CGMakePoint(x, y);
CGDisplayMoveCursorToPoint(CGMainDisplayID(), globalPoint); CGDisplayMoveCursorToPoint(CGMainDisplayID(), globalPoint);
} }
else else