-// Standard SDK lacks a few things, forcefully disable them
-#ifdef WCE_PLATFORM_STANDARDSDK
- // no shell functions support
- #undef wxUSE_STDPATHS
- #define wxUSE_STDPATHS 0
-#endif // WCE_PLATFORM_STANDARDSDK
+// ----------------------------------------------------------------------------
+// Disable features which don't work or don't make sense under CE
+// ----------------------------------------------------------------------------
+
+// please keep the list in alphabetic order except for closely related settings
+// (e.g. wxUSE_ENH_METAFILE is put immediately after wxUSE_METAFILE)
+
+#undef wxUSE_DEBUGREPORT
+#define wxUSE_DEBUGREPORT 0
+
+#if _WIN32_WCE < 400
+ // not enough API and lack of ddraw.h
+ #undef wxUSE_DISPLAY
+ #define wxUSE_DISPLAY 0
+#endif
+
+// eVC doesn't have standard streams
+#ifdef __EVC4__
+ #undef wxUSE_STD_IOSTREAM
+ #define wxUSE_STD_IOSTREAM 0
+#endif
+
+// wxFSVolume currently doesn't compile under CE and it's not clear if it makes
+// sense at all there (the drives and their names are fixed on CE systems)
+#undef wxUSE_FSVOLUME
+#define wxUSE_FSVOLUME 0
+
+// no .INI files API under CE
+#undef wxUSE_INICONF
+#define wxUSE_INICONF 0