OS/2 updates for easier VA debugging

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index c3139ccfb6d404471f2c297dd23ea243a201535b..9e7599571ba2d86d407f1deb5ad45bdef46d9aa5 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,15 +17,17 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_VALIDATORS
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/textctrl.h"
-#include "wx/utils.h"
-#include "wx/msgdlg.h"
-#include "wx/intl.h"
+  #include <stdio.h>
+  #include "wx/textctrl.h"
+  #include "wx/utils.h"
+  #include "wx/msgdlg.h"
+  #include "wx/intl.h"

 #endif
 
 #include "wx/valtext.h"
 #endif
 
 #include "wx/valtext.h"


@@ -35,28 +37,26 @@
 #include <stdlib.h>
 
 #ifdef __SALFORDC__
 #include <stdlib.h>
 
 #ifdef __SALFORDC__

-#include <clib.h>
+    #include <clib.h>

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)

-       EVT_CHAR(wxTextValidator::OnChar)
+    EVT_CHAR(wxTextValidator::OnChar)

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif

 
 static bool wxIsNumeric(const wxString& val);
 
 wxTextValidator::wxTextValidator(long style, wxString *val)
 {
 
 static bool wxIsNumeric(const wxString& val);
 
 wxTextValidator::wxTextValidator(long style, wxString *val)
 {

-       m_validatorStyle = style ;
-       m_stringValue = val ;
+    m_validatorStyle = style ;
+    m_stringValue = val ;

 /*
     m_refData = new wxVTextRefData;
 
 /*
     m_refData = new wxVTextRefData;
 

-       M_VTEXTDATA->m_validatorStyle = style ;
-       M_VTEXTDATA->m_stringValue = val ;
+    M_VTEXTDATA->m_validatorStyle = style ;
+    M_VTEXTDATA->m_stringValue = val ;

 */
 }
 
 */
 }
 


@@ -69,23 +69,23 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
 {
     wxValidator::Copy(val);
 
 {
     wxValidator::Copy(val);
 

-       m_validatorStyle = val.m_validatorStyle ;
-       m_stringValue = val.m_stringValue ;
-
-       wxNode *node = val.m_includeList.First() ;
-       while ( node )
-       {
-               char *s = (char *)node->Data();
-               m_includeList.Add(s);
-               node = node->Next();
-       }
-       node = val.m_excludeList.First() ;
-       while ( node )
-       {
-               char *s = (char *)node->Data();
-               m_excludeList.Add(s);
-               node = node->Next();
-       }
+    m_validatorStyle = val.m_validatorStyle ;
+    m_stringValue = val.m_stringValue ;
+
+    wxNode *node = val.m_includeList.First() ;
+    while ( node )
+    {
+        wxChar *s = (wxChar *)node->Data();
+        m_includeList.Add(s);
+        node = node->Next();
+    }
+    node = val.m_excludeList.First() ;
+    while ( node )
+    {
+        wxChar *s = (wxChar *)node->Data();
+        m_excludeList.Add(s);
+        node = node->Next();
+    }

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -95,227 +95,218 @@ wxTextValidator::~wxTextValidator()
 
 static bool wxIsAlpha(const wxString& val)
 {
 
 static bool wxIsAlpha(const wxString& val)
 {

-       int i;
-       for ( i = 0; i < (int)val.Length(); i++)
-       {
-               if (!isalpha(val[i]))
-                       return FALSE;
-       }
-       return TRUE;
+    int i;
+    for ( i = 0; i < (int)val.Length(); i++)
+    {
+        if (!wxIsalpha(val[i]))
+            return FALSE;
+    }
+    return TRUE;

 }
 
 static bool wxIsAlphaNumeric(const wxString& val)
 {
 }
 
 static bool wxIsAlphaNumeric(const wxString& val)
 {

-       int i;
-       for ( i = 0; i < (int)val.Length(); i++)
-       {
-               if (!isalnum(val[i]))
-                       return FALSE;
-       }
-       return TRUE;
+    int i;
+    for ( i = 0; i < (int)val.Length(); i++)
+    {
+        if (!wxIsalnum(val[i]))
+            return FALSE;
+    }
+    return TRUE;

 }
 
 // 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 ( !m_validatorWindow )
-               return FALSE;
-       if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
-               return FALSE;
-       if ( !m_stringValue )
-               return FALSE;
-
-       wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
-
-       // If window is disabled, don't validate
-       if ( !control->Enabled() )
-               return FALSE;
-
-       wxString val(control->GetValue());
-
-       if ( m_validatorStyle & wxFILTER_INCLUDE_LIST )
-       {
-               if ( !m_includeList.Member(val) )
-               {
-            m_validatorWindow->SetFocus();
-                       char buf[512];
-                       sprintf(buf, _("%s is invalid."), (const char *)val);
-                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
-                       return FALSE;
-               }
-       }
-       if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
-       {
-               if ( m_excludeList.Member(val) )
-               {
-            m_validatorWindow->SetFocus();
-                       char buf[512];
-                       sprintf(buf, _("%s is invalid."), (const char *)val);
-                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
-                       return FALSE;
-               }
-       }
-       if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
-       {
-            m_validatorWindow->SetFocus();
-                       char buf[512];
-                       sprintf(buf, _("%s should only contain ASCII characters."), (const char *)val);
-                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
-                       return FALSE;
-       }
-       if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
-       {
-            m_validatorWindow->SetFocus();
-                       char buf[512];
-                       sprintf(buf, _("%s should only contain alphabetic characters."), (const char *)val);
-                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
-                       return FALSE;
-       }
-       if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
-       {
-            m_validatorWindow->SetFocus();
-                       char buf[512];
-                       sprintf(buf, _("%s should only contain alphabetic or numeric characters."), (const char *)val);
-                       wxMessageBox(buf,_("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
-                       return FALSE;
-       }
-       if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
-
-       {
-            m_validatorWindow->SetFocus();
-                       char buf[512];
-                       sprintf(buf, _("%s should be numeric."), (const char *)val);
-                       wxMessageBox(buf, _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
-                       return FALSE;
-       }
-
-       return TRUE ;
+    if ( !m_validatorWindow )
+        return FALSE;
+    if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+        return FALSE;
+    if ( !m_stringValue )
+        return FALSE;
+
+    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
+
+    // If window is disabled, simply return
+    if ( !control->IsEnabled() )
+        return TRUE;
+
+    wxString val(control->GetValue());
+
+    bool ok = TRUE;
+
+    // this format string should contian exactly one '%s'
+    const wxChar *errormsg = _("'%s' is invalid");
+
+    if ( m_validatorStyle & wxFILTER_INCLUDE_LIST )
+    {
+        if ( !m_includeList.Member(val) )
+        {
+            ok = FALSE;
+        }
+    }
+    else if ( m_validatorStyle & wxFILTER_EXCLUDE_LIST )
+    {
+        if ( m_excludeList.Member(val) )
+        {
+            ok = FALSE;
+        }
+    }
+    else if ( (m_validatorStyle & wxFILTER_ASCII) && !val.IsAscii() )
+    {
+        ok = FALSE;
+
+        errormsg = _("'%s' should only contain ASCII characters.");
+    }
+    else if ( (m_validatorStyle & wxFILTER_ALPHA) && !wxIsAlpha(val) )
+    {
+        ok = FALSE;
+
+        errormsg = _("'%s' should only contain alphabetic characters.");
+    }
+    else if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsAlphaNumeric(val))
+    {
+        ok = FALSE;
+
+        errormsg = _("'%s' should only contain alphabetic or numeric characters.");
+    }
+    else if ( (m_validatorStyle & wxFILTER_NUMERIC) && !wxIsNumeric(val))
+    {
+        ok = FALSE;
+
+        errormsg = _("'%s' should be numeric.");
+    }
+
+    if ( !ok )
+    {
+        m_validatorWindow->SetFocus();
+
+        wxString buf;
+        buf.Printf(errormsg, val.c_str());
+
+        wxMessageBox(buf, _("Validation conflict"),
+                     wxOK | wxICON_EXCLAMATION, parent);
+    }
+
+    return ok;

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

-       if ( !m_validatorWindow )
-               return FALSE;
-       if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
-               return FALSE;
-       if ( !m_stringValue )
-               return FALSE;
+    if ( !m_validatorWindow )
+        return FALSE;
+    if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+        return FALSE;
+    if ( !m_stringValue )
+        return FALSE;

 
 

-       wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
-       control->SetValue(* m_stringValue) ;
+    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
+    control->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 ( !m_validatorWindow )
-               return FALSE;
-       if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
-               return FALSE;
-       if ( !m_stringValue )
-               return FALSE;
+    if ( !m_validatorWindow )
+        return FALSE;
+    if ( !m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+        return FALSE;
+    if ( !m_stringValue )
+        return FALSE;

 
 

-       wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
-       * m_stringValue = control->GetValue() ;
+    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
+    * m_stringValue = control->GetValue() ;

 
 

-       return TRUE;
+    return TRUE;

 }
 
 void wxTextValidator::SetIncludeList(const wxStringList& list)
 {
 /*
 }
 
 void wxTextValidator::SetIncludeList(const wxStringList& list)
 {
 /*

-       if ( !M_VTEXTDATA )
-               return;
+    if ( !M_VTEXTDATA )
+        return;

 */
 
 */
 

-       m_includeList.Clear();
-       // TODO: replace with =
-       wxNode *node = list.First() ;
-       while ( node )
-       {
-               char *s = (char *)node->Data();
-               m_includeList.Add(s);
-               node = node->Next();
-       }
+    m_includeList.Clear();
+    // TODO: replace with =
+    wxNode *node = list.First() ;
+    while ( node )
+    {
+        wxChar *s = (wxChar *)node->Data();
+        m_includeList.Add(s);
+        node = node->Next();
+    }

 }
 
 void wxTextValidator::SetExcludeList(const wxStringList& list)
 {
 /*
 }
 
 void wxTextValidator::SetExcludeList(const wxStringList& list)
 {
 /*

-       if ( !M_VTEXTDATA )
-               return;
+    if ( !M_VTEXTDATA )
+        return;

 */
 
 */
 

-       m_excludeList.Clear();
-       // TODO: replace with =
-       wxNode *node = list.First() ;
-       while ( node )
-       {
-               char *s = (char *)node->Data();
-               m_excludeList.Add(s);
-               node = node->Next();
-       }
+    m_excludeList.Clear();
+    // TODO: replace with =
+    wxNode *node = list.First() ;
+    while ( node )
+    {
+        wxChar *s = (wxChar *)node->Data();
+        m_excludeList.Add(s);
+        node = node->Next();
+    }

 }
 
 void wxTextValidator::OnChar(wxKeyEvent& event)
 {
 /*
 }
 
 void wxTextValidator::OnChar(wxKeyEvent& event)
 {
 /*

-       if ( !M_VTEXTDATA )
-               return;
+    if ( !M_VTEXTDATA )
+        return;

 */
 
 */
 

-       if ( !m_validatorWindow )
-               return;
-
-       wxTextCtrl *textCtrl = (wxTextCtrl *)m_validatorWindow;
-
-       int keyCode = event.KeyCode();
-       if (keyCode == WXK_DELETE || keyCode == WXK_RETURN || keyCode == WXK_BACK ||
-           keyCode == WXK_HOME || keyCode == WXK_LEFT || keyCode == WXK_UP ||
-           keyCode == WXK_RIGHT || keyCode == WXK_DOWN || keyCode == WXK_PRIOR ||
-           keyCode == WXK_NEXT || keyCode == WXK_END || keyCode == WXK_HOME)
-       {
-               textCtrl->wxTextCtrl::OnChar(event);
-               return ;
-       }
-
-       if ( (m_validatorStyle & wxFILTER_ASCII) && !isascii(keyCode) )
-       {
-               wxBell();
-               return;
-       }
-       if ( (m_validatorStyle & wxFILTER_ALPHA) && !isalpha(keyCode) )
-       {
-               wxBell();
-               return;
-       }
-       if ( (m_validatorStyle & wxFILTER_ALPHANUMERIC) && !isalnum(keyCode) )
-       {
-               wxBell();
-               return;
-       }
-       if ( (m_validatorStyle & wxFILTER_NUMERIC) && !isdigit(keyCode) && keyCode != '.' && keyCode != '-')
-       {
-               wxBell();
-               return;
-       }
-
-       textCtrl->wxTextCtrl::OnChar(event);
+    if ( m_validatorWindow )
+    {
+        int keyCode = (int)event.KeyCode();
+
+        // we don't filter special keys and Delete
+        if (
+             !(keyCode < WXK_SPACE || keyCode == WXK_DELETE || keyCode > WXK_START) &&
+             (
+              ((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 != '-')
+             )
+           )
+        {
+            if ( !wxValidator::IsSilent() )
+                wxBell();
+
+            // eat message
+            return;
+        }
+    }
+
+    event.Skip();

 }
 
 static bool wxIsNumeric(const wxString& val)
 {
 }
 
 static bool wxIsNumeric(const wxString& val)
 {

-       int i;
-       for ( i = 0; i < (int)val.Length(); i++)
-       {
-               if ((!isdigit(val[i])) && (val[i] != '.'))
-                 if(!((i == 0) && (val[i] == '-')))
-                       return FALSE;
-       }
-       return TRUE;
+    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 ((!isdigit(val[i])) && (val[i] != '.') && (val[i] != ','))
+          if(!((i == 0) && (val[i] == '-')))
+            return FALSE;
+    }
+    return TRUE;

 }
 
 }
 

+#endif
+  // wxUSE_VALIDATORS