Use static wxControl::GetLabelText in preference to wxStripMenuCodes with the wxStrip...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/stattext.mm b/src/cocoa/stattext.mm
index 4c948ba801967ebf8487b4377399d534d35288c0..8fc1b823dfd83739236e465570081df029279b26 100644 (file)
--- 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(wxStripMenuCodes(label, wxStrip_Mnemonics))];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(GetLabelText(label))];
 //    [GetNSTextField() setBordered: NO];
     [GetNSTextField() setBezeled: NO];
     [GetNSTextField() setEditable: NO];
@@ -70,7 +70,7 @@ wxStaticText::~wxStaticText()
 
 void wxStaticText::SetLabel(const wxString& label)
 {
-    [GetNSTextField() setStringValue:wxNSStringWithWxString(wxStripMenuCodes(label, wxStrip_Mnemonics))];
+    [GetNSTextField() setStringValue:wxNSStringWithWxString(GetLabelText(label))];
     NSRect oldFrameRect = [GetNSTextField() frame];
     NSView *superview = [GetNSTextField() superview];
     wxLogTrace(wxTRACE_COCOA_Window_Size, wxT("wxStaticText::SetLabel Old Position: (%d,%d)"), GetPosition().x, GetPosition().y);