From 76fcb97e5f4389c7d4d219b3237936af2e74d644 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Wed, 18 Mar 2009 00:40:09 +0000 Subject: [PATCH] add support to wxBitmapToggleButton also in TransferFromWindow (closes #10600 - thanks gmeeker) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/valgen.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index 1266e49a90..47f6f230d6 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -146,7 +146,7 @@ bool wxGenericValidator::TransferToWindow(void) return true; } } else -#if (defined(__WXMAC__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__) +#if (defined(__WXMAC__) || defined(__WXMSW__) || defined(__WXGTK20__)) && !defined(__WXUNIVERSAL__) if (m_validatorWindow->IsKindOf(CLASSINFO(wxBitmapToggleButton)) ) { wxBitmapToggleButton * pControl = (wxBitmapToggleButton *) m_validatorWindow; @@ -416,6 +416,17 @@ bool wxGenericValidator::TransferFromWindow(void) 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 *************************************** -- 2.45.2