From 3941a5d04f71a7d17f9ad341b30e2d6acde098c8 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 3 Oct 2011 17:37:56 -0600
Subject: [PATCH] cocoa: make grow-box-spacer zero-width for 10.7

---
 collects/mred/private/wx/cocoa/platform.rkt | 3 ++-
 collects/mred/private/wx/cocoa/procs.rkt    | 6 +++++-
 collects/mred/private/wx/cocoa/utils.rkt    | 5 ++++-
 collects/mred/private/wx/gtk/platform.rkt   | 3 ++-
 collects/mred/private/wx/gtk/procs.rkt      | 5 ++++-
 collects/mred/private/wx/platform.rkt       | 3 ++-
 collects/mred/private/wx/win32/platform.rkt | 3 ++-
 collects/mred/private/wx/win32/procs.rkt    | 5 ++++-
 collects/mred/private/wxpanel.rkt           | 3 +--
 9 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/collects/mred/private/wx/cocoa/platform.rkt b/collects/mred/private/wx/cocoa/platform.rkt
index 4a3e344275..6ec950eba9 100644
--- a/collects/mred/private/wx/cocoa/platform.rkt
+++ b/collects/mred/private/wx/cocoa/platform.rkt
@@ -88,4 +88,5 @@
    make-screen-bitmap
    make-gl-bitmap
    check-for-break
-   key-symbol-to-menu-key))
+   key-symbol-to-menu-key
+   needs-grow-box-spacer?))
diff --git a/collects/mred/private/wx/cocoa/procs.rkt b/collects/mred/private/wx/cocoa/procs.rkt
index 374c7b5975..13730a60da 100644
--- a/collects/mred/private/wx/cocoa/procs.rkt
+++ b/collects/mred/private/wx/cocoa/procs.rkt
@@ -62,7 +62,8 @@
  play-sound
  file-creator-and-type
  file-selector
- key-symbol-to-menu-key)
+ key-symbol-to-menu-key
+ needs-grow-box-spacer?)
 
 (import-class NSScreen NSCursor NSMenu)
 
@@ -188,3 +189,6 @@
 
 (define (get-highlight-text-color)
   #f)
+
+(define (needs-grow-box-spacer?)
+  (not (version-10.7-or-later?)))
diff --git a/collects/mred/private/wx/cocoa/utils.rkt b/collects/mred/private/wx/cocoa/utils.rkt
index fff2a03204..67a3032501 100644
--- a/collects/mred/private/wx/cocoa/utils.rkt
+++ b/collects/mred/private/wx/cocoa/utils.rkt
@@ -22,7 +22,8 @@
               ->wxb
               ->wx
               old-cocoa?
-              version-10.6-or-later?)
+              version-10.6-or-later?
+              version-10.7-or-later?)
  define-mz)
 
 (define cocoa-lib (ffi-lib (format "/System/Library/Frameworks/Cocoa.framework/Cocoa")))
@@ -87,3 +88,5 @@
   (NSAppKitVersionNumber . < . 949))
 (define (version-10.6-or-later?)
   (NSAppKitVersionNumber . >= . 1038))
+(define (version-10.7-or-later?)
+  (NSAppKitVersionNumber . >= . 1138))
diff --git a/collects/mred/private/wx/gtk/platform.rkt b/collects/mred/private/wx/gtk/platform.rkt
index 48e89316b0..a54adf28b5 100644
--- a/collects/mred/private/wx/gtk/platform.rkt
+++ b/collects/mred/private/wx/gtk/platform.rkt
@@ -89,4 +89,5 @@
    make-screen-bitmap
    make-gl-bitmap
    check-for-break
-   key-symbol-to-menu-key))
+   key-symbol-to-menu-key
+   needs-grow-box-spacer?))
diff --git a/collects/mred/private/wx/gtk/procs.rkt b/collects/mred/private/wx/gtk/procs.rkt
index 5bb9eae42c..cacf3d1829 100644
--- a/collects/mred/private/wx/gtk/procs.rkt
+++ b/collects/mred/private/wx/gtk/procs.rkt
@@ -58,7 +58,8 @@
  get-panel-background
  fill-private-color
  get-color-from-user
- key-symbol-to-menu-key)
+ key-symbol-to-menu-key
+ needs-grow-box-spacer?)
 
 (define (find-graphical-system-path what)
   (case what
@@ -155,3 +156,5 @@
     bm))
 
 (define (check-for-break) #f)
+
+(define (needs-grow-box-spacer?) #f)
diff --git a/collects/mred/private/wx/platform.rkt b/collects/mred/private/wx/platform.rkt
index 23f9221017..352f6366a9 100644
--- a/collects/mred/private/wx/platform.rkt
+++ b/collects/mred/private/wx/platform.rkt
@@ -75,5 +75,6 @@
                 make-screen-bitmap
                 make-gl-bitmap
                 check-for-break
-                key-symbol-to-menu-key)
+                key-symbol-to-menu-key
+                needs-grow-box-spacer?)
   ((dynamic-require platform-lib 'platform-values)))
diff --git a/collects/mred/private/wx/win32/platform.rkt b/collects/mred/private/wx/win32/platform.rkt
index b390f41033..0a70c3d3b2 100644
--- a/collects/mred/private/wx/win32/platform.rkt
+++ b/collects/mred/private/wx/win32/platform.rkt
@@ -89,4 +89,5 @@
    make-screen-bitmap
    make-gl-bitmap
    check-for-break
-   key-symbol-to-menu-key))
+   key-symbol-to-menu-key
+   needs-grow-box-spacer?))
diff --git a/collects/mred/private/wx/win32/procs.rkt b/collects/mred/private/wx/win32/procs.rkt
index 13c9db0e36..7c7f6d8752 100644
--- a/collects/mred/private/wx/win32/procs.rkt
+++ b/collects/mred/private/wx/win32/procs.rkt
@@ -57,7 +57,8 @@
  special-control-key
  special-option-key
  get-color-from-user
- key-symbol-to-menu-key)
+ key-symbol-to-menu-key
+ needs-grow-box-spacer?)
 
 (define (find-graphical-system-path what)
   #f)
@@ -113,3 +114,5 @@
   (make-object win32-bitmap% w h #f c))
 
 (define (check-for-break) #f)
+
+(define (needs-grow-box-spacer?) #f)
diff --git a/collects/mred/private/wxpanel.rkt b/collects/mred/private/wxpanel.rkt
index 73f9f93311..5a216333d1 100644
--- a/collects/mred/private/wxpanel.rkt
+++ b/collects/mred/private/wxpanel.rkt
@@ -841,8 +841,7 @@
   (define wx-grow-box-pane%
     (class100 (wx-make-pane% wx:windowless-panel% #f) (mred proxy parent style label)
       (override
-	[init-min (lambda (x) (if (or (eq? (system-type) 'macos)
-				      (eq? (system-type) 'macosx))
+	[init-min (lambda (x) (if (wx:needs-grow-box-spacer?)
 				  15
 				  0))])
       (sequence