From 321a3be29f121f4acc11bfff58cbce22ecdb383a Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@Matthews-Mac-mini.local>
Date: Fri, 29 Aug 2014 14:53:47 -0600
Subject: [PATCH] racket/gui cocoa: adjust control font for 10.10

---
 pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/procs.rkt | 8 +++++++-
 pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/utils.rkt | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/procs.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/procs.rkt
index c0f9f1b6f8..dc318f9789 100644
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/procs.rkt
+++ b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/procs.rkt
@@ -86,7 +86,13 @@
 
 (define (get-double-click-time)
   500)
-(define (get-control-font-face) "Lucida Grande")
+(define (get-control-font-face)
+  ;; Using `(tell NSFont systemFontOfSize: ...)` gives us an OS-determined
+  ;; font, but my attempts to extract the name give something like ".LucidaGrandeUI"
+  ;; instead of "Lucida Grande"
+  (cond
+   [(version-10.10-or-later?) "Helvetica Neue"]
+   [else "Lucida Grande"]))
 (define (get-control-font-size) 13)
 (define (get-control-font-size-in-pixels?) #f)
 (define (cancel-quit) (void))
diff --git a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/utils.rkt b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/utils.rkt
index 37d71d6637..6f06abbdc5 100644
--- a/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/utils.rkt
+++ b/pkgs/gui-pkgs/gui-lib/mred/private/wx/cocoa/utils.rkt
@@ -23,7 +23,8 @@
               ->wx
               old-cocoa?
               version-10.6-or-later?
-              version-10.7-or-later?)
+              version-10.7-or-later?
+              version-10.10-or-later?)
  with-autorelease
  call-with-autorelease
  define-mz)
@@ -80,3 +81,5 @@
   (NSAppKitVersionNumber . >= . 1038))
 (define (version-10.7-or-later?)
   (NSAppKitVersionNumber . >= . 1138))
+(define (version-10.10-or-later?)
+  (NSAppKitVersionNumber . >= . 1331))