From 43147cef6c33e9024ef1d1ae7b659fa4c696f2dd Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Tue, 3 Apr 2007 02:44:32 +0000
Subject: [PATCH] build fixes for wxUSE_VALIDATORS==0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/combog.cpp      | 2 ++
 src/mac/carbon/checkbox.cpp | 4 +++-
 src/mac/carbon/treectrl.cpp | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index 8deece8589..29b9d21f96 100644
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -392,6 +392,7 @@ void wxGenericComboCtrl::SetCustomPaintWidth( int width )
             tc->RemoveEventHandler(m_textEvtHandler);
             delete m_textEvtHandler;
 
+#if wxUSE_VALIDATORS
             wxValidator* pValidator = tc->GetValidator();
             if ( pValidator )
             {
@@ -400,6 +401,7 @@ void wxGenericComboCtrl::SetCustomPaintWidth( int width )
                 delete pValidator;
             }
             else
+#endif
             {
                 CreateTextCtrl( tcCreateStyle, wxDefaultValidator );
             }
diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp
index c914add38b..e43aaa6dba 100644
--- a/src/mac/carbon/checkbox.cpp
+++ b/src/mac/carbon/checkbox.cpp
@@ -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)
diff --git a/src/mac/carbon/treectrl.cpp b/src/mac/carbon/treectrl.cpp
index 164b37af75..7977dabef9 100644
--- a/src/mac/carbon/treectrl.cpp
+++ b/src/mac/carbon/treectrl.cpp
@@ -29,14 +29,17 @@ wxTreeCtrl::wxTreeCtrl()
 
 bool wxTreeCtrl::Create(wxWindow *parent,
     wxWindowID id, const wxPoint& pos, const wxSize& size,
-    long style, const wxValidator& validator, const wxString& name)
+    long style, const wxValidator& wxVALIDATOR_PARAM(validator),
+    const wxString& name)
 {
     m_imageListNormal = NULL;
     m_imageListState = NULL;
     m_textCtrl = NULL;
 
     SetName(name);
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif
     SetParent(parent);
 
     m_windowStyle = style;
-- 
2.45.2