mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 09:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tls

Browse Source
This commit is contained in:
Camilla Berglund 2012-08-12 15:28:26 +02:00
commit d03c8507e6
4 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cocoa_window.m
View File

@ -866,8 +866,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
if (!initializeAppKit()) if (!initializeAppKit())
return GL_FALSE; return GL_FALSE;
window->resizable = wndconfig->resizable;
// We can only have one application delegate, but we only allocate it the // We can only have one application delegate, but we only allocate it the
// first time we create a window to keep all window code in this file // first time we create a window to keep all window code in this file
if (_glfwLibrary.NS.delegate == nil) if (_glfwLibrary.NS.delegate == nil)
@ -927,14 +925,10 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
withOptions:nil]; withOptions:nil];
} }
glfwMakeContextCurrent(window);
NSPoint point = [[NSCursor currentCursor] hotSpot]; NSPoint point = [[NSCursor currentCursor] hotSpot];
window->cursorPosX = point.x; window->cursorPosX = point.x;
window->cursorPosY = point.y; window->cursorPosY = point.y;
window->resizable = wndconfig->resizable;
return GL_TRUE; return GL_TRUE;
} }

1
src/win32_window.c
View File

@ -959,7 +959,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
GLboolean recreateContext = GL_FALSE; GLboolean recreateContext = GL_FALSE;
window->Win32.desiredRefreshRate = wndconfig->refreshRate; window->Win32.desiredRefreshRate = wndconfig->refreshRate;
window->resizable = wndconfig->resizable;
if (!_glfwLibrary.Win32.classAtom) if (!_glfwLibrary.Win32.classAtom)
{ {

1
src/window.c
View File

@ -300,6 +300,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
window->width = width; window->width = width;
window->height = height; window->height = height;
window->mode = mode; window->mode = mode;
window->resizable = wndconfig.resizable;
window->cursorMode = GLFW_CURSOR_NORMAL; window->cursorMode = GLFW_CURSOR_NORMAL;
window->systemKeys = GL_TRUE; window->systemKeys = GL_TRUE;

1
src/x11_window.c
View File

@ -889,7 +889,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig)
{ {
window->refreshRate = wndconfig->refreshRate; window->refreshRate = wndconfig->refreshRate;
window->resizable = wndconfig->resizable;
if (!_glfwCreateContext(window, wndconfig, fbconfig)) if (!_glfwCreateContext(window, wndconfig, fbconfig))
return GL_FALSE; return GL_FALSE;