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
This commit is contained in:
@@ -1020,6 +1020,15 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* wxMGL */
|
#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 */
|
/* generic controls dependencies */
|
||||||
#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
|
#if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
|
||||||
# if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG
|
# if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG
|
||||||
|
@@ -46,17 +46,5 @@
|
|||||||
#undef wxHAS_CRASH_REPORT
|
#undef wxHAS_CRASH_REPORT
|
||||||
#endif
|
#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_
|
#endif // _WX_FEATURES_H_
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user