X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaf613add176525ed8b6cafaf278dfd80f85074..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/checkbox.cpp?ds=sidebyside

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index f3eb8eca63..c914add38b 100644
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -1,84 +1,150 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checkbox.cpp
+// Name:        src/mac/carbon/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__
-#pragma implementation "checkbox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_CHECKBOX
 
 #include "wx/checkbox.h"
+#include "wx/mac/uma.h"
+
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-#endif
 
-#include <wx/mac/uma.h>
 
 // Single check box item
-bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+bool wxCheckBox::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxString& label,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxValidator& validator,
+    const wxString& name)
 {
-	Rect bounds ;
-	Str255 title ;
-	
-	MacPreControlCreate( parent , id ,  label , pos , size ,style, validator , name , &bounds , title ) ;
+    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( this ) ;
+    verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
+        CFSTR("") , 0 , false , m_peer->GetControlRefAddr() ) );
+
+    m_peer->SetMaximum( maxValue ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
-	  	kControlCheckBoxProc , (long) this ) ;
-	
-	MacPostControlCreate() ;
+    MacPostControlCreate(pos, size) ;
 
-  return TRUE;
+    return true;
 }
 
 void wxCheckBox::SetValue(bool val)
 {
-   ::SetControlValue( m_macControl , val ) ;
+    if (val)
+        Set3StateValue(wxCHK_CHECKED);
+    else
+        Set3StateValue(wxCHK_UNCHECKED);
 }
 
 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);
 }
 
-void wxCheckBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
-	SetValue( !GetValue() ) ;
-    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
-    event.SetInt(GetValue());
-    event.SetEventObject(this);
-    ProcessCommand(event);
+    return (wxCheckBoxState)m_peer->GetValue() ;
+}
+
+void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
+{
+    m_peer->SetValue( val ) ;
+}
+
+wxInt32 wxCheckBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
+{
+    wxCheckBoxState origState, newState;
+
+    newState = origState = Get3StateValue();
+
+    switch (origState)
+    {
+        case wxCHK_UNCHECKED:
+            newState = wxCHK_CHECKED;
+            break;
+
+        case 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.
+            newState = Is3rdStateAllowedForUser() ? wxCHK_UNDETERMINED : wxCHK_UNCHECKED;
+            break;
+
+        case wxCHK_UNDETERMINED:
+            newState = wxCHK_UNCHECKED;
+            break;
+
+        default:
+            break;
+    }
+
+    if (newState != origState)
+    {
+        Set3StateValue( newState );
+
+        wxCommandEvent event( wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
+        event.SetInt( newState );
+        event.SetEventObject( this );
+        ProcessCommand( event );
+    }
+
+    return noErr;
 }
 
 // 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);
     m_windowStyle = style;
 
-    if (parent) parent->AddChild(this);
+    if (parent)
+        parent->AddChild(this);
 
     if ( id == -1 )
         m_windowId = NewControlId();
@@ -87,12 +153,13 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
 
     // TODO: Create the bitmap checkbox
 
-    return FALSE;
+    return false;
 }
 
 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,12 +170,15 @@ 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
-    return FALSE;
-}
+    // TODO
+    wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented"));
 
+    return false;
+}
 
+#endif