X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaf613add176525ed8b6cafaf278dfd80f85074..05ac7ac5785ef0ddb1bd04585f3c59c5d53089be:/src/mac/carbon/checkbox.cpp

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index f3eb8eca63..b595c99c7a 100644
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "checkbox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/checkbox.h"
 
 #if !USE_SHARED_LIBRARY
@@ -20,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
@@ -34,7 +36,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 	
 	MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+	m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
 	  	kControlCheckBoxProc , (long) this ) ;
 	
 	MacPostControlCreate() ;
@@ -44,12 +46,13 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 void wxCheckBox::SetValue(bool val)
 {
-   ::SetControlValue( m_macControl , val ) ;
+   ::SetControl32BitValue( (ControlHandle) m_macControl , val ) ;
+   MacRedrawControl() ;
 }
 
 bool wxCheckBox::GetValue() const
 {
-    return ::GetControlValue( m_macControl ) ;
+    return ::GetControl32BitValue( (ControlHandle) m_macControl ) ;
 }
 
 void wxCheckBox::Command (wxCommandEvent & event)
@@ -58,7 +61,7 @@ void wxCheckBox::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
-void wxCheckBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxCheckBox::MacHandleControlClick( WXWidget WXUNUSED(control), wxInt16 WXUNUSED(controlpart) ) 
 {
 	SetValue( !GetValue() ) ;
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
@@ -68,11 +71,12 @@ void wxCheckBox::MacHandleControlClick( ControlHandle control , SInt16 controlpa
 }
 
 // Bitmap checkbox
-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id,
+                              const wxBitmap *label,
+                              const wxPoint& pos,
+                              const wxSize& size, long style,
+                              const wxValidator& validator,
+                              const wxString& name)
 {
     SetName(name);
     SetValidator(validator);
@@ -93,6 +97,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
 void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
 {
     // TODO
+    wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented"));
 }
 
 void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
@@ -103,11 +108,13 @@ void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlag
 void wxBitmapCheckBox::SetValue(bool val)
 {
     // TODO
+    wxFAIL_MSG(wxT("wxBitmapCheckBox::SetValue() not yet implemented"));
 }
 
 bool wxBitmapCheckBox::GetValue() const
 {
-    // TODOD
+    // TODO
+    wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented"));
     return FALSE;
 }