X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..ef1717a963dfb76bac26b9f4277ae590b3c0a2e6:/src/common/valtext.cpp

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 0e62b5ded3..c854692334 100644
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "valtext.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -73,14 +69,10 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
     m_validatorStyle = val.m_validatorStyle;
     m_stringValue = val.m_stringValue;
 
-    m_includeList = val.m_includeList;
-    m_excludeList = val.m_excludeList;
-
-    return TRUE;
-}
+    m_includes    = val.m_includes;
+    m_excludes    = val.m_excludes;
 
-wxTextValidator::~wxTextValidator()
-{
+    return true;
 }
 
 static bool wxIsAlpha(const wxString& val)
@@ -89,9 +81,9 @@ static bool wxIsAlpha(const wxString& val)
     for ( i = 0; i < (int)val.Length(); i++)
     {
         if (!wxIsalpha(val[i]))
-            return FALSE;
+            return false;
     }
-    return TRUE;
+    return true;
 }
 
 static bool wxIsAlphaNumeric(const wxString& val)
@@ -100,9 +92,9 @@ static bool wxIsAlphaNumeric(const wxString& val)
     for ( i = 0; i < (int)val.Length(); i++)
     {
         if (!wxIsalnum(val[i]))
-            return FALSE;
+            return false;
     }
-    return TRUE;
+    return true;
 }
 
 // Called when the value in the window must be validated.
@@ -110,27 +102,27 @@ static bool wxIsAlphaNumeric(const wxString& val)
 bool wxTextValidator::Validate(wxWindow *parent)
 {
     if( !CheckValidator() )
-        return FALSE;
+        return false;
 
     wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
 
     // If window is disabled, simply return
     if ( !control->IsEnabled() )
-        return TRUE;
+        return true;
 
     wxString val(control->GetValue());
 
-    bool ok = TRUE;
+    bool ok = true;
 
     // NB: this format string should contian exactly one '%s'
     wxString errormsg;
 
-    bool includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0;
-    if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) )
+    bool includes = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0;
+    if ( includes || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) )
     {
-        // if includeList, it's only ok to have the members of the list,
+        // if includes, 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);
+        ok = includes == (m_includes.Index(val) != wxNOT_FOUND);
         if ( !ok )
         {
             errormsg = _("'%s' is invalid");
@@ -138,39 +130,39 @@ bool wxTextValidator::Validate(wxWindow *parent)
     }
     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) )
     {
-        ok = FALSE;
+        ok = false;
 
         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))
     {
-        ok = FALSE;
+        ok = false;
 
         errormsg = _("'%s' should be numeric.");
     }
-    else if ( (m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(val))
+    else if ( (m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludes(val))
     {
         //it's only ok to have the members of the list
         errormsg = _("'%s' is invalid");
-        ok = FALSE;
+        ok = false;
     }
-    else if ( (m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(val))
+    else if ( (m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludes(val))
     {
         // it's only ok to have non-members of the list
         errormsg = _("'%s' is invalid");
-        ok = FALSE;
+        ok = false;
     }
 
     if ( !ok )
@@ -193,7 +185,7 @@ bool wxTextValidator::Validate(wxWindow *parent)
 bool wxTextValidator::TransferToWindow(void)
 {
     if( !CheckValidator() )
-        return FALSE;
+        return false;
 
     if ( m_stringValue )
     {
@@ -201,14 +193,14 @@ bool wxTextValidator::TransferToWindow(void)
         control->SetValue(* m_stringValue);
     }
 
-    return TRUE;
+    return true;
 }
 
 // Called to transfer data to the window
 bool wxTextValidator::TransferFromWindow(void)
 {
     if( !CheckValidator() )
-        return FALSE;
+        return false;
 
     if ( m_stringValue )
     {
@@ -216,17 +208,86 @@ bool wxTextValidator::TransferFromWindow(void)
         *m_stringValue = control->GetValue();
     }
 
-    return TRUE;
+    return true;
+}
+
+#if WXWIN_COMPATIBILITY_2_4
+
+inline void wxCopyStringListToArrayString(wxArrayString& to, const wxStringList& from)
+{
+    to.Clear();
+
+    for ( wxStringList::compatibility_iterator pNode = from.GetFirst();
+          pNode;
+          pNode = pNode->GetNext() )
+    {
+        to.Add(pNode->GetData());
+    }
+}
+
+inline void wxCopyArrayStringToStringList(wxStringList& to, const wxArrayString& from)
+{
+    to.Clear();
+
+    for(size_t i = 0; i < from.GetCount(); ++i)
+        to.Add(from[i]);
+}
+
+wxStringList& wxTextValidator::GetIncludeList()
+{
+    wxCopyArrayStringToStringList(m_includeList, m_includes);
+    return m_includeList;
+}
+
+wxStringList& wxTextValidator::GetExcludeList()
+{
+    wxCopyArrayStringToStringList(m_excludeList, m_excludes);
+    return m_excludeList;
 }
 
 void wxTextValidator::SetIncludeList(const wxStringList& list)
 {
-    m_includeList = list;
+    wxCopyStringListToArrayString(m_includes, list);
 }
 
 void wxTextValidator::SetExcludeList(const wxStringList& list)
 {
-    m_excludeList = list;
+    wxCopyStringListToArrayString(m_excludes, list);
+}
+
+bool wxTextValidator::IsInCharIncludeList(const wxString& val)
+{
+    return IsInCharIncludes(val);
+}
+
+bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
+{
+    return IsNotInCharExcludes(val);
+}
+
+#endif //compat 2.4
+
+
+bool wxTextValidator::IsInCharIncludes(const wxString& val)
+{
+    size_t i;
+    for ( i = 0; i < val.Length(); i++)
+    {
+        if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
+            return false;
+    }
+    return true;
+}
+
+bool wxTextValidator::IsNotInCharExcludes(const wxString& val)
+{
+    size_t i;
+    for ( i = 0; i < val.Length(); i++)
+    {
+       if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND)
+            return false;
+    }
+    return true;
 }
 
 void wxTextValidator::OnChar(wxKeyEvent& event)
@@ -244,13 +305,13 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
         if (
              !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) &&
              (
-              ((m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(wxString((wxChar) keyCode, 1))) ||
-              ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((wxChar) keyCode, 1))) ||
+              ((m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludes(wxString((wxChar) keyCode, 1))) ||
+              ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludes(wxString((wxChar) keyCode, 1))) ||
               ((m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
               ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
-                                && keyCode != '.' && keyCode != ',' && keyCode != '-')
+                                && keyCode != wxT('.') && keyCode != wxT(',') && keyCode != wxT('-') && keyCode != wxT('+') && keyCode != wxT('e') && keyCode != wxT('E'))
              )
            )
         {
@@ -272,33 +333,12 @@ static bool wxIsNumeric(const wxString& val)
     {
         // Allow for "," (French) as well as "." -- in future we should
         // use wxSystemSettings or other to do better localisation
-        if ((!wxIsdigit(val[i])) && (val[i] != '.') && (val[i] != ',') && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-')))
-            return FALSE;
+        if ((!wxIsdigit(val[i])) && (val[i] != wxT('.')) && (val[i] != wxT(',')) && (val[i] != wxT('e')) && (val[i] != wxT('E')) && (val[i] != wxT('+')) && (val[i] != wxT('-')))
+            return false;
     }
-    return TRUE;
+    return true;
 }
 
-bool wxTextValidator::IsInCharIncludeList(const wxString& val)
-{
-    size_t i;
-    for ( i = 0; i < val.Length(); i++)
-    {
-        if (!m_includeList.Member((wxString) val[i]))
-            return FALSE;
-    }
-    return TRUE;
-}
-
-bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
-{
-    size_t i;
-    for ( i = 0; i < val.Length(); i++)
-    {
-       if (m_excludeList.Member((wxString) val[i]))
-       return FALSE;
-    }
-    return TRUE;
-}
 
 #endif
   // wxUSE_VALIDATORS && wxUSE_TEXTCTRL