From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 19 Feb 2002 15:21:55 +0000 (+0000)
Subject: fixed Unicode-mode only bug in Validate()
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e90867579b360e61904846d6a1ff2bdf260572bf

fixed Unicode-mode only bug in Validate()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 3ecc428116..483b71d075 100644
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -132,21 +132,18 @@ bool wxTextValidator::Validate(wxWindow *parent)
 
     bool ok = TRUE;
 
-    // this format string should contian exactly one '%s'
-    const wxChar *errormsg = _("'%s' is invalid");
+    // NB: this format string should contian exactly one '%s'
+    wxString errormsg;
 
-    if ( m_validatorStyle & wxFILTER_INCLUDE_LIST )
+    bool includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0;
+    if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) )
     {
-        if ( !m_includeList.Member(val) )
+        // if includeList, it's only ok to have the members of the list,
+        // otherwise it's only ok to have non-members
+        ok = includeList == m_includeList.Member(val);
+        if ( !ok )
         {
-            ok = FALSE;
-        }
-    }
-    else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
-    {
-        if ( m_excludeList.Member(val) )
-        {
-            ok = FALSE;
+            errormsg = _("'%s' is invalid");
         }
     }
     else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
@@ -176,6 +173,8 @@ bool wxTextValidator::Validate(wxWindow *parent)
 
     if ( !ok )
     {
+        wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") );
+
         m_validatorWindow->SetFocus();
 
         wxString buf;