From dd298ab908cd29180eb5a9e65cdce9486531bfeb Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 23 Jul 2012 00:48:30 +0200 Subject: [PATCH 1/2] Fixed copypaste errors. --- src/cocoa_native.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cocoa_native.m b/src/cocoa_native.m index 2b90bc24..be8aac4b 100644 --- a/src/cocoa_native.m +++ b/src/cocoa_native.m @@ -41,7 +41,7 @@ // Returns the X11 handle of the specified window //======================================================================== -GLFWAPI id glfwGetCocoaWindow(GLFWwindow window) +GLFWAPI id glfwGetCocoaWindow(GLFWwindow handle) { _GLFWwindow* window = (_GLFWwindow*) handle; @@ -59,7 +59,7 @@ GLFWAPI id glfwGetCocoaWindow(GLFWwindow window) // Return the GLX context of the specified window //======================================================================== -GLFWAPI id glfwGetNSGLContext(GLFWwindow window) +GLFWAPI id glfwGetNSGLContext(GLFWwindow handle) { _GLFWwindow* window = (_GLFWwindow*) handle; From 52ebc0db852ea5c31be6d9c9504403c6468d57ef Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 23 Jul 2012 00:50:52 +0200 Subject: [PATCH 2/2] Fixed use of wrong point type. --- src/cocoa_window.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 3523806a..fd57040e 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1163,7 +1163,7 @@ void _glfwPlatformSetCursorPos(_GLFWwindow* window, int x, int y) { if (window->mode == GLFW_FULLSCREEN) { - NSPoint globalPoint = NSMakePoint(x, y); + CGPoint globalPoint = CGMakePoint(x, y); CGDisplayMoveCursorToPoint(CGMainDisplayID(), globalPoint); } else