removed useless inclusion of wx/datetime.h

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 2157d57e64888216c5cdb84f94d2e96b2985473e..d9de2dea7b8579014bae031bdf8d893dca20968c 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -1,61 +1,55 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999
 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999

-// RCS-ID:
+// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Kevin Smith
 // Copyright:   (c) 1999 Kevin Smith

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "valgen.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-  #include "wx/defs.h"
+    #pragma hdrstop

 #endif
 
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP
 #endif
 
 #if wxUSE_VALIDATORS
 
 #ifndef WX_PRECOMP

-  #include "wx/utils.h"
-  #include "wx/intl.h"
-  #include "wx/dynarray.h"
-  #include "wx/choice.h"
-  #include "wx/combobox.h"
-  #include "wx/radiobox.h"
-  #include "wx/radiobut.h"
-  #include "wx/checkbox.h"
-  #include "wx/scrolbar.h"
-  #include "wx/gauge.h"
-  #include "wx/stattext.h"
-  #include "wx/textctrl.h"
-  #include "wx/button.h"
-  #include "wx/listbox.h"
-  #include "wx/slider.h"
+    #include "wx/dynarray.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/choice.h"
+    #include "wx/combobox.h"
+    #include "wx/radiobox.h"
+    #include "wx/radiobut.h"
+    #include "wx/checkbox.h"
+    #include "wx/scrolbar.h"
+    #include "wx/gauge.h"
+    #include "wx/stattext.h"
+    #include "wx/textctrl.h"
+    #include "wx/button.h"
+    #include "wx/listbox.h"
+    #include "wx/slider.h"
+    #include "wx/checklst.h"

 #endif
 
 #endif
 

-#if wxUSE_SPINCTRL && !defined(__WIN16__)
-  #include "wx/spinctrl.h"
-#endif
-#if wxUSE_SPINBTN && !defined(__WIN16__)
-  #include "wx/spinbutt.h"
+#include "wx/spinctrl.h"
+
+#if wxUSE_SPINBTN
+    #include "wx/spinbutt.h"

 #endif
 #endif

-#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
-  #include "wx/checklst.h"
+#if wxUSE_TOGGLEBTN
+    #include "wx/tglbtn.h"

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

+IMPLEMENT_CLASS(wxGenericValidator, wxValidator)
+

 wxGenericValidator::wxGenericValidator(bool *val)
 {
     Initialize();
 wxGenericValidator::wxGenericValidator(bool *val)
 {
     Initialize();


@@ -81,6 +75,7 @@ wxGenericValidator::wxGenericValidator(wxArrayInt *val)
 }
 
 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
 }
 
 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)

+    : wxValidator()

 {
     Copy(val);
 }
 {
     Copy(val);
 }


@@ -94,18 +89,14 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val)
     m_pString = val.m_pString;
     m_pArrayInt = val.m_pArrayInt;
 
     m_pString = val.m_pString;
     m_pArrayInt = val.m_pArrayInt;
 

-    return TRUE;
-}
-
-wxGenericValidator::~wxGenericValidator()
-{
+    return true;

 }
 
 // Called to transfer data to the window
 bool wxGenericValidator::TransferToWindow(void)
 {
     if ( !m_validatorWindow )
 }
 
 // Called to transfer data to the window
 bool wxGenericValidator::TransferToWindow(void)
 {
     if ( !m_validatorWindow )

-        return FALSE;
+        return false;

 
     // bool controls
 #if wxUSE_CHECKBOX
 
     // bool controls
 #if wxUSE_CHECKBOX


@@ -113,22 +104,45 @@ bool wxGenericValidator::TransferToWindow(void)
     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)
     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)

-       {
-           pControl->SetValue(*m_pBool);
-           return TRUE;
-       }
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }

     } else
 #endif
 #if wxUSE_RADIOBTN
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
     } else
 #endif
 #if wxUSE_RADIOBTN
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;

-       if (m_pBool)
-       {
-           pControl->SetValue(*m_pBool) ;
-           return TRUE;
-       }
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool) ;
+            return true;
+        }
+    } else
+#endif
+
+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    {
+        wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
+#if defined(__WXMAC__) || defined(__WXGTK20__)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
+    {
+        wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }

     } else
     } else

+#endif

 #endif
 
     // int controls
 #endif
 
     // int controls


@@ -136,55 +150,55 @@ bool wxGenericValidator::TransferToWindow(void)
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;

-       if (m_pInt)
-       {
-           pControl->SetValue(*m_pInt);
-           return TRUE;
-       }
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt);
+            return true;
+        }

     } else
 #endif
 #if wxUSE_RADIOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
     } else
 #endif
 #if wxUSE_RADIOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;

-       if (m_pInt)
-       {
-           pControl->SetSelection(*m_pInt) ;
-           return TRUE;
-       }
+        if (m_pInt)
+        {
+            pControl->SetSelection(*m_pInt) ;
+            return true;
+        }

     } else
 #endif
 #if wxUSE_SCROLLBAR
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
     } else
 #endif
 #if wxUSE_SCROLLBAR
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;

-       if (m_pInt)
-       {
-           pControl->SetThumbPosition(*m_pInt) ;
-           return TRUE;
-       }
+        if (m_pInt)
+        {
+            pControl->SetThumbPosition(*m_pInt) ;
+            return true;
+        }

     } else
 #endif
     } else
 #endif

-#if wxUSE_SPINCTRL && !defined(__WIN16__)
+#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)

     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)
         {
             pControl->SetValue(*m_pInt);
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)
         {
             pControl->SetValue(*m_pInt);

-            return TRUE;
+            return true;

         }
     } else
 #endif
         }
     } else
 #endif

-#if wxUSE_SPINBTN && !defined(__WIN16__)
+#if wxUSE_SPINBTN

     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;

-       if (m_pInt)
-       {
-           pControl->SetValue(*m_pInt) ;
-           return TRUE;
-       }
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt) ;
+            return true;
+        }

     } else
 #endif
 #if wxUSE_SLIDER
     } else
 #endif
 #if wxUSE_SLIDER


@@ -193,22 +207,24 @@ bool wxGenericValidator::TransferToWindow(void)
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)
         {
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)
         {

-           pControl->SetValue(*m_pInt) ;
-           return TRUE;
-       }
+            pControl->SetValue(*m_pInt) ;
+            return true;
+        }

     } else
 #endif
 
     } else
 #endif
 

-  // string controls
+    // string controls
+#if wxUSE_BUTTON

     if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
     {
         wxButton* pControl = (wxButton*) m_validatorWindow;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
     {
         wxButton* pControl = (wxButton*) m_validatorWindow;

-       if (m_pString)
-       {
-           pControl->SetLabel(*m_pString) ;
-           return TRUE;
-       }
+        if (m_pString)
+        {
+            pControl->SetLabel(*m_pString) ;
+            return true;
+        }

     } else
     } else

+#endif

 #if wxUSE_COMBOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
     {
 #if wxUSE_COMBOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
     {


@@ -216,15 +232,19 @@ bool wxGenericValidator::TransferToWindow(void)
         if (m_pInt)
         {
             pControl->SetSelection(*m_pInt) ;
         if (m_pInt)
         {
             pControl->SetSelection(*m_pInt) ;

-            return TRUE;
+            return true;

         }
         else if (m_pString)
         {
         }
         else if (m_pString)
         {

-            if (pControl->FindString(* m_pString) > -1)
+            if (pControl->FindString(* m_pString) != wxNOT_FOUND)

             {
                 pControl->SetStringSelection(* m_pString);
             }
             {
                 pControl->SetStringSelection(* m_pString);
             }

-            return TRUE;
+            if ((m_validatorWindow->GetWindowStyle() & wxCB_READONLY) == 0)
+            {
+                pControl->SetValue(* m_pString);
+            }
+            return true;

         }
     } else
 #endif
         }
     } else
 #endif


@@ -235,304 +255,341 @@ bool wxGenericValidator::TransferToWindow(void)
         if (m_pInt)
         {
             pControl->SetSelection(*m_pInt) ;
         if (m_pInt)
         {
             pControl->SetSelection(*m_pInt) ;

-            return TRUE;
+            return true;

         }
         else if (m_pString)
         {
         }
         else if (m_pString)
         {

-            if (pControl->FindString(* m_pString) > -1)
+            if (pControl->FindString(* m_pString) != wxNOT_FOUND)

             {
                 pControl->SetStringSelection(* m_pString);
             }
             {
                 pControl->SetStringSelection(* m_pString);
             }

-            return TRUE;
+            return true;

         }
     } else
 #endif
         }
     } else
 #endif

+#if wxUSE_STATTEXT

     if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)
         {
             pControl->SetLabel(*m_pString) ;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)
         {
             pControl->SetLabel(*m_pString) ;

-            return TRUE;
+            return true;

         }
         }

-    } else 
+    } else
+#endif
+#if wxUSE_TEXTCTRL

     if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
         if (m_pString)
         {
             pControl->SetValue(*m_pString) ;
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
         if (m_pString)
         {
             pControl->SetValue(*m_pString) ;

-            return TRUE;
+            return true;

         }
         else if (m_pInt)
         {
             wxString str;
             str.Printf(wxT("%d"), *m_pInt);
             pControl->SetValue(str);
         }
         else if (m_pInt)
         {
             wxString str;
             str.Printf(wxT("%d"), *m_pInt);
             pControl->SetValue(str);

-            return TRUE;
+            return true;

         }
     } else
         }
     } else

-#if wxUSE_CHECKLISTBOX
-#ifndef __WIN16__
-  // array controls
-  // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
-  // MUST come first:
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
-  {
-    wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
-       if (m_pArrayInt)
-    {
-      // clear all selections
-      int i;
-      for (i = 0 ; i < pControl->Number(); ++i)
-        pControl->Check(i, FALSE);
-      // select each item in our array
-      unsigned u;
-      for (u = 0; u < m_pArrayInt->Count(); ++u)
-        pControl->Check(m_pArrayInt->Item(u));
-      return TRUE;
-    }
-       else
-               return FALSE;
-  } else

 #endif
 #endif

+
+    // array controls
+#if wxUSE_CHECKLISTBOX
+    // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    {
+        wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear all selections
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Check(i, false);
+
+            // select each item in our array
+            count = m_pArrayInt->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Check(m_pArrayInt->Item(i));
+
+            return true;
+        }
+        else
+            return false;
+    } else

 #endif
 #if wxUSE_LISTBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
 #endif
 #if wxUSE_LISTBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;

-       if (m_pArrayInt)
-       {
-           // clear all selections
-           int i;
-           for (i = 0 ; i < pControl->Number(); ++i)
-               pControl->Deselect(i);
-           // select each item in our array
-           unsigned u;
-           for (u = 0; u < m_pArrayInt->Count(); ++u)
-               pControl->SetSelection(m_pArrayInt->Item(u));
-           return TRUE;
-       }
+        if (m_pArrayInt)
+        {
+            // clear all selections
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->Deselect(i);
+
+            // select each item in our array
+            count = m_pArrayInt->GetCount();
+            for ( i = 0 ; i < count; i++ )
+                pControl->SetSelection(m_pArrayInt->Item(i));
+
+            return true;
+        }

     } else
 #endif
     } else
 #endif

+        ;   // to match the last 'else' above

 
   // unrecognized control, or bad pointer
 
   // unrecognized control, or bad pointer

-    return FALSE;
-  return FALSE;
+  return false;

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

-  if ( !m_validatorWindow )
-    return FALSE;
+    if ( !m_validatorWindow )
+        return false;

 
 

-  // bool controls
+    // BOOL CONTROLS **************************************

 #if wxUSE_CHECKBOX
 #if wxUSE_CHECKBOX

-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
-  {
-    wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
-       if (m_pBool)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )

     {
     {

-      *m_pBool = pControl->GetValue() ;
-      return TRUE;
-    }
-  } else
+        wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else

 #endif
 #if wxUSE_RADIOBTN
 #endif
 #if wxUSE_RADIOBTN

-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
-  {
-    wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
-       if (m_pBool)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )

     {
     {

-      *m_pBool = pControl->GetValue() ;
-      return TRUE;
-    }
-  } else
+        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else

 #endif
 #endif

-  // int controls
+#if wxUSE_TOGGLEBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    {
+        wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+
+    // INT CONTROLS ***************************************

 #if wxUSE_GAUGE
 #if wxUSE_GAUGE

-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
-  {
-    wxGauge* pControl = (wxGauge*) m_validatorWindow;
-       if (m_pInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )

     {
     {

-      *m_pInt = pControl->GetValue() ;
-      return TRUE;
-    }
-  } else
+        wxGauge* pControl = (wxGauge*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else

 #endif
 #if wxUSE_RADIOBOX
 #endif
 #if wxUSE_RADIOBOX

-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
-  {
-    wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
-       if (m_pInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )

     {
     {

-      *m_pInt = pControl->GetSelection() ;
-      return TRUE;
-    }
-  } else
+        wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+    } else

 #endif
 #if wxUSE_SCROLLBAR
 #endif
 #if wxUSE_SCROLLBAR

-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
-  {
-    wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
-       if (m_pInt)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )

     {
     {

-      *m_pInt = pControl->GetThumbPosition() ;
-      return TRUE;
-    }
-  } else
+        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetThumbPosition() ;
+            return true;
+        }
+    } else

 #endif
 #endif

-#if wxUSE_SPINCTRL && !defined(__WIN16__)
+#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)

     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)
         {
             *m_pInt=pControl->GetValue();
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)
         {
             *m_pInt=pControl->GetValue();

-            return TRUE;
+            return true;

         }
     } else
 #endif
         }
     } else
 #endif

-#if wxUSE_SPINBTN && !defined(__WIN16__)
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
-  {
-    wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
-       if (m_pInt)
+#if wxUSE_SPINBTN
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )

     {
     {

-      *m_pInt = pControl->GetValue() ;
-      return TRUE;
-    }
-  } else
+        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else

 #endif
 #if wxUSE_SLIDER
 #endif
 #if wxUSE_SLIDER

-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
-  {
-    wxSlider* pControl = (wxSlider*) m_validatorWindow;
-    if (m_pInt)
-    {
-      pControl->SetValue(*m_pInt) ;
-      return TRUE;
-    }
-  } else
-#endif
-  // string controls
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
-  {
-    wxButton* pControl = (wxButton*) m_validatorWindow;
-       if (m_pString)
-    {
-      *m_pString = pControl->GetLabel() ;
-      return TRUE;
-    }
-  }
-  else
-#if wxUSE_COMBOBOX
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
-  {
-    wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
-       if (m_pString)
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
+    {
+        wxSlider* pControl = (wxSlider*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+
+    // STRING CONTROLS ************************************
+#if wxUSE_BUTTON
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )

     {
     {

-      *m_pString = pControl->GetValue() ;
-      return TRUE;
-    }
-    else if (m_pString)
+        wxButton* pControl = (wxButton*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetLabel() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_COMBOBOX
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )

     {
     {

-        *m_pString = pControl->GetStringSelection();
-        return TRUE;
-    }
-  } else
+        wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            if (m_validatorWindow->GetWindowStyle() & wxCB_READONLY)
+                *m_pString = pControl->GetStringSelection();
+            else
+                *m_pString = pControl->GetValue();
+            return true;
+        }
+    } else

 #endif
 #if wxUSE_CHOICE
 #endif
 #if wxUSE_CHOICE

- if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
-  {
-    wxChoice* pControl = (wxChoice*) m_validatorWindow;
-       if (m_pInt)
-    {
-      *m_pInt = pControl->GetSelection() ;
-      return TRUE;
-    }
-    else if (m_pString)
-    {
-        *m_pString = pControl->GetStringSelection();
-        return TRUE;
-    }
-  } else
-#endif
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
-  {
-    wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
-       if (m_pString)
-    {
-      *m_pString = pControl->GetLabel() ;
-      return TRUE;
-    }
-  } else
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
-  {
-    wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
-       if (m_pString)
-    {
-      *m_pString = pControl->GetValue() ;
-      return TRUE;
-    }
-    else if (m_pInt)
-    {
-        *m_pInt = wxAtoi(pControl->GetValue());
-        return TRUE;
-    }
-  } else
-#if wxUSE_CHECKLISTBOX
-#ifndef __WIN16__
-  // array controls
-  // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox
-  // MUST come first:
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
-  {
-    wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
-       if (m_pArrayInt)
-    {
-      // clear our array
-      m_pArrayInt->Clear();
-      // add each selected item to our array
-      int i;
-      for (i = 0 ; i < pControl->Number(); ++i)
-        if (pControl->IsChecked(i))
-          m_pArrayInt->Add(i);
-      return TRUE;
-    }
-       else
-         return FALSE;
-  } else
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
+    {
+        wxChoice* pControl = (wxChoice*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetSelection() ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            *m_pString = pControl->GetStringSelection();
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_STATTEXT
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
+    {
+        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetLabel() ;
+            return true;
+        }
+    } else

 #endif
 #endif

+#if wxUSE_TEXTCTRL
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+    {
+        wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetValue() ;
+            return true;
+        }
+        else if (m_pInt)
+        {
+            *m_pInt = wxAtoi(pControl->GetValue());
+            return true;
+        }
+    } else
+#endif
+
+    // ARRAY CONTROLS *************************************
+#if wxUSE_CHECKLISTBOX
+    // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    {
+        wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear our array
+            m_pArrayInt->Clear();
+
+            // add each selected item to our array
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0; i < count; i++ )
+            {
+                if (pControl->IsChecked(i))
+                    m_pArrayInt->Add(i);
+            }
+
+            return true;
+        }
+        else
+            return false;
+    } else

 #endif
 #if wxUSE_LISTBOX
 #endif
 #if wxUSE_LISTBOX

-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
-  {
-    wxListBox* pControl = (wxListBox*) m_validatorWindow;
-       if (m_pArrayInt)
-    {
-      // clear our array
-      m_pArrayInt->Clear();
-      // add each selected item to our array
-      int i;
-      for (i = 0 ; i < pControl->Number(); ++i)
-        if (pControl->Selected(i))
-          m_pArrayInt->Add(i);
-      return TRUE;
-    }
-  } else
+    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+    {
+        wxListBox* pControl = (wxListBox*) m_validatorWindow;
+        if (m_pArrayInt)
+        {
+            // clear our array
+            m_pArrayInt->Clear();
+
+            // add each selected item to our array
+            size_t i,
+                   count = pControl->GetCount();
+            for ( i = 0; i < count; i++ )
+            {
+                if (pControl->IsSelected(i))
+                    m_pArrayInt->Add(i);
+            }
+
+            return true;
+        }
+    } else

 #endif
 
 #endif
 

-  // unrecognized control, or bad pointer
-    return FALSE;
-  return FALSE;
+    // unrecognized control, or bad pointer
+        return false;
+
+    return false;

 }
 
 /*
   Called by constructors to initialize ALL data members
 }
 
 /*
   Called by constructors to initialize ALL data members

-       Last change:  JAC  21 Jul 100    5:00 pm

 */
 void wxGenericValidator::Initialize()
 {
 */
 void wxGenericValidator::Initialize()
 {


@@ -544,4 +601,3 @@ void wxGenericValidator::Initialize()
 
 #endif
   // wxUSE_VALIDATORS
 
 #endif
   // wxUSE_VALIDATORS

-