X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3baef911e4d54307178d6ad4353a4b6ab57a69e4..87f0b1323b7ac77f02133b836c8dfee63b0fd387:/src/common/valgen.cpp diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index e38f6789bd..58f633f499 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -38,7 +38,7 @@ #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" @@ -46,6 +46,7 @@ #if wxUSE_TOGGLEBTN #include "wx/tglbtn.h" #endif +#include "wx/filename.h" #include "wx/valgen.h" @@ -85,6 +86,24 @@ wxGenericValidator::wxGenericValidator(wxDateTime *val) #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() { @@ -102,6 +121,9 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val) #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; } @@ -114,7 +136,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) @@ -125,7 +147,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) @@ -137,7 +159,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) @@ -146,8 +168,8 @@ bool wxGenericValidator::TransferToWindow(void) return true; } } else -#if defined(__WXMAC__) || defined(__WXGTK20__) - 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) @@ -161,7 +183,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) @@ -172,7 +194,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) @@ -183,7 +205,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) @@ -194,7 +216,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) @@ -205,7 +227,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) @@ -216,7 +238,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) @@ -229,7 +251,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) @@ -242,7 +264,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) @@ -253,7 +275,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) @@ -276,7 +298,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) @@ -295,7 +317,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) @@ -306,7 +328,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) @@ -321,13 +343,28 @@ bool wxGenericValidator::TransferToWindow(void) 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 (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) ) + if (wxDynamicCast(m_validatorWindow, wxCheckListBox)) { wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow; if (m_pArrayInt) @@ -350,7 +387,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) @@ -370,7 +407,8 @@ bool wxGenericValidator::TransferToWindow(void) } } else #endif - ; // to match the last 'else' above + { // to match the last 'else' above + } // unrecognized control, or bad pointer return false; @@ -384,7 +422,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) @@ -395,7 +433,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) @@ -406,7 +444,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) @@ -415,11 +453,22 @@ bool wxGenericValidator::TransferFromWindow(void) 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 - if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) ) + if (wxDynamicCast(m_validatorWindow, wxGauge)) { wxGauge* pControl = (wxGauge*) m_validatorWindow; if (m_pInt) @@ -430,7 +479,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) @@ -441,7 +490,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) @@ -452,7 +501,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) @@ -463,7 +512,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) @@ -474,7 +523,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) @@ -487,7 +536,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) @@ -500,7 +549,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) @@ -511,7 +560,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) @@ -530,7 +579,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) @@ -546,7 +595,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) @@ -557,7 +606,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) @@ -570,13 +619,28 @@ bool wxGenericValidator::TransferFromWindow(void) *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 (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) ) + if (wxDynamicCast(m_validatorWindow, wxCheckListBox)) { wxCheckListBox* pControl = (wxCheckListBox*) m_validatorWindow; if (m_pArrayInt) @@ -600,7 +664,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) @@ -633,13 +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 = 0; + m_pDateTime = NULL; #endif // wxUSE_DATETIME + m_pFileName = NULL; + m_pFloat = NULL; + m_pDouble = NULL; } #endif // wxUSE_VALIDATORS