X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..aa99e0cd2242db04fe1f9bb7d91aea545def2422:/src/common/valgen.cpp diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp index 4cf521922f..b4d296e619 100644 --- a/src/common/valgen.cpp +++ b/src/common/valgen.cpp @@ -168,7 +168,7 @@ bool wxGenericValidator::TransferToWindow(void) } } else #endif -#if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__) +#if wxUSE_SPINCTRL && !defined(__WXMOTIF__) if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) ) { wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow; @@ -179,7 +179,7 @@ bool wxGenericValidator::TransferToWindow(void) } } else #endif -#if wxUSE_SPINBTN && !defined(__WIN16__) +#if wxUSE_SPINBTN if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) ) { wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow; @@ -284,7 +284,7 @@ bool wxGenericValidator::TransferToWindow(void) } else #endif // array controls -#if wxUSE_CHECKLISTBOX && !defined(__WIN16__) +#if wxUSE_CHECKLISTBOX // NOTE: wxCheckListBox is a wxListBox, so wxCheckListBox MUST come first: if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) ) { @@ -398,7 +398,7 @@ bool wxGenericValidator::TransferFromWindow(void) } } else #endif -#if wxUSE_SPINCTRL && !defined(__WIN16__) && !defined(__WXMOTIF__) +#if wxUSE_SPINCTRL && !defined(__WXMOTIF__) if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinCtrl)) ) { wxSpinCtrl* pControl = (wxSpinCtrl*) m_validatorWindow; @@ -409,7 +409,7 @@ bool wxGenericValidator::TransferFromWindow(void) } } else #endif -#if wxUSE_SPINBTN && !defined(__WIN16__) +#if wxUSE_SPINBTN if (m_validatorWindow->IsKindOf(CLASSINFO(wxSpinButton)) ) { wxSpinButton* pControl = (wxSpinButton*) m_validatorWindow; @@ -502,7 +502,6 @@ bool wxGenericValidator::TransferFromWindow(void) #endif // array controls #if wxUSE_CHECKLISTBOX -#ifndef __WIN16__ // NOTE: wxCheckListBox isa wxListBox, so wxCheckListBox MUST come first: if (m_validatorWindow->IsKindOf(CLASSINFO(wxCheckListBox)) ) { @@ -527,7 +526,6 @@ bool wxGenericValidator::TransferFromWindow(void) return FALSE; } else #endif -#endif #if wxUSE_LISTBOX if (m_validatorWindow->IsKindOf(CLASSINFO(wxListBox)) ) {