Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index 1266e49a905cc5c69181586525aeb1d5948707e5..58f633f4993c568f4c0154ad766b660b4a67e276 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -38,7 +38,7 @@
 #endif
 
 #include "wx/spinctrl.h"
 #endif
 
 #include "wx/spinctrl.h"

-#include "wx/datectrl.h"
+// #include "wx/datectrl.h" -- can't use it in this (core) file for now

 
 #if wxUSE_SPINBTN
     #include "wx/spinbutt.h"
 
 #if wxUSE_SPINBTN
     #include "wx/spinbutt.h"


@@ -46,6 +46,7 @@
 #if wxUSE_TOGGLEBTN
     #include "wx/tglbtn.h"
 #endif
 #if wxUSE_TOGGLEBTN
     #include "wx/tglbtn.h"
 #endif

+#include "wx/filename.h"

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


@@ -85,6 +86,24 @@ wxGenericValidator::wxGenericValidator(wxDateTime *val)
 
 #endif // wxUSE_DATETIME
 
 
 #endif // wxUSE_DATETIME
 

+wxGenericValidator::wxGenericValidator(wxFileName *val)
+{
+    Initialize();
+    m_pFileName = val;
+}
+
+wxGenericValidator::wxGenericValidator(float *val)
+{
+    Initialize();
+    m_pFloat = val;
+}
+
+wxGenericValidator::wxGenericValidator(double *val)
+{
+    Initialize();
+    m_pDouble = val;
+}
+

 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
     : wxValidator()
 {
 wxGenericValidator::wxGenericValidator(const wxGenericValidator& val)
     : wxValidator()
 {


@@ -102,6 +121,9 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val)
 #if wxUSE_DATETIME
     m_pDateTime = val.m_pDateTime;
 #endif // wxUSE_DATETIME
 #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;
 }
 
     return true;
 }


@@ -114,7 +136,7 @@ bool wxGenericValidator::TransferToWindow(void)
 
     // bool controls
 #if wxUSE_CHECKBOX
 
     // bool controls
 #if wxUSE_CHECKBOX

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxCheckBox))

     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)
     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)


@@ -125,7 +147,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_RADIOBTN
     } else
 #endif
 #if wxUSE_RADIOBTN

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxRadioButton))

     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
         if (m_pBool)
     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
         if (m_pBool)


@@ -137,7 +159,7 @@ bool wxGenericValidator::TransferToWindow(void)
 #endif
 
 #if wxUSE_TOGGLEBTN
 #endif
 
 #if wxUSE_TOGGLEBTN

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxToggleButton))

     {
         wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
         if (m_pBool)
     {
         wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow;
         if (m_pBool)


@@ -146,8 +168,8 @@ bool wxGenericValidator::TransferToWindow(void)
             return true;
         }
     } else
             return true;
         }
     } else

-#if (defined(__WXMAC__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) )
+#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__)
+    if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton))

     {
         wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
         if (m_pBool)
     {
         wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow;
         if (m_pBool)


@@ -161,7 +183,7 @@ bool wxGenericValidator::TransferToWindow(void)
 
     // int controls
 #if wxUSE_GAUGE
 
     // int controls
 #if wxUSE_GAUGE

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
+    if (wxDynamicCast(m_validatorWindow, wxGauge))

     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;
         if (m_pInt)
     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;
         if (m_pInt)


@@ -172,7 +194,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_RADIOBOX
     } else
 #endif
 #if wxUSE_RADIOBOX

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxRadioBox))

     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
         if (m_pInt)
     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
         if (m_pInt)


@@ -183,7 +205,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_SCROLLBAR
     } else
 #endif
 #if wxUSE_SCROLLBAR

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
+    if (wxDynamicCast(m_validatorWindow, wxScrollBar))

     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
         if (m_pInt)
     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
         if (m_pInt)


@@ -194,7 +216,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
     } else
 #endif
 #if wxUSE_SPINCTRL && !defined(__WXMOTIF__)

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxSpinCtrl))

     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)
     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)


@@ -205,7 +227,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_SPINBTN
     } else
 #endif
 #if wxUSE_SPINBTN

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxSpinButton))

     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
         if (m_pInt)
     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
         if (m_pInt)


@@ -216,7 +238,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_SLIDER
     } else
 #endif
 #if wxUSE_SLIDER

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
+    if (wxDynamicCast(m_validatorWindow, wxSlider))

     {
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)
     {
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)


@@ -229,7 +251,7 @@ bool wxGenericValidator::TransferToWindow(void)
 
     // date time controls
 #if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
 
     // date time controls
 #if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl))

     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
         if (m_pDateTime)
     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
         if (m_pDateTime)


@@ -242,7 +264,7 @@ bool wxGenericValidator::TransferToWindow(void)
 
     // string controls
 #if wxUSE_BUTTON
 
     // string controls
 #if wxUSE_BUTTON

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxButton))

     {
         wxButton* pControl = (wxButton*) m_validatorWindow;
         if (m_pString)
     {
         wxButton* pControl = (wxButton*) m_validatorWindow;
         if (m_pString)


@@ -253,7 +275,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_COMBOBOX
     } else
 #endif
 #if wxUSE_COMBOBOX

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxComboBox))

     {
         wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
         if (m_pInt)
     {
         wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
         if (m_pInt)


@@ -276,7 +298,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_CHOICE
     } else
 #endif
 #if wxUSE_CHOICE

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
+    if (wxDynamicCast(m_validatorWindow, wxChoice))

     {
         wxChoice* pControl = (wxChoice*) m_validatorWindow;
         if (m_pInt)
     {
         wxChoice* pControl = (wxChoice*) m_validatorWindow;
         if (m_pInt)


@@ -295,7 +317,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_STATTEXT
     } else
 #endif
 #if wxUSE_STATTEXT

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
+    if (wxDynamicCast(m_validatorWindow, wxStaticText))

     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)
     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)


@@ -306,7 +328,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_TEXTCTRL
     } else
 #endif
 #if wxUSE_TEXTCTRL

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))

     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
         if (m_pString)
     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
         if (m_pString)


@@ -321,13 +343,28 @@ bool wxGenericValidator::TransferToWindow(void)
             pControl->SetValue(str);
             return true;
         }
             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:
     } else
 #endif
 
     // array controls
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxCheckListBox))

     {
         wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
         if (m_pArrayInt)
     {
         wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
         if (m_pArrayInt)


@@ -350,7 +387,7 @@ bool wxGenericValidator::TransferToWindow(void)
     } else
 #endif
 #if wxUSE_LISTBOX
     } else
 #endif
 #if wxUSE_LISTBOX

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxListBox))

     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
         if (m_pArrayInt)
     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
         if (m_pArrayInt)


@@ -385,7 +422,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 
     // BOOL CONTROLS **************************************
 #if wxUSE_CHECKBOX
 
     // BOOL CONTROLS **************************************
 #if wxUSE_CHECKBOX

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxCheckBox))

     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)
     {
         wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow;
         if (m_pBool)


@@ -396,7 +433,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_RADIOBTN
     } else
 #endif
 #if wxUSE_RADIOBTN

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxRadioButton))

     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
         if (m_pBool)
     {
         wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow;
         if (m_pBool)


@@ -407,7 +444,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_TOGGLEBTN
     } else
 #endif
 #if wxUSE_TOGGLEBTN

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxToggleButton))

     {
         wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
         if (m_pBool)
     {
         wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow;
         if (m_pBool)


@@ -416,11 +453,22 @@ bool wxGenericValidator::TransferFromWindow(void)
             return true;
         }
     } else
             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 ***************************************
 #if wxUSE_GAUGE
 #endif
 
     // INT CONTROLS ***************************************
 #if wxUSE_GAUGE

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) )
+    if (wxDynamicCast(m_validatorWindow, wxGauge))

     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;
         if (m_pInt)
     {
         wxGauge* pControl = (wxGauge*) m_validatorWindow;
         if (m_pInt)


@@ -431,7 +479,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_RADIOBOX
     } else
 #endif
 #if wxUSE_RADIOBOX

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxRadioBox))

     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
         if (m_pInt)
     {
         wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow;
         if (m_pInt)


@@ -442,7 +490,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SCROLLBAR
     } else
 #endif
 #if wxUSE_SCROLLBAR

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) )
+    if (wxDynamicCast(m_validatorWindow, wxScrollBar))

     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
         if (m_pInt)
     {
         wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow;
         if (m_pInt)


@@ -453,7 +501,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SPINCTRL && !defined(__WXMOTIF__)
     } else
 #endif
 #if wxUSE_SPINCTRL && !defined(__WXMOTIF__)

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxSpinCtrl))

     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)
     {
         wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow;
         if (m_pInt)


@@ -464,7 +512,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SPINBTN
     } else
 #endif
 #if wxUSE_SPINBTN

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxSpinButton))

     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
         if (m_pInt)
     {
         wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow;
         if (m_pInt)


@@ -475,7 +523,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_SLIDER
     } else
 #endif
 #if wxUSE_SLIDER

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) )
+    if (wxDynamicCast(m_validatorWindow, wxSlider))

     {
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)
     {
         wxSlider* pControl = (wxSlider*) m_validatorWindow;
         if (m_pInt)


@@ -488,7 +536,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 
     // DATE TIME CONTROLS ************************************
 #if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking
 
     // DATE TIME CONTROLS ************************************
 #if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxDatePickerCtrl))

     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
         if (m_pDateTime)
     {
         wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow;
         if (m_pDateTime)


@@ -501,7 +549,7 @@ bool wxGenericValidator::TransferFromWindow(void)
 
     // STRING CONTROLS ************************************
 #if wxUSE_BUTTON
 
     // STRING CONTROLS ************************************
 #if wxUSE_BUTTON

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
+    if (wxDynamicCast(m_validatorWindow, wxButton))

     {
         wxButton* pControl = (wxButton*) m_validatorWindow;
         if (m_pString)
     {
         wxButton* pControl = (wxButton*) m_validatorWindow;
         if (m_pString)


@@ -512,7 +560,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_COMBOBOX
     } else
 #endif
 #if wxUSE_COMBOBOX

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxComboBox))

     {
         wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
         if (m_pInt)
     {
         wxComboBox* pControl = (wxComboBox*) m_validatorWindow;
         if (m_pInt)


@@ -531,7 +579,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_CHOICE
     } else
 #endif
 #if wxUSE_CHOICE

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) )
+    if (wxDynamicCast(m_validatorWindow, wxChoice))

     {
         wxChoice* pControl = (wxChoice*) m_validatorWindow;
         if (m_pInt)
     {
         wxChoice* pControl = (wxChoice*) m_validatorWindow;
         if (m_pInt)


@@ -547,7 +595,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_STATTEXT
     } else
 #endif
 #if wxUSE_STATTEXT

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) )
+    if (wxDynamicCast(m_validatorWindow, wxStaticText))

     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)
     {
         wxStaticText* pControl = (wxStaticText*) m_validatorWindow;
         if (m_pString)


@@ -558,7 +606,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_TEXTCTRL
     } else
 #endif
 #if wxUSE_TEXTCTRL

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
+    if (wxDynamicCast(m_validatorWindow, wxTextCtrl))

     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
         if (m_pString)
     {
         wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
         if (m_pString)


@@ -571,13 +619,28 @@ bool wxGenericValidator::TransferFromWindow(void)
             *m_pInt = wxAtoi(pControl->GetValue());
             return true;
         }
             *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:
     } else
 #endif
 
     // ARRAY CONTROLS *************************************
 #if wxUSE_CHECKLISTBOX
     // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first:

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxCheckListBox))

     {
         wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
         if (m_pArrayInt)
     {
         wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow;
         if (m_pArrayInt)


@@ -601,7 +664,7 @@ bool wxGenericValidator::TransferFromWindow(void)
     } else
 #endif
 #if wxUSE_LISTBOX
     } else
 #endif
 #if wxUSE_LISTBOX

-    if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) )
+    if (wxDynamicCast(m_validatorWindow, wxListBox))

     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
         if (m_pArrayInt)
     {
         wxListBox* pControl = (wxListBox*) m_validatorWindow;
         if (m_pArrayInt)


@@ -634,13 +697,16 @@ bool wxGenericValidator::TransferFromWindow(void)
 */
 void wxGenericValidator::Initialize()
 {
 */
 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
 #if wxUSE_DATETIME

-    m_pDateTime = 0;
+    m_pDateTime = NULL;

 #endif // wxUSE_DATETIME
 #endif // wxUSE_DATETIME

+    m_pFileName = NULL;
+    m_pFloat = NULL;
+    m_pDouble = NULL;

 }
 
 #endif // wxUSE_VALIDATORS
 }
 
 #endif // wxUSE_VALIDATORS