Applied patch [ 738821 ] Allow more features to be turned off

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-05-23 18:59:07 +00:00
parent 3443393889
commit d726047819
12 changed files with 52 additions and 10 deletions

View File

@@ -203,6 +203,7 @@ bool wxGenericValidator::TransferToWindow(void)
#endif
// string controls
#if wxUSE_BUTTON
if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
{
wxButton* pControl = (wxButton*) m_validatorWindow;
@@ -212,6 +213,7 @@ bool wxGenericValidator::TransferToWindow(void)
return TRUE;
}
} else
#endif
#if wxUSE_COMBOBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{
@@ -263,6 +265,7 @@ bool wxGenericValidator::TransferToWindow(void)
return TRUE;
}
} else
#if wxUSE_TEXTCTRL
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
{
wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
@@ -279,6 +282,7 @@ bool wxGenericValidator::TransferToWindow(void)
return TRUE;
}
} else
#endif
// array controls
#if wxUSE_CHECKLISTBOX && !defined(__WIN16__)
// NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first:
@@ -428,6 +432,7 @@ bool wxGenericValidator::TransferFromWindow(void)
} else
#endif
// string controls
#if wxUSE_BUTTON
if (m_validatorWindow->IsKindOf(CLASSINFO(wxButton)) )
{
wxButton* pControl = (wxButton*) m_validatorWindow;
@@ -436,8 +441,8 @@ bool wxGenericValidator::TransferFromWindow(void)
*m_pString = pControl->GetLabel() ;
return TRUE;
}
}
else
} else
#endif
#if wxUSE_COMBOBOX
if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)) )
{
@@ -479,6 +484,7 @@ bool wxGenericValidator::TransferFromWindow(void)
return TRUE;
}
} else
#if wxUSE_TEXTCTRL
if (m_validatorWindow->IsKindOf(CLASSINFO(wxTextCtrl)) )
{
wxTextCtrl* pControl = (wxTextCtrl*) m_validatorWindow;
@@ -493,6 +499,7 @@ bool wxGenericValidator::TransferFromWindow(void)
return TRUE;
}
} else
#endif
// array controls
#if wxUSE_CHECKLISTBOX
#ifndef __WIN16__