mac cgcolor changes & cleanup

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

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index ca9a4d22349bd356159565b73c56a70105a9f883..982869b0aa036aeb7fea21f34bb419859da332ec 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCheckBox
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxCheckBox
 // Author:      Stefan Csomor
 // Modified by:


@@ -14,52 +14,52 @@
 #if wxUSE_CHECKBOX
 
 #include "wx/checkbox.h"
 #if wxUSE_CHECKBOX
 
 #include "wx/checkbox.h"

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

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

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

 
 // 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)

 {
 {

-    m_macIsUserPane = FALSE ;
-    
+    m_macIsUserPane = false ;
+

     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !wxCheckBoxBase::Create(parent, id, pos, size, style, validator, name) )
         return false;
 

-    m_label = label ;
+    m_labelOrig = m_label = label ;

 
     SInt32 maxValue = 1 /* kControlCheckboxCheckedValue */;
     if (style & wxCHK_3STATE)
         maxValue = 2 /* kControlCheckboxMixedValue */;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
 
     SInt32 maxValue = 1 /* kControlCheckboxCheckedValue */;
     if (style & wxCHK_3STATE)
         maxValue = 2 /* kControlCheckboxMixedValue */;
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

-    m_peer = new wxMacControl(this) ;
+    m_peer = new wxMacControl( this ) ;

     verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
         CFSTR("") , 0 , false , m_peer->GetControlRefAddr() ) );
     verify_noerr( CreateCheckBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds ,
         CFSTR("") , 0 , false , m_peer->GetControlRefAddr() ) );

-    
+

     m_peer->SetMaximum( maxValue ) ;
     m_peer->SetMaximum( maxValue ) ;

-    
-    MacPostControlCreate(pos,size) ;

 
 

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

 }
 
 void wxCheckBox::SetValue(bool val)
 {
     if (val)
 }
 
 void wxCheckBox::SetValue(bool val)
 {
     if (val)

-    {

         Set3StateValue(wxCHK_CHECKED);
         Set3StateValue(wxCHK_CHECKED);

-    }

     else
     else

-    {

         Set3StateValue(wxCHK_UNCHECKED);
         Set3StateValue(wxCHK_UNCHECKED);

-    }

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


@@ -67,7 +67,7 @@ bool wxCheckBox::GetValue() const
     return (DoGet3StateValue() != 0);
 }
 
     return (DoGet3StateValue() != 0);
 }
 

-void wxCheckBox::Command (wxCommandEvent & event)
+void wxCheckBox::Command(wxCommandEvent & event)

 {
     int state = event.GetInt();
 
 {
     int state = event.GetInt();
 


@@ -75,14 +75,14 @@ void wxCheckBox::Command (wxCommandEvent & event)
         || (state == wxCHK_UNDETERMINED),
         wxT("event.GetInt() returned an invalid checkbox state") );
 
         || (state == wxCHK_UNDETERMINED),
         wxT("event.GetInt() returned an invalid checkbox state") );
 

-    Set3StateValue((wxCheckBoxState) state);
+    Set3StateValue((wxCheckBoxState)state);

 
     ProcessCommand(event);
 }
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
 
     ProcessCommand(event);
 }
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {

-    return (wxCheckBoxState) m_peer->GetValue() ;
+    return (wxCheckBoxState)m_peer->GetValue() ;

 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)


@@ -90,55 +90,63 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
     m_peer->SetValue( val ) ;
 }
 
     m_peer->SetValue( val ) ;
 }
 

-wxInt32 wxCheckBox::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 
+wxInt32 wxCheckBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) 

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
-    wxCheckBoxState state = Get3StateValue();
+    wxCheckBoxState origState, newState;

 
 

-    if (state == wxCHK_UNCHECKED)
-    {
-        state = wxCHK_CHECKED;
-    }
-    else if (state == wxCHK_CHECKED)
+    newState = origState = Get3StateValue();
+
+    switch (origState)

     {
     {

-        // 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;
-        }
+        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;

     }
     }

-    else if (state == wxCHK_UNDETERMINED)
+
+    if (newState != origState)

     {
     {

-        state = wxCHK_UNCHECKED;
-    }
-    Set3StateValue(state);
+        Set3StateValue( newState );

 
 

-    event.SetInt(state);
-    event.SetEventObject(this);
-    ProcessCommand(event);
+        wxCommandEvent event( wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId );
+        event.SetInt( newState );
+        event.SetEventObject( this );
+        ProcessCommand( event );
+    }

 
 

-    return noErr ;
+    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 *WXUNUSED(label),
+    const wxPoint& WXUNUSED(pos),
+    const wxSize& WXUNUSED(size),
+    long style,
+    const wxValidator& wxVALIDATOR_PARAM(validator),
+    const wxString& name)

 {
     SetName(name);
 {
     SetName(name);

+#if wxUSE_VALIDATORS

     SetValidator(validator);
     SetValidator(validator);

+#endif

     m_windowStyle = style;
 
     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();


@@ -147,10 +155,10 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id,
 
     // TODO: Create the bitmap checkbox
 
 
     // TODO: Create the bitmap checkbox
 

-    return FALSE;
+    return false;

 }
 
 }
 

-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap *WXUNUSED(bitmap))

 {
     // TODO
     wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented"));
 {
     // TODO
     wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented"));


@@ -161,7 +169,7 @@ void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlag
     wxControl::SetSize( x , y , width , height , sizeFlags ) ;
 }
 
     wxControl::SetSize( x , y , width , height , sizeFlags ) ;
 }
 

-void wxBitmapCheckBox::SetValue(bool val)
+void wxBitmapCheckBox::SetValue(bool WXUNUSED(val))

 {
     // TODO
     wxFAIL_MSG(wxT("wxBitmapCheckBox::SetValue() not yet implemented"));
 {
     // TODO
     wxFAIL_MSG(wxT("wxBitmapCheckBox::SetValue() not yet implemented"));


@@ -171,7 +179,8 @@ bool wxBitmapCheckBox::GetValue() const
 {
     // TODO
     wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented"));
 {
     // TODO
     wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented"));

-    return FALSE;
+
+    return false;

 }
 
 #endif
 }
 
 #endif