From 25c7ad170680e308161fb687ee344d42c37dca02 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Sun, 12 Aug 2012 14:14:03 +0200
Subject: [PATCH 1/2] Removed superfluous MakeContextCurrent.

---
 src/cocoa_window.m | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 446d718e..8cf749a5 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -927,8 +927,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
                                                  withOptions:nil];
     }
 
-    glfwMakeContextCurrent(window);
-
     NSPoint point = [[NSCursor currentCursor] hotSpot];
     window->cursorPosX = point.x;
     window->cursorPosY = point.y;

From cb447bee81ad3a7e7e3046cadd05ccce348643f6 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Sun, 12 Aug 2012 14:15:39 +0200
Subject: [PATCH 2/2] Cleanup of window resizable flag setting.

---
 src/cocoa_window.m | 4 ----
 src/win32_window.c | 1 -
 src/window.c       | 1 +
 src/x11_window.c   | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 8cf749a5..d7764f92 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -866,8 +866,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
     if (!initializeAppKit())
         return GL_FALSE;
 
-    window->resizable = wndconfig->resizable;
-
     // 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
     if (_glfwLibrary.NS.delegate == nil)
@@ -931,8 +929,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
     window->cursorPosX = point.x;
     window->cursorPosY = point.y;
 
-    window->resizable = wndconfig->resizable;
-
     return GL_TRUE;
 }
 
diff --git a/src/win32_window.c b/src/win32_window.c
index 00fb269d..65122eef 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -959,7 +959,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
     GLboolean recreateContext = GL_FALSE;
 
     window->Win32.desiredRefreshRate = wndconfig->refreshRate;
-    window->resizable = wndconfig->resizable;
 
     if (!_glfwLibrary.Win32.classAtom)
     {
diff --git a/src/window.c b/src/window.c
index df592751..8da2f580 100644
--- a/src/window.c
+++ b/src/window.c
@@ -300,6 +300,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
     window->width      = width;
     window->height     = height;
     window->mode       = mode;
+    window->resizable  = wndconfig.resizable;
     window->cursorMode = GLFW_CURSOR_NORMAL;
     window->systemKeys = GL_TRUE;
 
diff --git a/src/x11_window.c b/src/x11_window.c
index 05d1be83..442e76c0 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -889,7 +889,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
                               const _GLFWfbconfig* fbconfig)
 {
     window->refreshRate = wndconfig->refreshRate;
-    window->resizable   = wndconfig->resizable;
 
     if (!_glfwCreateContext(window, wndconfig, fbconfig))
         return GL_FALSE;