fixing string param

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

diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index 7e42c3cd2b4dbdf7d1309742f7bfcb8a1e4246f7..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:
@@ -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;
     }
 
@@ -132,15 +132,17 @@ wxInt32 wxCheckBox::MacControlHit( WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENT
 // Bitmap checkbox
 bool wxBitmapCheckBox::Create(wxWindow *parent,
     wxWindowID id,
-    const wxBitmap *label,
-    const wxPoint& pos,
-    const wxSize& size,
+    const wxBitmap *WXUNUSED(label),
+    const wxPoint& WXUNUSED(pos),
+    const wxSize& WXUNUSED(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)
@@ -156,7 +158,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent,
     return false;
 }
 
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap *WXUNUSED(bitmap))
 {
     // TODO
     wxFAIL_MSG(wxT("wxBitmapCheckBox::SetLabel() not yet implemented"));
@@ -167,7 +169,7 @@ void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlag
     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"));