Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged 47953 from trunk:

Browse Source 
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
This commit is contained in:
David Elliott
2007-08-08 04:06:59 +00:00
parent af32bcf456
commit c3030af596
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cocoa/stattext.mm
View File

@@ -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);