From b92203a8be20debe7615492c26969d17bcd7fa8d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Jul 2003 21:11:47 +0000 Subject: [PATCH] moved smart phone test to chkconf.h from features.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/chkconf.h | 9 +++++++++ include/wx/features.h | 12 ------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index c8b3080280..0b48bd7559 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -1020,6 +1020,15 @@ # endif #endif /* wxMGL */ +// Hopefully we can emulate these dialogs in due course +#if wxUSE_SMARTPHONE +# ifdef wxUSE_COLOURDLG +# undef wxUSE_COLOURDLG +# define wxUSE_COLOURDLG 0 +# endif +#endif /* wxUSE_SMARTPHONE */ + + /* generic controls dependencies */ #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) # if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG diff --git a/include/wx/features.h b/include/wx/features.h index 4324e61fde..49deed180e 100644 --- a/include/wx/features.h +++ b/include/wx/features.h @@ -46,17 +46,5 @@ #undef wxHAS_CRASH_REPORT #endif -// Hopefully we can emulate these dialogs in due -// course -#if wxUSE_SMARTPHONE - -# ifdef wxUSE_COLOURDLG -# undef wxUSE_COLOURDLG -# define wxUSE_COLOURDLG 0 -# endif - -#endif - - #endif // _WX_FEATURES_H_ -- 2.45.2