From c3030af596e9b8c48814fe1e700ce23967c02ba8 Mon Sep 17 00:00:00 2001 From: David Elliott Date: Wed, 8 Aug 2007 04:06:59 +0000 Subject: [PATCH] Merged 47953 from trunk: Use static wxControl::GetLabelText in preference to wxStripMenuCodes with the wxStrip_Mnemonics flag for readability. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47954 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 4c948ba801..8fc1b823df 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(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);