Lookup result windows now force the first column size to be no great than 20 characte...

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 16dadf77a581ab3e802feef8d759cf4038bf1a9b..bd3d8a0c7524ace20e0c2f1129206a7ffbd51fe2 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "valtext.h"
 #endif
 
 #pragma implementation "valtext.h"
 #endif
 


@@ -50,13 +50,13 @@ static bool wxIsNumeric(const wxString& val);
 
 wxTextValidator::wxTextValidator(long style, 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;

 */
 }
 
 */
 }
 


@@ -70,17 +70,13 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
 {
     wxValidator::Copy(val);
 
 {
     wxValidator::Copy(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_includeList = val.m_includeList;
     m_excludeList = val.m_excludeList;

-    
-    return TRUE;
-}

 
 

-wxTextValidator::~wxTextValidator()
-{
+    return true;

 }
 
 static bool wxIsAlpha(const wxString& val)
 }
 
 static bool wxIsAlpha(const wxString& val)


@@ -89,9 +85,9 @@ static bool wxIsAlpha(const wxString& val)
     for ( i = 0; i < (int)val.Length(); i++)
     {
         if (!wxIsalpha(val[i]))
     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)
 }
 
 static bool wxIsAlphaNumeric(const wxString& val)


@@ -100,9 +96,9 @@ static bool wxIsAlphaNumeric(const wxString& val)
     for ( i = 0; i < (int)val.Length(); i++)
     {
         if (!wxIsalnum(val[i]))
     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.
 }
 
 // Called when the value in the window must be validated.


@@ -110,17 +106,17 @@ static bool wxIsAlphaNumeric(const wxString& val)
 bool wxTextValidator::Validate(wxWindow *parent)
 {
     if( !CheckValidator() )
 bool wxTextValidator::Validate(wxWindow *parent)
 {
     if( !CheckValidator() )

-        return FALSE;
+        return false;

 
 

-    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
+    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow;

 
     // If window is disabled, simply return
     if ( !control->IsEnabled() )
 
     // If window is disabled, simply return
     if ( !control->IsEnabled() )

-        return TRUE;
+        return true;

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

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

 
     // NB: this format string should contian exactly one '%s'
     wxString errormsg;
 
     // NB: this format string should contian exactly one '%s'
     wxString errormsg;


@@ -138,25 +134,25 @@ bool wxTextValidator::Validate(wxWindow *parent)
     }
     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.");
     }


@@ -164,13 +160,13 @@ bool wxTextValidator::Validate(wxWindow *parent)
     {
         //it's only ok to have the members of the list
         errormsg = _("'%s' is invalid");
     {
         //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))
     {
         // it's only ok to have non-members of the list
         errormsg = _("'%s' is invalid");
     }
     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;
+        ok = false;

     }
 
     if ( !ok )
     }
 
     if ( !ok )


@@ -193,30 +189,30 @@ bool wxTextValidator::Validate(wxWindow *parent)
 bool wxTextValidator::TransferToWindow(void)
 {
     if( !CheckValidator() )
 bool wxTextValidator::TransferToWindow(void)
 {
     if( !CheckValidator() )

-        return FALSE;
+        return false;

 
 

-    if (!m_stringValue)
-        return TRUE;
-
-    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
-    control->SetValue(* m_stringValue) ;
+    if ( 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)
 {
     if( !CheckValidator() )
 }
 
 // Called to transfer data to the window
 bool wxTextValidator::TransferFromWindow(void)
 {
     if( !CheckValidator() )

-        return FALSE;
-
-    if (!m_stringValue)
-        return TRUE;
+        return false;

 
 

-    wxTextCtrl *control = (wxTextCtrl *) m_validatorWindow ;
-    * m_stringValue = control->GetValue() ;
+    if ( m_stringValue )
+    {
+        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)


@@ -244,8 +240,8 @@ 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((char) keyCode, 1))) ||
-              ((m_validatorStyle & wxFILTER_EXCLUDE_CHAR_LIST) && !IsNotInCharExcludeList(wxString((char) keyCode, 1))) ||
+              ((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_ASCII) && !isascii(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||


@@ -273,9 +269,9 @@ 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('-')))
         // 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 false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 bool wxTextValidator::IsInCharIncludeList(const wxString& val)
 }
 
 bool wxTextValidator::IsInCharIncludeList(const wxString& val)


@@ -284,9 +280,9 @@ bool wxTextValidator::IsInCharIncludeList(const wxString& val)
     for ( i = 0; i < val.Length(); i++)
     {
         if (!m_includeList.Member((wxString) val[i]))
     for ( i = 0; i < val.Length(); i++)
     {
         if (!m_includeList.Member((wxString) val[i]))

-            return FALSE;
+            return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
 }
 
 bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)


@@ -295,9 +291,9 @@ bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
     for ( i = 0; i < val.Length(); i++)
     {
        if (m_excludeList.Member((wxString) val[i]))
     for ( i = 0; i < val.Length(); i++)
     {
        if (m_excludeList.Member((wxString) val[i]))

-       return FALSE;
+       return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 #endif
 }
 
 #endif