mirror of
https://github.com/glfw/glfw.git
synced 2024-11-11 13:03:52 +00:00
Merge branch 'master' into EGL
This commit is contained in:
commit
3bb04b3a76
@ -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;
|
||||
|
||||
|
@ -1170,7 +1170,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
|
||||
|
Loading…
Reference in New Issue
Block a user