From 388aa6e289cb30a44abe04a7fe9dfe9aca89733e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 11 Mar 2006 14:28:00 +0000 Subject: [PATCH] Applied patch [ 1435340 ] Add support of wxToggleButton to wxGenericValidator With precomp header fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/valgen.cpp | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index 0b5282829b..505d8321a9 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -40,8 +40,7 @@ #include "wx/slider.h" #endif - - #include "wx/spinctrl.h" +#include "wx/spinctrl.h" #if wxUSE_SPINBTN #include "wx/spinbutt.h" @@ -49,6 +48,9 @@ #if wxUSE_CHECKLISTBOX #include "wx/checklst.h" #endif +#if wxUSE_TOGGLEBTN + #include "wx/tglbtn.h" +#endif #include "wx/valgen.h" @@ -125,6 +127,17 @@ 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 +#endif // int controls #if wxUSE_GAUGE @@ -277,6 +290,7 @@ bool wxGenericValidator::TransferToWindow(void) } } else #endif + // array controls #if wxUSE_CHECKLISTBOX // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first: @@ -358,6 +372,17 @@ bool wxGenericValidator::TransferFromWindow(void) } } 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 +#endif // INT CONTROLS *************************************** #if wxUSE_GAUGE -- 2.45.2