Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 1435340 ] Add support of wxToggleButton to wxGenericValidator

Browse Source 
With precomp header fix


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-03-11 14:28:00 +00:00
parent d8909578f7
commit 388aa6e289
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/valgen.cpp
View File

@@ -40,8 +40,7 @@
#include "wx/slider.h" #include "wx/slider.h"
#endif #endif
#include "wx/spinctrl.h"
#include "wx/spinctrl.h"
#if wxUSE_SPINBTN #if wxUSE_SPINBTN
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
@@ -49,6 +48,9 @@
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
#include "wx/checklst.h" #include "wx/checklst.h"
#endif #endif
#if wxUSE_TOGGLEBTN
#include "wx/tglbtn.h"
#endif
#include "wx/valgen.h" #include "wx/valgen.h"
@@ -125,6 +127,17 @@ bool wxGenericValidator::TransferToWindow(void)
} }
} else } else
#endif #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 // int controls
#if wxUSE_GAUGE #if wxUSE_GAUGE
@@ -277,6 +290,7 @@ bool wxGenericValidator::TransferToWindow(void)
} }
} else } else
#endif #endif
// array controls // array controls
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
// NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first: // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
@@ -358,6 +372,17 @@ bool wxGenericValidator::TransferFromWindow(void)
} }
} else } else
#endif #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 *************************************** // INT CONTROLS ***************************************
#if wxUSE_GAUGE #if wxUSE_GAUGE