From 4f5c9325a12b584750e7a4006caac8c0ed0a69a9 Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Fri, 20 Jul 2007 04:13:54 +0000
Subject: [PATCH] Merged trunk 47570: Strip mnemonics from the label before
 passing it to Cocoa.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/cocoa/stattext.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index 4bba022c27..da5ecd6806 100644
--- a/src/cocoa/stattext.mm
+++ b/src/cocoa/stattext.mm
@@ -44,7 +44,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID winid,
     m_cocoaNSView = NULL;
     SetNSTextField([[NSTextField alloc] initWithFrame:MakeDefaultNSRect(size)]);
     [m_cocoaNSView release];
-    [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(wxStripMenuCodes(label, wxStrip_Mnemonics))];
 //    [GetNSTextField() setBordered: NO];
     [GetNSTextField() setBezeled: NO];
     [GetNSTextField() setEditable: NO];
@@ -70,7 +70,7 @@ wxStaticText::~wxStaticText()
 
 void wxStaticText::SetLabel(const wxString& label)
 {
-    [GetNSTextField() setStringValue:wxNSStringWithWxString(label)];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(wxStripMenuCodes(label, wxStrip_Mnemonics))];
     NSRect oldFrameRect = [GetNSTextField() frame];
     NSView *superview = [GetNSTextField() superview];
     wxLogTrace(wxTRACE_COCOA_Window_Size, wxT("wxStaticText::SetLabel Old Position: (%d,%d)"), GetPosition().x, GetPosition().y);