Forgot header with OSX prefix

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index dc605b57df760f97d807432747728c85e67faf3e..a2f5c621ef88e72110ace298921b95b5a1990330 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        valtext.cpp
+// Name:        src/common/valtext.cpp

 // Purpose:     wxTextValidator
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxTextValidator
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -20,35 +16,88 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+#if wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)
+
+#include "wx/valtext.h"

 
 #ifndef WX_PRECOMP
   #include <stdio.h>
   #include "wx/textctrl.h"
 
 #ifndef WX_PRECOMP
   #include <stdio.h>
   #include "wx/textctrl.h"

+  #include "wx/combobox.h"

   #include "wx/utils.h"
   #include "wx/msgdlg.h"
   #include "wx/intl.h"
 #endif
 
   #include "wx/utils.h"
   #include "wx/msgdlg.h"
   #include "wx/intl.h"
 #endif
 

-#include "wx/valtext.h"
-

 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
 

-#ifdef __SALFORDC__
-    #include <clib.h>
-#endif
+// ----------------------------------------------------------------------------
+// global helpers
+// ----------------------------------------------------------------------------

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
+static bool wxIsAlpha(const wxString& val)
+{
+    int i;
+    for ( i = 0; i < (int)val.length(); i++)
+    {
+        if (!wxIsalpha(val[i]))
+            return false;
+    }
+    return true;
+}
+
+static bool wxIsAlphaNumeric(const wxString& val)
+{
+    int i;
+    for ( i = 0; i < (int)val.length(); i++)
+    {
+        if (!wxIsalnum(val[i]))
+            return false;
+    }
+    return true;
+}
+
+static bool wxIsNumeric(const wxString& val)
+{
+    int i;
+    for ( i = 0; i < (int)val.length(); i++)
+    {
+        // Allow for "," (French) as well as "." -- in future we should
+        // use wxSystemSettings or other to do better localisation
+        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;
+}

 
 

+
+// ----------------------------------------------------------------------------
+// wxTextValidator
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)

 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
     EVT_CHAR(wxTextValidator::OnChar)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
     EVT_CHAR(wxTextValidator::OnChar)
 END_EVENT_TABLE()
 

-static bool wxIsNumeric(const wxString& val);

 
 

+#if WXWIN_COMPATIBILITY_2_8

 wxTextValidator::wxTextValidator(long style, wxString *val)
 wxTextValidator::wxTextValidator(long style, wxString *val)

+{
+    m_validatorStyle = (wxTextValidatorStyle)style;
+    m_stringValue = val;
+}
+
+void wxTextValidator::SetStyle(long style)
+{
+    SetStyle((wxTextValidatorStyle)style);
+}
+#endif
+
+wxTextValidator::wxTextValidator(wxTextValidatorStyle style, wxString *val)

 {
     m_validatorStyle = style;
     m_stringValue = val;
 {
     m_validatorStyle = style;
     m_stringValue = val;


@@ -73,110 +122,104 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
     m_validatorStyle = val.m_validatorStyle;
     m_stringValue = val.m_stringValue;
 
     m_validatorStyle = val.m_validatorStyle;
     m_stringValue = val.m_stringValue;
 

-    m_includeList = val.m_includeList;
-    m_excludeList = val.m_excludeList;
+    m_includes    = val.m_includes;
+    m_excludes    = val.m_excludes;

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

-wxTextValidator::~wxTextValidator()
+wxTextEntry *wxTextValidator::GetTextEntry()

 {
 {

-}
-
-static bool wxIsAlpha(const wxString& val)
-{
-    int i;
-    for ( i = 0; i < (int)val.Length(); i++)
+#if wxUSE_TEXTCTRL
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)))

     {
     {

-        if (!wxIsalpha(val[i]))
-            return FALSE;
+        return (wxTextCtrl*)m_validatorWindow;

     }
     }

-    return TRUE;
-}
+#endif

 
 

-static bool wxIsAlphaNumeric(const wxString& val)
-{
-    int i;
-    for ( i = 0; i < (int)val.Length(); i++)
+#if wxUSE_COMBOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)))

     {
     {

-        if (!wxIsalnum(val[i]))
-            return FALSE;
+        return (wxComboBox*)m_validatorWindow;

     }
     }

-    return TRUE;
+#endif
+
+    wxFAIL_MSG(
+        _T("wxTextValidator can only be used with wxTextCtrl or wxComboBox")
+    );
+
+    return NULL;

 }
 
 // Called when the value in the window must be validated.
 // This function can pop up an error message.
 bool wxTextValidator::Validate(wxWindow *parent)
 {
 }
 
 // Called when the value in the window must be validated.
 // This function can pop up an error message.
 bool wxTextValidator::Validate(wxWindow *parent)
 {

-    if( !CheckValidator() )
-        return FALSE;
-
-    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
-

     // If window is disabled, simply return
     // If window is disabled, simply return

-    if ( !control->IsEnabled() )
-        return TRUE;
+    if ( !m_validatorWindow->IsEnabled() )
+        return true;

 
 

-    wxString val(control->GetValue());
+    wxTextEntry * const text = GetTextEntry();
+    if ( !text )
+        return false;

 
 

-    bool ok = TRUE;
+    wxString val(text->GetValue());

 
 

-    // NB: this format string should contian exactly one '%s'
+    // NB: this format string should always contain exactly one '%s'

     wxString errormsg;
 
     wxString errormsg;
 

-    bool includeList = (m_validatorStyle & wxFILTER_INCLUDE_LIST) != 0;
-    if ( includeList || (m_validatorStyle & wxFILTER_EXCLUDE_LIST) )
-    {
-        // 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 )
-        {
-            errormsg = _("'%s' is invalid");
-        }
-    }
-    else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
+    switch (m_validatorStyle)

     {
     {

-        ok = FALSE;
+    case wxFILTER_NONE:
+        // nothing to do...
+        break;

 
 

-        errormsg = _("'%s' should only contain ASCII characters.");
-    }
-    else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
-    {
-        ok = FALSE;
+    case wxFILTER_INCLUDE_LIST:
+        if ( m_includes.Index(val) == wxNOT_FOUND )
+            errormsg = _("'%s' is invalid");
+        break;

 
 

-        errormsg = _("'%s' should only contain alphabetic characters.");
-    }
-    else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
-    {
-        ok = FALSE;
+    case wxFILTER_EXCLUDE_LIST:
+        if ( m_excludes.Index(val) != wxNOT_FOUND )
+            errormsg = _("'%s' is invalid");
+        break;
+
+    case wxFILTER_ASCII:
+        if ( !val.IsAscii() )
+            errormsg = _("'%s' should only contain ASCII characters.");
+        break;
+
+    case wxFILTER_ALPHA:
+        if ( !wxIsAlpha(val) )
+            errormsg = _("'%s' should only contain alphabetic characters.");
+        break;
+
+    case wxFILTER_ALPHANUMERIC:
+        if ( !wxIsAlphaNumeric(val) )
+            errormsg = _("'%s' should only contain alphabetic or numeric characters.");
+        break;
+
+    case wxFILTER_NUMERIC:
+        if ( !wxIsNumeric(val) )
+            errormsg = _("'%s' should be numeric.");
+        break;
+
+    case wxFILTER_INCLUDE_CHAR_LIST:
+        if ( !IsInCharIncludes(val) )
+            errormsg = _("'%s' is invalid");
+        break;

 
 

-        errormsg = _("'%s' should only contain alphabetic or numeric characters.");
-    }
-    else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
-    {
-        ok = FALSE;
+    case wxFILTER_EXCLUDE_CHAR_LIST:
+        if ( !IsNotInCharExcludes(val) )
+            errormsg = _("'%s' is invalid");
+        break;

 
 

-        errormsg = _("'%s' should be numeric.");
-    }
-    else if ( (m_validatorStyle & wxFILTER_INCLUDE_CHAR_LIST) && !IsInCharIncludeList(val))
-    {
-        //it's only ok to have the members of the list
-        errormsg = _("'%s' is invalid");
-        ok = FALSE;
-    }
-    else if ( (m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(val))
-    {
-        // it's only ok to have non-members of the list
-        errormsg = _("'%s' is invalid");
-        ok = FALSE;
+    default:
+        wxFAIL_MSG("invalid text validator style");

     }
 
     }
 

-    if ( !ok )
+    if ( !errormsg.empty() )

     {
     {

-        wxASSERT_MSG( !errormsg.empty(), _T("you forgot to set errormsg") );
-

         m_validatorWindow->SetFocus();
 
         wxString buf;
         m_validatorWindow->SetFocus();
 
         wxString buf;


@@ -184,49 +227,63 @@ bool wxTextValidator::Validate(wxWindow *parent)
 
         wxMessageBox(buf, _("Validation conflict"),
                      wxOK | wxICON_EXCLAMATION, parent);
 
         wxMessageBox(buf, _("Validation conflict"),
                      wxOK | wxICON_EXCLAMATION, parent);

+
+        return false;

     }
 
     }
 

-    return ok;
+    return true;

 }
 
 // Called to transfer data to the window
 bool wxTextValidator::TransferToWindow(void)
 {
 }
 
 // Called to transfer data to the window
 bool wxTextValidator::TransferToWindow(void)
 {

-    if( !CheckValidator() )
-        return FALSE;
-

     if ( m_stringValue )
     {
     if ( m_stringValue )
     {

-        wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
-        control->SetValue(* m_stringValue);
+        wxTextEntry * const text = GetTextEntry();
+        if ( !text )
+            return false;
+
+        text->SetValue(*m_stringValue);

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 // Called to transfer data to the window
 bool wxTextValidator::TransferFromWindow(void)
 {
 }
 
 // Called to transfer data to the window
 bool wxTextValidator::TransferFromWindow(void)
 {

-    if( !CheckValidator() )
-        return FALSE;
-

     if ( m_stringValue )
     {
     if ( m_stringValue )
     {

-        wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;
-        *m_stringValue = control->GetValue();
+        wxTextEntry * const text = GetTextEntry();
+        if ( !text )
+            return false;
+
+        *m_stringValue = text->GetValue();

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxTextValidator::SetIncludeList(const wxStringList& list)
+bool wxTextValidator::IsInCharIncludes(const wxString& val)

 {
 {

-    m_includeList = list;
+    size_t i;
+    for ( i = 0; i < val.length(); i++)
+    {
+        if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
+            return false;
+    }
+    return true;

 }
 
 }
 

-void wxTextValidator::SetExcludeList(const wxStringList& list)
+bool wxTextValidator::IsNotInCharExcludes(const wxString& val)

 {
 {

-    m_excludeList = list;
+    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)
 }
 
 void wxTextValidator::OnChar(wxKeyEvent& event)


@@ -244,13 +301,14 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
         if (
              !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) &&
              (
         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_ASCII) && !isascii(keyCode)) ||
-              ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
-              ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
-              ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(keyCode)
-                                && keyCode != '.' && keyCode != ',' && keyCode != '-')
+              ((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 != wxT('.') && keyCode != wxT(',') && keyCode != wxT('-') && keyCode != wxT('+') 
+                                && keyCode != wxT('e') && keyCode != wxT('E'))

              )
            )
         {
              )
            )
         {


@@ -265,40 +323,6 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-static bool wxIsNumeric(const wxString& val)
-{
-    int i;
-    for ( i = 0; i < (int)val.Length(); i++)
-    {
-        // 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;
-    }
-    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
 
 #endif

-  // wxUSE_VALIDATORS && wxUSE_TEXTCTRL
+  // wxUSE_VALIDATORS && (wxUSE_TEXTCTRL || wxUSE_COMBOBOX)