X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..bc9d3d911cfb51f612a699d7fb00f57eb5b2097c:/src/common/valgen.cpp

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 41c659fe64..58f633f499 100644
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -1,55 +1,57 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        valgen.cpp
+// Name:        src/common/valgen.cpp
 // Purpose:     wxGenericValidator class
 // Author:      Kevin Smith
 // Modified by:
 // Created:     Jan 22 1999
-// RCS-ID:      
+// RCS-ID:      $Id$
 // 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__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_VALIDATORS
+
 #ifndef WX_PRECOMP
-  #include "wx/defs.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
 
-#if wxUSE_VALIDATORS
+#include "wx/spinctrl.h"
+// #include "wx/datectrl.h" -- can't use it in this (core) file for now
 
-#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"
-#endif
-
-#ifndef __WIN16__
-  #include "wx/spinbutt.h"
-  #include "wx/checklst.h"
+#if wxUSE_SPINBTN
+    #include "wx/spinbutt.h"
 #endif
+#if wxUSE_TOGGLEBTN
+    #include "wx/tglbtn.h"
+#endif
+#include "wx/filename.h"
 
 #include "wx/valgen.h"
 
+IMPLEMENT_CLASS(wxGenericValidator, wxValidator)
+
 wxGenericValidator::wxGenericValidator(bool *val)
 {
     Initialize();
@@ -74,376 +76,620 @@ wxGenericValidator::wxGenericValidator(wxArrayInt *val)
     m_pArrayInt = val;
 }
 
-wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
+#if wxUSE_DATETIME
+
+wxGenericValidator::wxGenericValidator(wxDateTime *val)
 {
-    Copy(val);
+    Initialize();
+    m_pDateTime = val;
 }
 
-bool wxGenericValidator::Copy(const wxGenericValidator& val)
+#endif // wxUSE_DATETIME
+
+wxGenericValidator::wxGenericValidator(wxFileName *val)
 {
-  wxValidator::Copy(val);
+    Initialize();
+    m_pFileName = val;
+}
+
+wxGenericValidator::wxGenericValidator(float *val)
+{
+    Initialize();
+    m_pFloat = val;
+}
 
-  m_pBool = val.m_pBool;
-  m_pInt = val.m_pInt;
-  m_pString = val.m_pString;
-  m_pArrayInt = val.m_pArrayInt;
+wxGenericValidator::wxGenericValidator(double *val)
+{
+    Initialize();
+    m_pDouble = val;
+}
 
-  return TRUE;
+wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
+    : wxValidator()
+{
+    Copy(val);
 }
 
-wxGenericValidator::~wxGenericValidator()
+bool wxGenericValidator::Copy(const wxGenericValidator& val)
 {
+    wxValidator::Copy(val);
+
+    m_pBool = val.m_pBool;
+    m_pInt = val.m_pInt;
+    m_pString = val.m_pString;
+    m_pArrayInt = val.m_pArrayInt;
+#if wxUSE_DATETIME
+    m_pDateTime = val.m_pDateTime;
+#endif // wxUSE_DATETIME
+    m_pFileName = val.m_pFileName;
+    m_pFloat = val.m_pFloat;
+    m_pDouble = val.m_pDouble;
+
+    return true;
 }
 
 // Called to transfer data to the window
 bool wxGenericValidator::TransferToWindow(void)
 {
-  if ( !m_validatorWindow )
-    return FALSE;
+    if ( !m_validatorWindow )
+        return false;
 
-  // bool controls
+    // bool controls
 #if wxUSE_CHECKBOX
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
-  {
-    wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
-	if (m_pBool)
+    if (wxDynamicCast(m_validatorWindow, wxCheckBox))
     {
-      pControl->SetValue(*m_pBool) ;
-      return TRUE;
-    }
-  } else
+        wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_RADIOBTN
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
-  {
-    wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
-	if (m_pBool)
+    if (wxDynamicCast(m_validatorWindow, wxRadioButton))
     {
-      pControl->SetValue(*m_pBool) ;
-      return TRUE;
-    }
-  } else
+        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool) ;
+            return true;
+        }
+    } else
+#endif
+
+#if wxUSE_TOGGLEBTN
+    if (wxDynamicCast(m_validatorWindow, wxToggleButton))
+    {
+        wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
+#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
+    if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton))
+    {
+        wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            pControl->SetValue(*m_pBool);
+            return true;
+        }
+    } else
+#endif
 #endif
-  // int controls
+
+    // int controls
 #if wxUSE_GAUGE
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
-  {
-    wxGauge* pControl = (wxGauge*) m_validatorWindow;
-	if (m_pInt)
+    if (wxDynamicCast(m_validatorWindow, wxGauge))
     {
-      pControl->SetValue(*m_pInt) ;
-      return TRUE;
-    }
-  }
-  else 
+        wxGauge* pControl = (wxGauge*) m_validatorWindow;
+        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;
-	if (m_pInt)
+    if (wxDynamicCast(m_validatorWindow, wxRadioBox))
     {
-      pControl->SetSelection(*m_pInt) ;
-      return TRUE;
-    }
-  }
-  else 
+        wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
+        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;
-	if (m_pInt)
+    if (wxDynamicCast(m_validatorWindow, wxScrollBar))
     {
-      pControl->SetThumbPosition(*m_pInt) ;
-      return TRUE;
-    }
-  } else
+        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetThumbPosition(*m_pInt) ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
+    if (wxDynamicCast(m_validatorWindow, wxSpinCtrl))
+    {
+        wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt);
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_SPINBTN
-#ifndef __WIN16__
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
-  {
-    wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
-	if (m_pInt)
-    {
-      pControl->SetValue(*m_pInt) ;
-      return TRUE;
-    }
-  } else
+    if (wxDynamicCast(m_validatorWindow, wxSpinButton))
+    {
+        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetValue(*m_pInt) ;
+            return true;
+        }
+    } else
 #endif
+#if wxUSE_SLIDER
+    if (wxDynamicCast(m_validatorWindow, 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)
+
+    // date time controls
+#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
+    if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl))
     {
-      pControl->SetLabel(*m_pString) ;
-      return TRUE;
-    }
-  } else 
+        wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
+        if (m_pDateTime)
+        {
+            pControl->SetValue(*m_pDateTime) ;
+            return true;
+        }
+    } else
+#endif
+
+    // string controls
+#if wxUSE_BUTTON
+    if (wxDynamicCast(m_validatorWindow, wxButton))
+    {
+        wxButton* pControl = (wxButton*) m_validatorWindow;
+        if (m_pString)
+        {
+            pControl->SetLabel(*m_pString) ;
+            return true;
+        }
+    } else
+#endif
 #if wxUSE_COMBOBOX
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
-  {
-    wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
-	if (m_pString)
+    if (wxDynamicCast(m_validatorWindow, wxComboBox))
     {
-      pControl->SetValue(*m_pString) ;
-      return TRUE;
-    }
-  } else
+        wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetSelection(*m_pInt) ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            if (pControl->FindString(* m_pString) != wxNOT_FOUND)
+            {
+                pControl->SetStringSelection(* m_pString);
+            }
+            if ((m_validatorWindow->GetWindowStyle() & wxCB_READONLY) == 0)
+            {
+                pControl->SetValue(* m_pString);
+            }
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_CHOICE
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
-  {
-    wxChoice* pControl = (wxChoice*) m_validatorWindow;
-	if (m_pInt)
+    if (wxDynamicCast(m_validatorWindow, wxChoice))
     {
-      pControl->SetSelection(*m_pInt) ;
-      return TRUE;
-    }
-  }
+        wxChoice* pControl = (wxChoice*) m_validatorWindow;
+        if (m_pInt)
+        {
+            pControl->SetSelection(*m_pInt) ;
+            return true;
+        }
+        else if (m_pString)
+        {
+            if (pControl->FindString(* m_pString) != wxNOT_FOUND)
+            {
+                pControl->SetStringSelection(* m_pString);
+            }
+            return true;
+        }
+    } else
 #endif
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
-  {
-    wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
-	if (m_pString)
+#if wxUSE_STATTEXT
+    if (wxDynamicCast(m_validatorWindow, wxStaticText))
     {
-      pControl->SetLabel(*m_pString) ;
-      return TRUE;
-    }
-  }
-  else if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
-  {
-    wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
-	if (m_pString)
-    {
-      pControl->SetValue(*m_pString) ;
-      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 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
+        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
+        if (m_pString)
+        {
+            pControl->SetLabel(*m_pString) ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_TEXTCTRL
+    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))
+    {
+        wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
+        if (m_pString)
+        {
+            pControl->SetValue(*m_pString) ;
+            return true;
+        }
+        else if (m_pInt)
+        {
+            wxString str;
+            str.Printf(wxT("%d"), *m_pInt);
+            pControl->SetValue(str);
+            return true;
+        }
+        else if (m_pFileName)
+        {
+            pControl->SetValue(m_pFileName->GetFullPath());
+            return true;
+        }
+        else if (m_pFloat)
+        {
+            pControl->SetValue(wxString::Format(wxT("%g"), *m_pFloat));
+            return true;
+        }
+        else if (m_pDouble)
+        {
+            pControl->SetValue(wxString::Format(wxT("%g"), *m_pDouble));
+            return true;
+        }
+    } else
 #endif
+
+    // array controls
+#if wxUSE_CHECKLISTBOX
+    // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
+    if (wxDynamicCast(m_validatorWindow, 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;
-	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;
-    }
-  } else
+    if (wxDynamicCast(m_validatorWindow, wxListBox))
+    {
+        wxListBox* pControl = (wxListBox*) m_validatorWindow;
+        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
+    {   // to match the last 'else' above
+    }
 
   // unrecognized control, or bad pointer
-    return FALSE;
-  return FALSE;
+  return false;
 }
 
-// Called to transfer data to the window
+// 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 (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
-  {
-    wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
-	if (m_pBool)
+    if (wxDynamicCast(m_validatorWindow, 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
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
-  {
-    wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
-	if (m_pBool)
+    if (wxDynamicCast(m_validatorWindow, wxRadioButton))
     {
-      *m_pBool = pControl->GetValue() ;
-      return TRUE;
-    }
-  } else
+        wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_TOGGLEBTN
+    if (wxDynamicCast(m_validatorWindow, wxToggleButton))
+    {
+        wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
+    if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton))
+    {
+        wxBitmapToggleButton *pControl = (wxBitmapToggleButton *) m_validatorWindow;
+        if (m_pBool)
+        {
+            *m_pBool = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
 #endif
-  // int controls
+
+    // INT CONTROLS ***************************************
 #if wxUSE_GAUGE
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
-  {
-    wxGauge* pControl = (wxGauge*) m_validatorWindow;
-	if (m_pInt)
+    if (wxDynamicCast(m_validatorWindow, 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
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
-  {
-    wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
-	if (m_pInt)
+    if (wxDynamicCast(m_validatorWindow, 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
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
-  {
-    wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
-	if (m_pInt)
+    if (wxDynamicCast(m_validatorWindow, wxScrollBar))
     {
-      *m_pInt = pControl->GetThumbPosition() ;
-      return TRUE;
-    }
-  } else
+        wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetThumbPosition() ;
+            return true;
+        }
+    } else
+#endif
+#if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
+    if (wxDynamicCast(m_validatorWindow, wxSpinCtrl))
+    {
+        wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt=pControl->GetValue();
+            return true;
+        }
+    } else
 #endif
 #if wxUSE_SPINBTN
-#ifndef __WIN16__
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
-  {
-    wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
-	if (m_pInt)
-    {
-      *m_pInt = pControl->GetValue() ;
-      return TRUE;
-    }
-  } else
+    if (wxDynamicCast(m_validatorWindow, wxSpinButton))
+    {
+        wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
 #endif
+#if wxUSE_SLIDER
+    if (wxDynamicCast(m_validatorWindow, wxSlider))
+    {
+        wxSlider* pControl = (wxSlider*) m_validatorWindow;
+        if (m_pInt)
+        {
+            *m_pInt = pControl->GetValue() ;
+            return true;
+        }
+    } else
 #endif
-  // string controls
-  if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
-  {
-    wxButton* pControl = (wxButton*) m_validatorWindow;
-	if (m_pString)
+
+    // DATE TIME CONTROLS ************************************
+#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
+    if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl))
     {
-      *m_pString = pControl->GetLabel() ;
-      return TRUE;
-    }
-  }
-  else 
+        wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
+        if (m_pDateTime)
+        {
+            *m_pDateTime = pControl->GetValue() ;
+            return true;
+        }
+    } else
+#endif
+
+    // STRING CONTROLS ************************************
+#if wxUSE_BUTTON
+    if (wxDynamicCast(m_validatorWindow, wxButton))
+    {
+        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)) )
-  {
-    wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
-	if (m_pString)
+    if (wxDynamicCast(m_validatorWindow, wxComboBox))
     {
-      *m_pString = pControl->GetValue() ;
-      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
- if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
-  {
-    wxChoice* pControl = (wxChoice*) m_validatorWindow;
-	if (m_pInt)
+    if (wxDynamicCast(m_validatorWindow, wxChoice))
     {
-      *m_pInt = pControl->GetSelection() ;
-      return TRUE;
-    }
-  } else 
+        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)
+#if wxUSE_STATTEXT
+    if (wxDynamicCast(m_validatorWindow, wxStaticText))
     {
-      *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 wxUSE_LISTBOX
-#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
+        wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
+        if (m_pString)
+        {
+            *m_pString = pControl->GetLabel() ;
+            return true;
+        }
+    } else
 #endif
+#if wxUSE_TEXTCTRL
+    if (wxDynamicCast(m_validatorWindow, 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 (m_pFileName)
+        {
+            m_pFileName->Assign(pControl->GetValue());
+            return true;
+        }
+        else if (m_pFloat)
+        {
+            *m_pFloat = (float)wxAtof(pControl->GetValue());
+            return true;
+        }
+        else if (m_pDouble)
+        {
+            *m_pDouble = wxAtof(pControl->GetValue());
+            return true;
+        }
+    } else
+#endif
+
+    // ARRAY CONTROLS *************************************
+#if wxUSE_CHECKLISTBOX
+    // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:
+    if (wxDynamicCast(m_validatorWindow, 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
-  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 (wxDynamicCast(m_validatorWindow, 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
 
-  // unrecognized control, or bad pointer
-    return FALSE;
-  return FALSE;
+    // unrecognized control, or bad pointer
+        return false;
+
+    return false;
 }
 
 /*
@@ -451,12 +697,16 @@ bool wxGenericValidator::TransferFromWindow(void)
 */
 void wxGenericValidator::Initialize()
 {
-    m_pBool = 0;
-    m_pInt = 0;
-    m_pString = 0;
-    m_pArrayInt = 0;
+    m_pBool = NULL;
+    m_pInt = NULL;
+    m_pString = NULL;
+    m_pArrayInt = NULL;
+#if wxUSE_DATETIME
+    m_pDateTime = NULL;
+#endif // wxUSE_DATETIME
+    m_pFileName = NULL;
+    m_pFloat = NULL;
+    m_pDouble = NULL;
 }
 
-#endif
-  // wxUSE_VALIDATORS
-  
\ No newline at end of file
+#endif // wxUSE_VALIDATORS