X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f672c969519f7565cd80f85adeca5a6efdace8f5..8a31648287be0ef976f133de2786b137f1e98340:/src/osx/stattext_osx.cpp diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp index 0ff943ff6d..9c163f8b59 100644 --- a/src/osx/stattext_osx.cpp +++ b/src/osx/stattext_osx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/carbon/stattext.cpp +// Name: src/osx/stattext_osx.cpp // Purpose: wxStaticText // Author: Stefan Csomor // Modified by: @@ -35,13 +35,13 @@ bool wxStaticText::Create( wxWindow *parent, const wxSize& size, long style, const wxString& name ) -{ - m_macIsUserPane = false; - +{ + DontCreatePeer(); + if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) ) return false; - m_peer = wxWidgetImpl::CreateStaticText( this, parent, id, label, pos, size, style, GetExtraStyle() ); + SetPeer(wxWidgetImpl::CreateStaticText( this, parent, id, label, pos, size, style, GetExtraStyle() )); MacPostControlCreate( pos, size ); @@ -101,7 +101,7 @@ bool wxStaticText::SetFont(const wxFont& font) void wxStaticText::DoSetLabel(const wxString& label) { m_label = RemoveMnemonics(label); - m_peer->SetLabel(m_label , GetFont().GetEncoding() ); + GetPeer()->SetLabel(m_label , GetFont().GetEncoding() ); } #if wxUSE_MARKUP && wxOSX_USE_COCOA @@ -111,7 +111,7 @@ bool wxStaticText::DoSetLabelMarkup(const wxString& markup) if ( !wxStaticTextBase::DoSetLabelMarkup(markup) ) return false; - m_peer->SetLabelMarkup(markup); + GetPeer()->SetLabelMarkup(markup); return true; }