From de54efc84e92e46f549dfdda82102ffc39df72b5 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 6 Jul 2011 09:32:10 -0600
Subject: [PATCH] cocoa: fix "&" handling in menu-item labels  Closes PR 12025

---
 collects/mred/private/wx/cocoa/menu-item.rkt | 2 +-
 collects/tests/gracket/item.rkt              | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/collects/mred/private/wx/cocoa/menu-item.rkt b/collects/mred/private/wx/cocoa/menu-item.rkt
index bea50304ee..5005f67b72 100644
--- a/collects/mred/private/wx/cocoa/menu-item.rkt
+++ b/collects/mred/private/wx/cocoa/menu-item.rkt
@@ -61,7 +61,7 @@
         (send submenu install menu label enabled?)
         (let ([item (as-objc-allocation
                      (tell (tell MyMenuItem alloc) 
-                           initWithTitle: #:type _NSString (regexp-replace #rx"\t.*" label "")
+                           initWithTitle: #:type _NSString (clean-menu-label (regexp-replace #rx"\t.*" label ""))
                            action: #:type _SEL #f
                            keyEquivalent: #:type _NSString ""))])
           (set-ivar! item wxb (->wxb this))
diff --git a/collects/tests/gracket/item.rkt b/collects/tests/gracket/item.rkt
index b4b3bf12b5..cb413abc37 100644
--- a/collects/tests/gracket/item.rkt
+++ b/collects/tests/gracket/item.rkt
@@ -266,6 +266,10 @@
 					 "[on-demand hook]"
 					 m
 					 void)
+			    (make-object menu-item%
+					 "6 && Half-D&ozen"
+					 m
+					 void)
 			    (let mloop ([m m][sub-at-50? #t])
 			      (let ([sm (if (and sub-at-50?
 						 (send e button-down? 'middle))
@@ -750,7 +754,8 @@
 			tab grp)]
 	   [canvas  (make-object popup-test-canvas% 
 				 items
-				 (list "h slider" "v slider"
+				 (list "combo"
+                                       "h slider" "v slider"
 				       "v gauge" "v gauge"
 				       ; "text msg" "image msg"
 				       "text"