X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22756322824e8f377b792897209d052ca9281534..00ba1af984e6771a2cfd3da8c292e7031c21d242:/src/osx/button_osx.cpp diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp index be20338e92..da30664452 100644 --- a/src/osx/button_osx.cpp +++ b/src/osx/button_osx.cpp @@ -56,6 +56,8 @@ bool wxButton::Create(wxWindow *parent, const wxValidator& validator, const wxString& name) { + DontCreatePeer(); + m_marginX = m_marginY = 0; @@ -81,7 +83,6 @@ bool wxButton::Create(wxWindow *parent, : labelOrig; } - m_macIsUserPane = false ; if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) ) return false; @@ -202,16 +203,15 @@ bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) ) bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, long style,const wxValidator& validator, const wxString& name ) -{ - m_macIsUserPane = false ; - +{ + DontCreatePeer(); if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) return false; SetPeer(wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() )); MacPostControlCreate( pos, size ); - // passing the text in the param doesn't seem to work, so lets do it again + // passing the text in the param doesn't seem to work, so let's do it again SetLabel( label ); return true;