drawing circles with a transparent pen was filling of course...

[wxWidgets.git] / src / mac / carbon / checkbox.cpp

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index 00f91c91894b14343f957ec1ab245e393c240963..b8ad8a5169b26c3c7f55d4f04bd1a11f82748694 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -6,14 +6,16 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWidgets licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_CHECKBOX

 
 #include "wx/checkbox.h"
 
 
 #include "wx/checkbox.h"
 


@@ -43,10 +45,11 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         maxValue = 2 /* kControlCheckboxMixedValue */;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
         maxValue = 2 /* kControlCheckboxMixedValue */;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

+    m_peer = new wxMacControl() ;

     verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
     verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,

-        CFSTR("") , 0 , false , (ControlRef*) &m_macControl ) ) ;
-
-    SetControl32BitMaximum( (ControlRef) m_macControl , maxValue ) ;
+        CFSTR("") , 0 , false , m_peer->GetControlRefAddr() ) );
+    
+    m_peer->SetMaximum( maxValue ) ;

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


@@ -85,13 +88,12 @@ void wxCheckBox::Command (wxCommandEvent & event)
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {

-    return (wxCheckBoxState) ::GetControl32BitValue( (ControlRef) m_macControl );
+    return (wxCheckBoxState) m_peer->GetValue() ;

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

-    ::SetControl32BitValue( (ControlRef) m_macControl , (int) val) ;
-    MacRedrawControl() ;
+    m_peer->SetValue( val ) ;

 }
 
 wxInt32 wxCheckBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
 }
 
 wxInt32 wxCheckBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 


@@ -178,4 +180,4 @@ bool wxBitmapCheckBox::GetValue() const
     return FALSE;
 }
 
     return FALSE;
 }
 

-
+#endif