reintroducing direct access, cleanup

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

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index f3eb8eca635db5077488bc79d1bd6ce90e0bd374..b8ad8a5169b26c3c7f55d4f04bd1a11f82748694 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -1,18 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        checkbox.cpp
 // Purpose:     wxCheckBox
 /////////////////////////////////////////////////////////////////////////////
 // Name:        checkbox.cpp
 // Purpose:     wxCheckBox

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

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

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

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

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

 #include "wx/checkbox.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/checkbox.h"
 
 #if !USE_SHARED_LIBRARY


@@ -20,7 +24,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 #endif
 
 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,
 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,


@@ -29,50 +33,112 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
-               kControlCheckBoxProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
+        return false;
+
+    m_label = label ;
+
+    SInt32 maxValue = 1 /* kControlCheckboxCheckedValue */;
+    if (style & wxCHK_3STATE)
+        maxValue = 2 /* kControlCheckboxMixedValue */;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    m_peer = new wxMacControl() ;
+    verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
+        CFSTR("") , 0 , false , m_peer->GetControlRefAddr() ) );
+    
+    m_peer->SetMaximum( maxValue ) ;
+    
+    MacPostControlCreate(pos,size) ;

 
   return TRUE;
 }
 
 void wxCheckBox::SetValue(bool val)
 {
 
   return TRUE;
 }
 
 void wxCheckBox::SetValue(bool val)
 {

-   ::SetControlValue( m_macControl , val ) ;
+    if (val)
+    {
+        Set3StateValue(wxCHK_CHECKED);
+    }
+    else
+    {
+        Set3StateValue(wxCHK_UNCHECKED);
+    }

 }
 
 bool wxCheckBox::GetValue() const
 {
 }
 
 bool wxCheckBox::GetValue() const
 {

-    return ::GetControlValue( m_macControl ) ;
+    return (DoGet3StateValue() != 0);

 }
 
 void wxCheckBox::Command (wxCommandEvent & event)
 {
 }
 
 void wxCheckBox::Command (wxCommandEvent & event)
 {

-    SetValue ((event.GetInt() != 0));
-    ProcessCommand (event);
+    int state = event.GetInt();
+
+    wxCHECK_RET( (state == wxCHK_UNCHECKED) || (state == wxCHK_CHECKED)
+        || (state == wxCHK_UNDETERMINED),
+        wxT("event.GetInt() returned an invalid checkbox state") );
+
+    Set3StateValue((wxCheckBoxState) state);
+
+    ProcessCommand(event);
+}
+
+wxCheckBoxState wxCheckBox::DoGet3StateValue() const
+{
+    return (wxCheckBoxState) m_peer->GetValue() ;

 }
 
 }
 

-void wxCheckBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
+{
+    m_peer->SetValue( val ) ;
+}
+
+wxInt32 wxCheckBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 

 {
 {

-       SetValue( !GetValue() ) ;

     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
     wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );

-    event.SetInt(GetValue());
+    wxCheckBoxState state = Get3StateValue();
+
+    if (state == wxCHK_UNCHECKED)
+    {
+        state = wxCHK_CHECKED;
+    }
+    else if (state == wxCHK_CHECKED)
+    {
+        // If the style flag to allow the user setting the undetermined state
+        // is set, then set the state to undetermined. Otherwise set state to
+        // unchecked.
+        if ( Is3rdStateAllowedForUser() )
+        {
+            state = wxCHK_UNDETERMINED;
+        }
+        else
+        {
+            state = wxCHK_UNCHECKED;
+        }
+    }
+    else if (state == wxCHK_UNDETERMINED)
+    {
+        state = wxCHK_UNCHECKED;
+    }
+    Set3StateValue(state);
+
+    event.SetInt(state);

     event.SetEventObject(this);
     ProcessCommand(event);
     event.SetEventObject(this);
     ProcessCommand(event);

+
+    return noErr ;

 }
 
 // Bitmap checkbox
 }
 
 // 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);
 {
     SetName(name);
     SetValidator(validator);


@@ -93,6 +159,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
 void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
 {
     // TODO
 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)
 }
 
 void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)


@@ -103,12 +170,14 @@ void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlag
 void wxBitmapCheckBox::SetValue(bool val)
 {
     // TODO
 void wxBitmapCheckBox::SetValue(bool val)
 {
     // TODO

+    wxFAIL_MSG(wxT("wxBitmapCheckBox::SetValue() not yet implemented"));

 }
 
 bool wxBitmapCheckBox::GetValue() const
 {
 }
 
 bool wxBitmapCheckBox::GetValue() const
 {

-    // TODOD
+    // TODO
+    wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented"));

     return FALSE;
 }
 
     return FALSE;
 }
 

-
+#endif