From 584287483b0aae37174cfa8cc65589203bff2cdd Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Tue, 16 Nov 2010 17:08:14 -0700
Subject: [PATCH] cocoa: avoid another 10.6-only method  Closes PR 11440

---
 collects/mred/private/wx/cocoa/filedialog.rkt |  4 +++-
 collects/mred/private/wx/cocoa/menu.rkt       |  2 +-
 collects/mred/private/wx/cocoa/utils.rkt      | 13 +++++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/collects/mred/private/wx/cocoa/filedialog.rkt b/collects/mred/private/wx/cocoa/filedialog.rkt
index d73cc60d0a..7ffc630d31 100644
--- a/collects/mred/private/wx/cocoa/filedialog.rkt
+++ b/collects/mred/private/wx/cocoa/filedialog.rkt
@@ -74,7 +74,9 @@
            ;; all other eventspaces and threads. It would be nice to improve
            ;; on this, but it's good enough.
            (atomically
-            (let ([front (get-front)])
+            (let ([front (get-front)]
+                  [parent (and (version-10.6-or-later?)
+                               parent)])
               (when parent
                 (tellv ns beginSheetModalForWindow: (send parent get-cocoa-window)
                        completionHandler: #f))
diff --git a/collects/mred/private/wx/cocoa/menu.rkt b/collects/mred/private/wx/cocoa/menu.rkt
index a7b8bd318e..0162bc21c8 100644
--- a/collects/mred/private/wx/cocoa/menu.rkt
+++ b/collects/mred/private/wx/cocoa/menu.rkt
@@ -63,7 +63,7 @@
       (create-menu "menu")
       (let ([b (box #f)])
         (set! popup-box b)
-        (if #t ;; use the 10.5 code, for now
+        (if (not (version-10.6-or-later?))
             ;; For 10.5 and earlier:
             (let ([p (tell #:type _NSPoint v
                            convertPoint: #:type _NSPoint (make-NSPoint x y)
diff --git a/collects/mred/private/wx/cocoa/utils.rkt b/collects/mred/private/wx/cocoa/utils.rkt
index 02d1a0b069..fff2a03204 100644
--- a/collects/mred/private/wx/cocoa/utils.rkt
+++ b/collects/mred/private/wx/cocoa/utils.rkt
@@ -21,7 +21,8 @@
               clean-menu-label
               ->wxb
               ->wx
-              old-cocoa?)
+              old-cocoa?
+              version-10.6-or-later?)
  define-mz)
 
 (define cocoa-lib (ffi-lib (format "/System/Library/Frameworks/Cocoa.framework/Cocoa")))
@@ -79,6 +80,10 @@
   (and wxb
        (weak-box-value wxb)))
 
-;; FIXME: need a better test:
-(define old-cocoa? (equal? (path->string (system-library-subpath #f))
-                           "ppc-macosx"))
+(define-appkit NSAppKitVersionNumber _double)
+
+(define old-cocoa? 
+  ; earlier than 10.5?
+  (NSAppKitVersionNumber . < . 949))
+(define (version-10.6-or-later?)
+  (NSAppKitVersionNumber . >= . 1038))