don't test for things which bakefile already tests for (STRIP, RANLIB, INSTALL, WINDR...

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

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index 7e42c3cd2b4dbdf7d1309742f7bfcb8a1e4246f7..b1c9af8e45978c272092dcb24ff445f1068d9cd4 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:
@@ -36,7 +36,7 @@ bool wxCheckBox::Create(wxWindow *parent,
     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)
@@ -98,21 +98,21 @@ wxInt32 wxCheckBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT
 
     switch (origState)
     {
-       case wxCHK_UNCHECKED:
+        case wxCHK_UNCHECKED:
             newState = wxCHK_CHECKED;
             break;
 
-       case wxCHK_CHECKED:
+        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:
+        case wxCHK_UNDETERMINED:
             newState = wxCHK_UNCHECKED;
             break;
 
-       default:
+        default:
             break;
     }
 
@@ -136,11 +136,13 @@ bool wxBitmapCheckBox::Create(wxWindow *parent,
     const wxPoint& pos,
     const wxSize& size,
     long style,
-    const wxValidator& validator,
+    const wxValidator& wxVALIDATOR_PARAM(validator),
     const wxString& name)
 {
     SetName(name);
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif
     m_windowStyle = style;
 
     if (parent)