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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index c8b30802807c003c16d11ac98a0b4e4da6d2d51f..0b48bd75596abe82ec17297c75bf54720f6c2e84 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1020,6 +1020,15 @@
 #   endif
 #endif /* wxMGL */
 
 #   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
 /* 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 4324e61fdeea5f5c21218c2a1e1d60b0bb58cd97..49deed180e524b909b4ef974a339e8f270b7b7af 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -46,17 +46,5 @@
     #undef wxHAS_CRASH_REPORT
 #endif
 
     #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_
 
 #endif // _WX_FEATURES_H_