X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..da14a87deeff28f76ac530fba5023edf4f694d83:/src/mac/carbon/stattext.cpp diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp index b6bb94d019..0898022392 100644 --- a/src/mac/carbon/stattext.cpp +++ b/src/mac/carbon/stattext.cpp @@ -17,14 +17,14 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/utils.h" + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/settings.h" #endif // WX_PRECOMP #include "wx/notebook.h" #include "wx/tabctrl.h" -#include "wx/dc.h" -#include "wx/dcclient.h" -#include "wx/utils.h" -#include "wx/settings.h" #include "wx/mac/uma.h" @@ -43,7 +43,7 @@ bool wxStaticText::Create( wxWindow *parent, { m_macIsUserPane = false; - m_label = wxStripMenuCodes( label ); + m_label = GetLabelText( label ); if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) ) return false; @@ -113,7 +113,7 @@ wxSize wxStaticText::DoGetBestSize() const void wxStaticText::SetLabel( const wxString& st ) { - m_label = wxStripMenuCodes( st ); + m_label = GetLabelText( st ); wxMacCFStringHolder str( m_label, m_font.GetEncoding() ); CFStringRef ref = str;