cleanup - reformat

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/checkbox.cpp

@@ -14,20 +14,24 @@
 #if wxUSE_CHECKBOX
 
 #include "wx/checkbox.h"
+#include "wx/mac/uma.h"
+
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 
-#include "wx/mac/uma.h"
 
 // Single check box item
-bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+bool wxCheckBox::Create(wxWindow *parent,
+    wxWindowID id,
+    const wxString& label,
     const wxPoint& pos,
-           const wxSize& size, long style,
+    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;
@@ -47,20 +51,16 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     MacPostControlCreate(pos, size) ;
 
-  return TRUE;
+    return true;
 }
 
 void wxCheckBox::SetValue(bool val)
 {
     if (val)
-    {
         Set3StateValue(wxCHK_CHECKED);
-    }
     else
-    {
         Set3StateValue(wxCHK_UNCHECKED);
 }
-}
 
 bool wxCheckBox::GetValue() const
 {
@@ -92,45 +92,50 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState 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 );
-    wxCheckBoxState state = Get3StateValue();
+        event.SetInt( newState );
-
-    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 );
+    }
 
     return noErr;
 }
 
 // Bitmap checkbox
-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id,
+bool wxBitmapCheckBox::Create(wxWindow *parent,
+    wxWindowID id,
     const wxBitmap *label,
     const wxPoint& pos,
-                              const wxSize& size, long style,
+    const wxSize& size,
+    long style,
     const wxValidator& validator,
     const wxString& name)
 {
@@ -138,7 +143,8 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id,
     SetValidator(validator);
     m_windowStyle = style;
 
-    if (parent) parent->AddChild(this);
+    if (parent)
+        parent->AddChild(this);
 
     if ( id == -1 )
         m_windowId = NewControlId();
@@ -147,7 +153,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id,
 
     // TODO: Create the bitmap checkbox
 
-    return FALSE;
+    return false;
 }
 
 void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
@@ -171,7 +177,8 @@ bool wxBitmapCheckBox::GetValue() const
 {
     // TODO
     wxFAIL_MSG(wxT("wxBitmapCheckBox::GetValue() not yet implemented"));
-    return FALSE;
+
+    return false;
 }
 
 #endif