Change wxNotebook selection before sending page changed event in wxMSW.

[wxWidgets.git] / src / osx / tglbtn_osx.cpp

diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp
index 9c5e02bfcfee3041a38655ed441eed0478682747..c381cd4edafa0f5c51c35d9f78a07a0acc7bc369 100644 (file)
--- a/src/osx/tglbtn_osx.cpp
+++ b/src/osx/tglbtn_osx.cpp
@@ -47,14 +47,14 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString& name)
 {
-    m_macIsUserPane = FALSE ;
-
+    DontCreatePeer();
+    
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     m_labelOrig = m_label = label ;
 
-    m_peer = wxWidgetImpl::CreateToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
+    SetPeer(wxWidgetImpl::CreateToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() )) ;
 
     MacPostControlCreate(pos,size) ;
 
@@ -75,12 +75,12 @@ wxSize wxToggleButton::DoGetBestSize() const
 
 void wxToggleButton::SetValue(bool val)
 {
-    m_peer->SetValue( val ) ;
+    GetPeer()->SetValue( val ) ;
 }
 
 bool wxToggleButton::GetValue() const
 {
-    return m_peer->GetValue() ;
+    return GetPeer()->GetValue() ;
 }
 
 void wxToggleButton::Command(wxCommandEvent & event)
@@ -111,8 +111,8 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString& name)
 {
-    m_macIsUserPane = FALSE ;
-
+    DontCreatePeer();
+    
     m_bitmap = label;
 
     m_marginX =
@@ -121,7 +121,7 @@ bool wxBitmapToggleButton::Create(wxWindow *parent, wxWindowID id,
     if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
-    m_peer = wxWidgetImpl::CreateBitmapToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
+    SetPeer(wxWidgetImpl::CreateBitmapToggleButton( this, parent, id, label, pos, size, style, GetExtraStyle() ));
 
     MacPostControlCreate(pos,size) ;
 
@@ -142,12 +142,12 @@ wxSize wxBitmapToggleButton::DoGetBestSize() const
 
 void wxBitmapToggleButton::SetValue(bool val)
 {
-    m_peer->SetValue( val ) ;
+    GetPeer()->SetValue( val ) ;
 }
 
 bool wxBitmapToggleButton::GetValue() const
 {
-    return m_peer->GetValue() ;
+    return GetPeer()->GetValue() ;
 }
 
 void wxBitmapToggleButton::Command(wxCommandEvent & event)