fix wxTimeSpan::Format() for negative spans with 0 hour component (#10055)

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

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 096039782362043d86a9daeeff7d41c73acd6064..8c69b0692be75eb86e2778bd72956ea8555999ee 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxTextValidator
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxTextValidator
 // Author:      Julian Smart
 // Modified by:


@@ -16,26 +16,23 @@
   #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
-

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


@@ -75,10 +72,33 @@ bool wxTextValidator::Copy(const wxTextValidator& val)
     return true;
 }
 
     return true;
 }
 

+wxTextEntry *wxTextValidator::GetTextEntry()
+{
+#if wxUSE_TEXTCTRL
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
+    {
+        return (wxTextCtrl*)m_validatorWindow;
+    }
+#endif
+
+#if wxUSE_COMBOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)))
+    {
+        return (wxComboBox*)m_validatorWindow;
+    }
+#endif
+
+    wxFAIL_MSG(
+        _T("wxTextValidator can only be used with wxTextCtrl or wxComboBox")
+    );
+
+    return NULL;
+}
+

 static bool wxIsAlpha(const wxString& val)
 {
     int i;
 static bool wxIsAlpha(const wxString& val)
 {
     int i;

-    for ( i = 0; i < (int)val.Length(); i++)
+    for ( i = 0; i < (int)val.length(); i++)

     {
         if (!wxIsalpha(val[i]))
             return false;
     {
         if (!wxIsalpha(val[i]))
             return false;


@@ -89,7 +109,7 @@ static bool wxIsAlpha(const wxString& val)
 static bool wxIsAlphaNumeric(const wxString& val)
 {
     int i;
 static bool wxIsAlphaNumeric(const wxString& val)
 {
     int i;

-    for ( i = 0; i < (int)val.Length(); i++)
+    for ( i = 0; i < (int)val.length(); i++)

     {
         if (!wxIsalnum(val[i]))
             return false;
     {
         if (!wxIsalnum(val[i]))
             return false;


@@ -101,16 +121,15 @@ static bool wxIsAlphaNumeric(const wxString& val)
 // This function can pop up an error message.
 bool wxTextValidator::Validate(wxWindow *parent)
 {
 // 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() )
+    if ( !m_validatorWindow->IsEnabled() )

         return true;
 
         return true;
 

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

 
     bool ok = true;
 
 
     bool ok = true;
 


@@ -184,13 +203,13 @@ bool wxTextValidator::Validate(wxWindow *parent)
 // 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;


@@ -199,79 +218,22 @@ bool wxTextValidator::TransferToWindow(void)
 // 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();
-    }
-
-    return true;
-}
-
-#if WXWIN_COMPATIBILITY_2_4
-
-inline void wxCopyStringListToArrayString(wxArrayString& to, const wxStringList& from)
-{
-    to.Clear();
+        wxTextEntry * const text = GetTextEntry();
+        if ( !text )
+            return false;

 
 

-    for ( wxStringList::compatibility_iterator pNode = from.GetFirst();
-          pNode;
-          pNode = pNode->GetNext() )
-    {
-        to.Add(pNode->GetData());
+        *m_stringValue = text->GetValue();

     }
     }

-}

 
 

-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)
-{
-    wxCopyStringListToArrayString(m_includes, list);
-}
-
-void wxTextValidator::SetExcludeList(const wxStringList& list)
-{
-    wxCopyStringListToArrayString(m_excludes, list);
-}
-
-bool wxTextValidator::IsInCharIncludeList(const wxString& val)
-{
-    return IsInCharIncludes(val);
-}
-
-bool wxTextValidator::IsNotInCharExcludeList(const wxString& val)
-{
-    return IsNotInCharExcludes(val);
+    return true;

 }
 
 }
 

-#endif //compat 2.4
-
-

 bool wxTextValidator::IsInCharIncludes(const wxString& val)
 {
     size_t i;
 bool wxTextValidator::IsInCharIncludes(const wxString& val)
 {
     size_t i;

-    for ( i = 0; i < val.Length(); i++)
+    for ( i = 0; i < val.length(); i++)

     {
         if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
             return false;
     {
         if (m_includes.Index((wxString) val[i]) == wxNOT_FOUND)
             return false;


@@ -282,7 +244,7 @@ bool wxTextValidator::IsInCharIncludes(const wxString& val)
 bool wxTextValidator::IsNotInCharExcludes(const wxString& val)
 {
     size_t i;
 bool wxTextValidator::IsNotInCharExcludes(const wxString& val)
 {
     size_t i;

-    for ( i = 0; i < val.Length(); i++)
+    for ( i = 0; i < val.length(); i++)

     {
        if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND)
             return false;
     {
        if (m_excludes.Index((wxString) val[i]) != wxNOT_FOUND)
             return false;


@@ -311,7 +273,7 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
               ((m_validatorStyle & wxFILTER_ALPHA) && !wxIsalpha(keyCode)) ||
               ((m_validatorStyle & wxFILTER_ALPHANUMERIC) && !wxIsalnum(keyCode)) ||
               ((m_validatorStyle & wxFILTER_NUMERIC) && !wxIsdigit(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'))

              )
            )
         {
              )
            )
         {


@@ -329,11 +291,11 @@ void wxTextValidator::OnChar(wxKeyEvent& event)
 static bool wxIsNumeric(const wxString& val)
 {
     int i;
 static bool wxIsNumeric(const wxString& val)
 {
     int i;

-    for ( i = 0; i < (int)val.Length(); 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
     {
         // 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('-')))
+        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 false;
     }
     return true;


@@ -341,4 +303,4 @@ static bool wxIsNumeric(const wxString& val)
 
 
 #endif
 
 
 #endif

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