wxMkdir() has 2nd param under Unix

[wxWidgets.git] / src / common / valtext.cpp

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 259b201326f81b6295cd5ea2abb49879276bd3ad..7767ae2f185d13db4716a079f2293e06d56abe94 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -128,13 +128,13 @@ bool wxTextValidator::Validate(wxWindow *parent)
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
 
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
 

-    // If window is disabled, don't validate
+    // If window is disabled, simply return

     if ( !control->Enabled() )
     if ( !control->Enabled() )

-        return FALSE;
+        return TRUE;

 
     wxString val(control->GetValue());
 
 
     wxString val(control->GetValue());
 

-    bool ok = true;
+    bool ok = TRUE;

 
     // this format string should contian exactly one '%s'
     const char *errormsg = _("'%s' is invalid");
 
     // this format string should contian exactly one '%s'
     const char *errormsg = _("'%s' is invalid");


@@ -143,37 +143,37 @@ bool wxTextValidator::Validate(wxWindow *parent)
     {
         if ( !m_includeList.Member(val) )
         {
     {
         if ( !m_includeList.Member(val) )
         {

-            ok = false;
+            ok = FALSE;

         }
     }
     else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
     {
         if ( m_excludeList.Member(val) )
         {
         }
     }
     else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
     {
         if ( m_excludeList.Member(val) )
         {

-            ok = false;
+            ok = FALSE;

         }
     }
     else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
     {
         }
     }
     else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
     {

-        ok = false;
+        ok = FALSE;

 
         errormsg = _("'%s' should only contain ASCII characters.");
     }
     else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
     {
 
         errormsg = _("'%s' should only contain ASCII characters.");
     }
     else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
     {

-        ok = false;
+        ok = FALSE;

 
         errormsg = _("'%s' should only contain alphabetic characters.");
     }
     else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
     {
 
         errormsg = _("'%s' should only contain alphabetic characters.");
     }
     else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
     {

-        ok = false;
+        ok = FALSE;

 
         errormsg = _("'%s' should only contain alphabetic or numeric characters.");
     }
     else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
     {
 
         errormsg = _("'%s' should only contain alphabetic or numeric characters.");
     }
     else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
     {

-        ok = false;
+        ok = FALSE;

 
         errormsg = _("'%s' should be numeric.");
     }
 
         errormsg = _("'%s' should be numeric.");
     }