workaround for GDIPlus conversion errors, adding wxMask support

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

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index dd2e2abe7ab8f644876b4e370b3ce0e77961ef75..c914add38baa45e1cba6b04de7a06e03d23ea05f 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -1,87 +1,150 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checkbox.cpp
+// Name:        src/mac/carbon/checkbox.cpp

 // Purpose:     wxCheckBox
 // 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__
-#pragma implementation "checkbox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_CHECKBOX

 
 #include "wx/checkbox.h"
 
 #include "wx/checkbox.h"

+#include "wx/mac/uma.h"
+

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)

-#endif
+

 
 // Single check box item
 
 // 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)

 {
 {

-    SetName(name);
-    SetValidator(validator);
-    m_windowStyle = style;
+    m_macIsUserPane = false ;

 
 

-    if (parent) parent->AddChild(this);
+    if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
+        return false;

 
 

-    if ( id == -1 )
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    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() ) );

 
 

-    // TODO: create checkbox
+    m_peer->SetMaximum( maxValue ) ;

 
 

-    return FALSE;
+    MacPostControlCreate(pos, size) ;
+
+    return true;

 }
 
 }
 

-void wxCheckBox::SetLabel(const wxString& label)
+void wxCheckBox::SetValue(bool val)

 {
 {

-    // TODO
+    if (val)
+        Set3StateValue(wxCHK_CHECKED);
+    else
+        Set3StateValue(wxCHK_UNCHECKED);

 }
 
 }
 

-void wxCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+bool wxCheckBox::GetValue() const

 {
 {

-    // TODO
+    return (DoGet3StateValue() != 0);

 }
 
 }
 

-void wxCheckBox::SetValue(bool val)
+void wxCheckBox::Command(wxCommandEvent & event)

 {
 {

-    // TODO
+    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);

 }
 
 }
 

-bool wxCheckBox::GetValue() const
+wxCheckBoxState wxCheckBox::DoGet3StateValue() const

 {
 {

-    // TODO
-    return FALSE;
+    return (wxCheckBoxState)m_peer->GetValue() ;

 }
 
 }
 

-void wxCheckBox::Command (wxCommandEvent & event)
+void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)

 {
 {

-    SetValue ((event.GetInt() != 0));
-    ProcessCommand (event);
+    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
 }
 
 // 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;
 
 {
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;
 

-    if (parent) parent->AddChild(this);
+    if (parent)
+        parent->AddChild(this);

 
     if ( id == -1 )
         m_windowId = NewControlId();
 
     if ( id == -1 )
         m_windowId = NewControlId();


@@ -90,28 +153,32 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
 
     // TODO: Create the bitmap checkbox
 
 
     // TODO: Create the bitmap checkbox
 

-    return FALSE;
+    return false;

 }
 
 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)
 {

-    // TODO
+    wxControl::SetSize( x , y , width , height , sizeFlags ) ;

 }
 
 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
-    return FALSE;
-}
+    // TODO
+    wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented"));

 
 

+    return false;
+}

 
 

+#endif