X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/906c935a80b10d53cecf57f71ab5f3f4f1d529ec..cc4d5638c66a409e421420ed7110917755a66788:/src/common/valgen.cpp?ds=sidebyside diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index bc5d8c806f..19c26df510 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -4,7 +4,6 @@ // Author: Kevin Smith // Modified by: // Created: Jan 22 1999 -// RCS-ID: $Id$ // Copyright: (c) 1999 Kevin Smith // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -84,6 +83,8 @@ wxGenericValidator::wxGenericValidator(wxDateTime *val) m_pDateTime = val; } +#endif // wxUSE_DATETIME + wxGenericValidator::wxGenericValidator(wxFileName *val) { Initialize(); @@ -102,8 +103,6 @@ wxGenericValidator::wxGenericValidator(double *val) m_pDouble = val; } -#endif // wxUSE_DATETIME - wxGenericValidator::wxGenericValidator(const wxGenericValidator& val) : wxValidator() { @@ -136,7 +135,7 @@ bool wxGenericValidator::TransferToWindow(void) // bool controls #if wxUSE_CHECKBOX - if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) ) + if (wxDynamicCast(m_validatorWindow, wxCheckBox)) { wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow; if (m_pBool) @@ -147,7 +146,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_RADIOBTN - if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) ) + if (wxDynamicCast(m_validatorWindow, wxRadioButton)) { wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow; if (m_pBool) @@ -159,7 +158,7 @@ bool wxGenericValidator::TransferToWindow(void) #endif #if wxUSE_TOGGLEBTN - if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) ) + if (wxDynamicCast(m_validatorWindow, wxToggleButton)) { wxToggleButton * pControl = (wxToggleButton *) m_validatorWindow; if (m_pBool) @@ -169,7 +168,7 @@ bool wxGenericValidator::TransferToWindow(void) } } else #if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__) - if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) ) + if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton)) { wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow; if (m_pBool) @@ -183,7 +182,7 @@ bool wxGenericValidator::TransferToWindow(void) // int controls #if wxUSE_GAUGE - if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) ) + if (wxDynamicCast(m_validatorWindow, wxGauge)) { wxGauge* pControl = (wxGauge*) m_validatorWindow; if (m_pInt) @@ -194,7 +193,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_RADIOBOX - if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) ) + if (wxDynamicCast(m_validatorWindow, wxRadioBox)) { wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow; if (m_pInt) @@ -205,7 +204,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_SCROLLBAR - if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) ) + if (wxDynamicCast(m_validatorWindow, wxScrollBar)) { wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow; if (m_pInt) @@ -216,7 +215,7 @@ bool wxGenericValidator::TransferToWindow(void) } 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) @@ -227,7 +226,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_SPINBTN - if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) ) + if (wxDynamicCast(m_validatorWindow, wxSpinButton)) { wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow; if (m_pInt) @@ -238,7 +237,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_SLIDER - if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) ) + if (wxDynamicCast(m_validatorWindow, wxSlider)) { wxSlider* pControl = (wxSlider*) m_validatorWindow; if (m_pInt) @@ -251,7 +250,7 @@ bool wxGenericValidator::TransferToWindow(void) // 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) @@ -264,7 +263,7 @@ bool wxGenericValidator::TransferToWindow(void) // string controls #if wxUSE_BUTTON - if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) ) + if (wxDynamicCast(m_validatorWindow, wxButton)) { wxButton* pControl = (wxButton*) m_validatorWindow; if (m_pString) @@ -275,7 +274,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_COMBOBOX - if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) ) + if (wxDynamicCast(m_validatorWindow, wxComboBox)) { wxComboBox* pControl = (wxComboBox*) m_validatorWindow; if (m_pInt) @@ -298,7 +297,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_CHOICE - if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) ) + if (wxDynamicCast(m_validatorWindow, wxChoice)) { wxChoice* pControl = (wxChoice*) m_validatorWindow; if (m_pInt) @@ -317,7 +316,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_STATTEXT - if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) ) + if (wxDynamicCast(m_validatorWindow, wxStaticText)) { wxStaticText* pControl = (wxStaticText*) m_validatorWindow; if (m_pString) @@ -328,7 +327,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_TEXTCTRL - if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) + if (wxDynamicCast(m_validatorWindow, wxTextCtrl)) { wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow; if (m_pString) @@ -364,7 +363,7 @@ bool wxGenericValidator::TransferToWindow(void) // 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) @@ -387,7 +386,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif #if wxUSE_LISTBOX - if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) ) + if (wxDynamicCast(m_validatorWindow, wxListBox)) { wxListBox* pControl = (wxListBox*) m_validatorWindow; if (m_pArrayInt) @@ -422,7 +421,7 @@ bool wxGenericValidator::TransferFromWindow(void) // BOOL CONTROLS ************************************** #if wxUSE_CHECKBOX - if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckBox)) ) + if (wxDynamicCast(m_validatorWindow, wxCheckBox)) { wxCheckBox* pControl = (wxCheckBox*) m_validatorWindow; if (m_pBool) @@ -433,7 +432,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_RADIOBTN - if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioButton)) ) + if (wxDynamicCast(m_validatorWindow, wxRadioButton)) { wxRadioButton* pControl = (wxRadioButton*) m_validatorWindow; if (m_pBool) @@ -444,7 +443,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_TOGGLEBTN - if (m_validatorWindow->IsKindOf(CLASSINFO(wxToggleButton)) ) + if (wxDynamicCast(m_validatorWindow, wxToggleButton)) { wxToggleButton *pControl = (wxToggleButton *) m_validatorWindow; if (m_pBool) @@ -454,7 +453,7 @@ bool wxGenericValidator::TransferFromWindow(void) } } else #if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__) - if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) ) + if (wxDynamicCast(m_validatorWindow, wxBitmapToggleButton)) { wxBitmapToggleButton *pControl = (wxBitmapToggleButton *) m_validatorWindow; if (m_pBool) @@ -468,7 +467,7 @@ bool wxGenericValidator::TransferFromWindow(void) // INT CONTROLS *************************************** #if wxUSE_GAUGE - if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) ) + if (wxDynamicCast(m_validatorWindow, wxGauge)) { wxGauge* pControl = (wxGauge*) m_validatorWindow; if (m_pInt) @@ -479,7 +478,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_RADIOBOX - if (m_validatorWindow->IsKindOf(CLASSINFO(wxRadioBox)) ) + if (wxDynamicCast(m_validatorWindow, wxRadioBox)) { wxRadioBox* pControl = (wxRadioBox*) m_validatorWindow; if (m_pInt) @@ -490,7 +489,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_SCROLLBAR - if (m_validatorWindow->IsKindOf(CLASSINFO(wxScrollBar)) ) + if (wxDynamicCast(m_validatorWindow, wxScrollBar)) { wxScrollBar* pControl = (wxScrollBar*) m_validatorWindow; if (m_pInt) @@ -501,7 +500,7 @@ bool wxGenericValidator::TransferFromWindow(void) } 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) @@ -512,7 +511,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_SPINBTN - if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) ) + if (wxDynamicCast(m_validatorWindow, wxSpinButton)) { wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow; if (m_pInt) @@ -523,7 +522,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_SLIDER - if (m_validatorWindow->IsKindOf(CLASSINFO(wxSlider)) ) + if (wxDynamicCast(m_validatorWindow, wxSlider)) { wxSlider* pControl = (wxSlider*) m_validatorWindow; if (m_pInt) @@ -536,7 +535,7 @@ bool wxGenericValidator::TransferFromWindow(void) // 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) @@ -549,7 +548,7 @@ bool wxGenericValidator::TransferFromWindow(void) // STRING CONTROLS ************************************ #if wxUSE_BUTTON - if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) ) + if (wxDynamicCast(m_validatorWindow, wxButton)) { wxButton* pControl = (wxButton*) m_validatorWindow; if (m_pString) @@ -560,7 +559,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_COMBOBOX - if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) ) + if (wxDynamicCast(m_validatorWindow, wxComboBox)) { wxComboBox* pControl = (wxComboBox*) m_validatorWindow; if (m_pInt) @@ -579,7 +578,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_CHOICE - if (m_validatorWindow->IsKindOf(CLASSINFO(wxChoice)) ) + if (wxDynamicCast(m_validatorWindow, wxChoice)) { wxChoice* pControl = (wxChoice*) m_validatorWindow; if (m_pInt) @@ -595,7 +594,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_STATTEXT - if (m_validatorWindow->IsKindOf(CLASSINFO(wxStaticText)) ) + if (wxDynamicCast(m_validatorWindow, wxStaticText)) { wxStaticText* pControl = (wxStaticText*) m_validatorWindow; if (m_pString) @@ -606,7 +605,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_TEXTCTRL - if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) ) + if (wxDynamicCast(m_validatorWindow, wxTextCtrl)) { wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow; if (m_pString) @@ -640,7 +639,7 @@ bool wxGenericValidator::TransferFromWindow(void) // 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) @@ -664,7 +663,7 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif #if wxUSE_LISTBOX - if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) ) + if (wxDynamicCast(m_validatorWindow, wxListBox)) { wxListBox* pControl = (wxListBox*) m_validatorWindow; if (m_pArrayInt)