MPThread implementation by AJ Lavin

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

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index e9248b99931bdff3840b38d4a0dc58b2e3e798bb..56284d3ce34307fb8a3a094c843873026df7d7a8 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -24,10 +24,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
 #include "wx/mac/uma.h"
 
-wxCheckBoxBase::wxCheckBoxBase()
-{
-}
-
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,
@@ -35,24 +31,24 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxValidator& validator,
            const wxString& name)
 {
+    m_macIsUserPane = FALSE ;
+    
     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
-    Rect bounds ;
-    Str255 title ;
-    
-    MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+    m_label = label ;
 
-    SInt16 maxValue = 1 /* kControlCheckboxCheckedValue */;
+    SInt32 maxValue = 1 /* kControlCheckboxCheckedValue */;
     if (style & wxCHK_3STATE)
-    {
         maxValue = 2 /* kControlCheckboxMixedValue */;
-    }
 
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , maxValue, 
-          kControlCheckBoxProc , (long) this ) ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
+        CFSTR("") , 0 , false , (ControlRef*) &m_macControl ) ) ;
+
+    SetControl32BitMaximum( (ControlRef) m_macControl , maxValue ) ;
     
-    MacPostControlCreate() ;
+    MacPostControlCreate(pos,size) ;
 
   return TRUE;
 }
@@ -89,16 +85,16 @@ void wxCheckBox::Command (wxCommandEvent & event)
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
-    return (wxCheckBoxState) ::GetControl32BitValue( (ControlHandle) m_macControl );
+    return (wxCheckBoxState) ::GetControl32BitValue( (ControlRef) m_macControl );
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
 {
-    ::SetControl32BitValue( (ControlHandle) m_macControl , (int) val) ;
+    ::SetControl32BitValue( (ControlRef) m_macControl , (int) val) ;
     MacRedrawControl() ;
 }
 
-void wxCheckBox::MacHandleControlClick( WXWidget WXUNUSED(control), wxInt16 WXUNUSED(controlpart) , bool WXUNUSED(mouseStillDown) ) 
+wxInt32 wxCheckBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
     wxCheckBoxState state = Get3StateValue();
@@ -125,11 +121,13 @@ void wxCheckBox::MacHandleControlClick( WXWidget WXUNUSED(control), wxInt16 WXUN
     {
         state = wxCHK_UNCHECKED;
     }
-        Set3StateValue(state);
+    Set3StateValue(state);
 
     event.SetInt(state);
     event.SetEventObject(this);
     ProcessCommand(event);
+
+    return noErr ;
 }
 
 // Bitmap checkbox