Remove support for OS X 10.6

If you want 10.6 to be supported in future releases, please submit
a patch for #448.

README.md

@@ -65,6 +65,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
    absolute and relative window size limits
  - Added `GLFW_TRUE` and `GLFW_FALSE` as client API independent boolean values
  - Removed dependency on external OpenGL or OpenGL ES headers
+ - [Cocoa] Removed support for OS X 10.6
  - [WGL] Removed dependency on external WGL headers
  - [GLX] Removed dependency on external GLX headers
  - [EGL] Removed dependency on external EGL headers

src/cocoa_window.m

@@ -99,18 +99,6 @@ static float transformY(float y)
     return height - y;
 }
 
-// Returns the backing rect of the specified window
-//
-static NSRect convertRectToBacking(_GLFWwindow* window, NSRect contentRect)
-{
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
-    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
-        return [window->ns.view convertRectToBacking:contentRect];
-    else
-#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
-        return contentRect;
-}
-
 // Translates OS X key modifiers into GLFW ones
 //
 static int translateFlags(NSUInteger flags)
@@ -181,7 +169,7 @@ static int translateKey(unsigned int key)
     }
 
     const NSRect contentRect = [window->ns.view frame];
-    const NSRect fbRect = convertRectToBacking(window, contentRect);
+    const NSRect fbRect = [window->ns.view convertRectToBacking:contentRect];
 
     _glfwInputFramebufferSize(window, fbRect.size.width, fbRect.size.height);
     _glfwInputWindowSize(window, contentRect.size.width, contentRect.size.height);
@@ -451,7 +439,7 @@ static int translateKey(unsigned int key)
 - (void)viewDidChangeBackingProperties
 {
     const NSRect contentRect = [window->ns.view frame];
-    const NSRect fbRect = convertRectToBacking(window, contentRect);
+    const NSRect fbRect = [window->ns.view convertRectToBacking:contentRect];
 
     _glfwInputFramebufferSize(window, fbRect.size.width, fbRect.size.height);
 }
@@ -542,23 +530,13 @@ static int translateKey(unsigned int key)
 {
     double deltaX, deltaY;
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+    deltaX = [event scrollingDeltaX];
-    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
+    deltaY = [event scrollingDeltaY];
-    {
-        deltaX = [event scrollingDeltaX];
-        deltaY = [event scrollingDeltaY];
 
-        if ([event hasPreciseScrollingDeltas])
+    if ([event hasPreciseScrollingDeltas])
-        {
-            deltaX *= 0.1;
-            deltaY *= 0.1;
-        }
-    }
-    else
-#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
     {
-        deltaX = [event deltaX];
+        deltaX *= 0.1;
-        deltaY = [event deltaY];
+        deltaY *= 0.1;
     }
 
     if (fabs(deltaX) > 0.0 || fabs(deltaY) > 0.0)
@@ -759,18 +737,12 @@ static void createMenuBar(void)
                           action:@selector(arrangeInFront:)
                    keyEquivalent:@""];
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+    // TODO: Make this appear at the bottom of the menu (for consistency)
-    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
+    [windowMenu addItem:[NSMenuItem separatorItem]];
-    {
+    [[windowMenu addItemWithTitle:@"Enter Full Screen"
-        // TODO: Make this appear at the bottom of the menu (for consistency)
+                           action:@selector(toggleFullScreen:)
-
+                    keyEquivalent:@"f"]
-        [windowMenu addItem:[NSMenuItem separatorItem]];
+     setKeyEquivalentModifierMask:NSControlKeyMask | NSCommandKeyMask];
-        [[windowMenu addItemWithTitle:@"Enter Full Screen"
-                               action:@selector(toggleFullScreen:)
-                        keyEquivalent:@"f"]
-            setKeyEquivalentModifierMask:NSControlKeyMask | NSCommandKeyMask];
-    }
-#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
 
     // Prior to Snow Leopard, we need to use this oddly-named semi-private API
     // to get the application menu working properly.
@@ -869,13 +841,8 @@ static GLFWbool createWindow(_GLFWwindow* window,
         return GLFW_FALSE;
     }
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+    if (wndconfig->resizable)
-    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
+        [window->ns.object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-    {
-        if (wndconfig->resizable)
-            [window->ns.object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-    }
-#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
 
     if (wndconfig->monitor)
     {
@@ -892,21 +859,14 @@ static GLFWbool createWindow(_GLFWwindow* window,
     window->ns.view = [[GLFWContentView alloc] initWithGlfwWindow:window];
 
 #if defined(_GLFW_USE_RETINA)
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+    [window->ns.view setWantsBestResolutionOpenGLSurface:YES];
-    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
-        [window->ns.view setWantsBestResolutionOpenGLSurface:YES];
-#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
 #endif /*_GLFW_USE_RETINA*/
 
     [window->ns.object setTitle:[NSString stringWithUTF8String:wndconfig->title]];
     [window->ns.object setDelegate:window->ns.delegate];
     [window->ns.object setAcceptsMouseMovedEvents:YES];
     [window->ns.object setContentView:window->ns.view];
-
+    [window->ns.object setRestorable:NO];
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
-    if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6)
-        [window->ns.object setRestorable:NO];
-#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
 
     return GLFW_TRUE;
 }
@@ -1030,7 +990,7 @@ void _glfwPlatformSetWindowAspectRatio(_GLFWwindow* window, int numer, int denom
 void _glfwPlatformGetFramebufferSize(_GLFWwindow* window, int* width, int* height)
 {
     const NSRect contentRect = [window->ns.view frame];
-    const NSRect fbRect = convertRectToBacking(window, contentRect);
+    const NSRect fbRect = [window->ns.view convertRectToBacking:contentRect];
 
     if (width)
         *width = (int) fbRect.size.width;
@@ -1179,14 +1139,9 @@ void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y)
     }
     else
     {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
         const NSRect localRect = NSMakeRect(x, contentRect.size.height - y - 1, 0, 0);
         const NSRect globalRect = [window->ns.object convertRectToScreen:localRect];
         const NSPoint globalPoint = globalRect.origin;
-#else
-        const NSPoint localPoint = NSMakePoint(x, contentRect.size.height - y - 1);
-        const NSPoint globalPoint = [window->ns.object convertBaseToScreen:localPoint];
-#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/
 
         CGWarpMouseCursorPosition(CGPointMake(globalPoint.x,
                                               transformY(globalPoint.y)));