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 c914add38baa45e1cba6b04de7a06e03d23ea05f..b1c9af8e45978c272092dcb24ff445f1068d9cd4 100644 (file)
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -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)
@@ -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)