X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f672c969519f7565cd80f85adeca5a6efdace8f5..bbfd45484113ff0bafcd0007a4b6faecc7909561:/src/osx/button_osx.cpp

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 358fffffd3..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;
@@ -89,7 +90,7 @@ bool wxButton::Create(wxWindow *parent,
     m_labelOrig =
     m_label = label ;
 
-    m_peer = wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() );
+    SetPeer(wxWidgetImpl::CreateButton( this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate( pos, size );
 
@@ -126,10 +127,10 @@ void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
     m_bitmaps[which] = bitmap;
 
     if ( which == State_Normal )
-        m_peer->SetBitmap(bitmap);
+        GetPeer()->SetBitmap(bitmap);
     else if ( which == State_Pressed )
     {
-        wxButtonImpl* bi = dynamic_cast<wxButtonImpl*> (m_peer);
+        wxButtonImpl* bi = dynamic_cast<wxButtonImpl*> (GetPeer());
         if ( bi )
             bi->SetPressedBitmap(bitmap);
     }
@@ -138,7 +139,7 @@ void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)
 
 void wxButton::DoSetBitmapPosition(wxDirection dir)
 {
-    m_peer->SetBitmapPosition(dir);
+    GetPeer()->SetBitmapPosition(dir);
     InvalidateBestSize();
 }
 
@@ -149,7 +150,7 @@ bool wxButton::DoSetLabelMarkup(const wxString& markup)
     if ( !wxButtonBase::DoSetLabelMarkup(markup) )
         return false;
 
-    m_peer->SetLabelMarkup(markup);
+    GetPeer()->SetLabelMarkup(markup);
 
     return true;
 }
@@ -165,27 +166,27 @@ wxWindow *wxButton::SetDefault()
         btnOldDefault->GetPeer()->SetDefaultButton( false );
     }
 
-    m_peer->SetDefaultButton( true );
+    GetPeer()->SetDefaultButton( true );
 
     return btnOldDefault;
 }
 
 void wxButton::Command (wxCommandEvent & WXUNUSED(event))
 {
-    m_peer->PerformClick() ;
+    GetPeer()->PerformClick() ;
     // ProcessCommand(event);
 }
 
 void wxButton::OnEnterWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )
-        m_peer->SetBitmap( DoGetBitmap( State_Current ) );
+        GetPeer()->SetBitmap( DoGetBitmap( State_Current ) );
 }
 
 void wxButton::OnLeaveWindow( wxMouseEvent& WXUNUSED(event))
 {
     if ( DoGetBitmap( State_Current ).IsOk() )
-        m_peer->SetBitmap( DoGetBitmap( State_Normal ) );
+        GetPeer()->SetBitmap( DoGetBitmap( State_Normal ) );
 }
 
 bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
@@ -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;
 
-    m_peer = wxWidgetImpl::CreateDisclosureTriangle(this, parent, id, label, pos, size, style, GetExtraStyle() );
+    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;
@@ -219,12 +219,12 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
 
 void wxDisclosureTriangle::SetOpen( bool open )
 {
-    m_peer->SetValue( open ? 1 : 0 );
+    GetPeer()->SetValue( open ? 1 : 0 );
 }
 
 bool wxDisclosureTriangle::IsOpen() const
 {
-   return m_peer->GetValue() == 1;
+   return GetPeer()->GetValue() == 1;
 }
 
 bool wxDisclosureTriangle::OSXHandleClicked( double WXUNUSED(timestampsec) )