check for wxUSE_TIMER in headers, not the files including them

[wxWidgets.git] / include / wx / msw / wince / chkconf.h

diff --git a/include/wx/msw/wince/chkconf.h b/include/wx/msw/wince/chkconf.h
index 5f320a3605b88b8f40d8f19f04ec55350e142ac5..2c2b6580872bd68ce7237781c85b9f725ae52335 100644 (file)
--- a/include/wx/msw/wince/chkconf.h
+++ b/include/wx/msw/wince/chkconf.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/wince/chkconf.h
+// Name:        wx/msw/wince/chkconf.h

 // Purpose:     WinCE-specific configuration options checks
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     WinCE-specific configuration options checks
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -19,6 +19,12 @@
     #define wxUSE_STDPATHS 0
 #endif // WCE_PLATFORM_STANDARDSDK
 
     #define wxUSE_STDPATHS 0
 #endif // WCE_PLATFORM_STANDARDSDK
 

+#if _WIN32_WCE < 400
+    // not enough API and lack of ddraw.h
+    #undef wxUSE_DISPLAY
+    #define wxUSE_DISPLAY 0
+#endif
+

 // DDE doesn't exist under WinCE and wxIPC is DDE-based under MSW
 #undef wxUSE_IPC
 #define wxUSE_IPC 0
 // DDE doesn't exist under WinCE and wxIPC is DDE-based under MSW
 #undef wxUSE_IPC
 #define wxUSE_IPC 0


@@ -34,13 +40,6 @@
 #undef wxUSE_ON_FATAL_EXCEPTION
 #define wxUSE_ON_FATAL_EXCEPTION 0
 
 #undef wxUSE_ON_FATAL_EXCEPTION
 #define wxUSE_ON_FATAL_EXCEPTION 0
 

-// media stuff not supported under CE
-#undef wxUSE_DIRECTSHOW
-#define wxUSE_DIRECTSHOW 0
-
-#undef wxUSE_MEDIACTRL
-#define wxUSE_MEDIACTRL 0
-

 #undef wxUSE_WXHTML_HELP
 #define wxUSE_WXHTML_HELP 0
 
 #undef wxUSE_WXHTML_HELP
 #define wxUSE_WXHTML_HELP 0
 


@@ -53,9 +52,26 @@
 #undef wxUSE_REGEX
 #define wxUSE_REGEX 0
 
 #undef wxUSE_REGEX
 #define wxUSE_REGEX 0
 

+#undef wxUSE_DEBUGREPORT
+#define wxUSE_DEBUGREPORT 0
+
+// other MSW settings not supported by CE
+#undef wxUSE_RICHEDIT
+#define wxUSE_RICHEDIT 0
+#undef wxUSE_RICHEDIT2
+#define wxUSE_RICHEDIT2 0
+
+#undef wxUSE_UXTHEME
+#define wxUSE_UXTHEME 0
+#undef wxUSE_UXTHEME_AUTO
+#define wxUSE_UXTHEME_AUTO 0
+
+#undef wxUSE_UNICODE_MSLU
+#define wxUSE_UNICODE_MSLU 0
+

 
 // Disable features which don't make sense for MS Smartphones
 
 // Disable features which don't make sense for MS Smartphones

-// (due to pointer device usage, limited controls, file system)
+// (due to pointer device usage, limited controls or dialogs, file system)

 #if defined(__SMARTPHONE__)
     #undef wxUSE_LISTBOOK
     #define wxUSE_LISTBOOK 0
 #if defined(__SMARTPHONE__)
     #undef wxUSE_LISTBOOK
     #define wxUSE_LISTBOOK 0


@@ -66,8 +82,8 @@
     #undef wxUSE_STATUSBAR
     #define wxUSE_STATUSBAR 0
 
     #undef wxUSE_STATUSBAR
     #define wxUSE_STATUSBAR 0
 

-    #undef wxUSE_DEBUGREPORT
-    #define wxUSE_DEBUGREPORT 0
+    #undef wxUSE_COLOURPICKERCTRL
+    #define wxUSE_COLOURPICKERCTRL 0

 #endif // __SMARTPHONE__
 
 #endif // _WX_MSW_WINCE_CHKCONF_H_
 #endif // __SMARTPHONE__
 
 #endif // _WX_MSW_WINCE_CHKCONF_H_