X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/common/valgen.cpp?ds=sidebyside diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index 0b5282829b..bc5d8c806f 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: valgen.cpp +// Name: src/common/valgen.cpp // Purpose: wxGenericValidator class // Author: Kevin Smith // Modified by: @@ -13,42 +13,40 @@ #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 - #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" -#endif - - - #include "wx/spinctrl.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 + +#include "wx/spinctrl.h" +// #include "wx/datectrl.h" -- can't use it in this (core) file for now #if wxUSE_SPINBTN - #include "wx/spinbutt.h" + #include "wx/spinbutt.h" #endif -#if wxUSE_CHECKLISTBOX - #include "wx/checklst.h" +#if wxUSE_TOGGLEBTN + #include "wx/tglbtn.h" #endif +#include "wx/filename.h" #include "wx/valgen.h" @@ -78,6 +76,34 @@ wxGenericValidator::wxGenericValidator(wxArrayInt *val) m_pArrayInt = val; } +#if wxUSE_DATETIME + +wxGenericValidator::wxGenericValidator(wxDateTime *val) +{ + Initialize(); + m_pDateTime = val; +} + +wxGenericValidator::wxGenericValidator(wxFileName *val) +{ + Initialize(); + m_pFileName = val; +} + +wxGenericValidator::wxGenericValidator(float *val) +{ + Initialize(); + m_pFloat = val; +} + +wxGenericValidator::wxGenericValidator(double *val) +{ + Initialize(); + m_pDouble = val; +} + +#endif // wxUSE_DATETIME + wxGenericValidator::wxGenericValidator(const wxGenericValidator& val) : wxValidator() { @@ -92,6 +118,12 @@ bool wxGenericValidator::Copy(const wxGenericValidator& val) 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; } @@ -126,6 +158,29 @@ bool wxGenericValidator::TransferToWindow(void) } 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(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__) + if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) ) + { + wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow; + if (m_pBool) + { + pControl->SetValue(*m_pBool); + return true; + } + } else +#endif +#endif + // int controls #if wxUSE_GAUGE if (m_validatorWindow->IsKindOf(CLASSINFO(wxGauge)) ) @@ -194,6 +249,19 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif + // date time controls +#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking + if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) ) + { + wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow; + if (m_pDateTime) + { + pControl->SetValue(*m_pDateTime) ; + return true; + } + } else +#endif + // string controls #if wxUSE_BUTTON if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) ) @@ -275,8 +343,24 @@ 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: @@ -323,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; @@ -357,6 +442,28 @@ bool wxGenericValidator::TransferFromWindow(void) return true; } } else +#endif +#if wxUSE_TOGGLEBTN + if (m_validatorWindow->IsKindOf(CLASSINFO(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 (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) ) + { + wxBitmapToggleButton *pControl = (wxBitmapToggleButton *) m_validatorWindow; + if (m_pBool) + { + *m_pBool = pControl->GetValue() ; + return true; + } + } else +#endif #endif // INT CONTROLS *************************************** @@ -427,6 +534,19 @@ bool wxGenericValidator::TransferFromWindow(void) } else #endif + // DATE TIME CONTROLS ************************************ +#if 0 // wxUSE_DATEPICKCTRL -- temporary fix for shared build linking + if (m_validatorWindow->IsKindOf(CLASSINFO(wxDatePickerCtrl)) ) + { + wxDatePickerCtrl* pControl = (wxDatePickerCtrl*) m_validatorWindow; + if (m_pDateTime) + { + *m_pDateTime = pControl->GetValue() ; + return true; + } + } else +#endif + // STRING CONTROLS ************************************ #if wxUSE_BUTTON if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) ) @@ -499,6 +619,21 @@ 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 @@ -542,7 +677,7 @@ bool wxGenericValidator::TransferFromWindow(void) count = pControl->GetCount(); for ( i = 0; i < count; i++ ) { - if (pControl->Selected(i)) + if (pControl->IsSelected(i)) m_pArrayInt->Add(i); } @@ -562,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 - +#endif // wxUSE_VALIDATORS