Document wxPopupTransientWindow.

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

diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp
index 49751e2acdf03b8cb3b2173eaae1399296df3151..1830c610d91bc0cfd204461f12fca416890320c1 100644 (file)
--- a/src/osx/checkbox_osx.cpp
+++ b/src/osx/checkbox_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id: checkbox.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,7 +16,6 @@
 #include "wx/checkbox.h"
 #include "wx/osx/private.h"
 
 #include "wx/checkbox.h"
 #include "wx/osx/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)

 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 // Single check box item
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 // Single check box item


@@ -28,15 +27,16 @@ bool wxCheckBox::Create(wxWindow *parent,
     long style,
     const wxValidator& validator,
     const wxString& name)
     long style,
     const wxValidator& validator,
     const wxString& name)

-{
-    m_macIsUserPane = false ;
-
+{    
+    DontCreatePeer();
+    

     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     m_labelOrig = m_label = label ;
 
     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     m_labelOrig = m_label = label ;
 

-    m_peer = wxWidgetImpl::CreateCheckBox( this, parent, id, label, pos, size, style, GetExtraStyle() ) ;
+    WXValidateStyle( &style );
+    SetPeer(wxWidgetImpl::CreateCheckBox( this, parent, id, label, pos, size, style, GetExtraStyle() )) ;

 
     MacPostControlCreate(pos, size) ;
 
 
     MacPostControlCreate(pos, size) ;
 


@@ -72,20 +72,20 @@ void wxCheckBox::Command(wxCommandEvent & event)
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {

-    return (wxCheckBoxState)m_peer->GetValue() ;
+    return (wxCheckBoxState)GetPeer()->GetValue() ;

 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
 {
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
 {

-    m_peer->SetValue( val ) ;
+    GetPeer()->SetValue( val ) ;

 }
 
 }
 

-bool wxCheckBox::OSXHandleClicked( double timestampsec ) 
+bool wxCheckBox::OSXHandleClicked( double WXUNUSED(timestampsec) )

 {
     bool sendEvent = true;
     wxCheckBoxState newState = Get3StateValue();
 {
     bool sendEvent = true;
     wxCheckBoxState newState = Get3StateValue();

-    
-    if ( !m_peer->ButtonClickDidStateChange() )
+
+    if ( !GetPeer()->ButtonClickDidStateChange() )

     {
         wxCheckBoxState origState ;
 
     {
         wxCheckBoxState origState ;