X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41c9a21f8cc72250ee4b0d5230c5f529c0ab0aab..c5c04fabb02c27bcc8115bff024d74ddd48f8175:/src/mac/checkbox.cpp

diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp
index e17deb180d..f1bc26ccc6 100644
--- a/src/mac/checkbox.cpp
+++ b/src/mac/checkbox.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        checkbox.cpp
 // Purpose:     wxCheckBox
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -31,27 +31,28 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxValidator& validator,
            const wxString& name)
 {
-	Rect bounds ;
-	Str255 title ;
-	
-	MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, 
-	  	kControlCheckBoxProc , (long) this ) ;
-	
-	MacPostControlCreate() ;
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+          kControlCheckBoxProc , (long) this ) ;
+    
+    MacPostControlCreate() ;
 
   return TRUE;
 }
 
 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)
@@ -60,9 +61,9 @@ 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() ) ;
+    SetValue( !GetValue() ) ;
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
     event.SetInt(GetValue());
     event.SetEventObject(this);
@@ -70,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);
@@ -95,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)
@@ -105,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;
 }