Fix wxWrapSizer minimal size calculation.

[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 987b93f953eb1b3d5f8812af03ecd6da8cc4341a..fc9ce49670a0b8bf1699d90b58913de03cab8988 100644 (file)
--- a/include/wx/msw/wince/chkconf.h
+++ b/include/wx/msw/wince/chkconf.h
@@ -28,6 +28,12 @@
     #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
@@ -41,10 +47,19 @@
 #undef wxUSE_IPC
 #define wxUSE_IPC 0
 
-// and they're disabled for WinCE in build/bakefiles/{tiff|regex}.bkl so can't
-// be enabled here
-#undef wxUSE_LIBTIFF
-#define wxUSE_LIBTIFF 0
+// doesn't make sense for CE devices and doesn't compile anyhow
+#undef wxUSE_JOYSTICK
+#define wxUSE_JOYSTICK 0
+
+// libtiff doesn't build with eVC but is ok with VC8
+#ifdef __EVC4__
+    #undef wxUSE_LIBTIFF
+    #define wxUSE_LIBTIFF 0
+#endif
+
+// no AUI under CE: it's unnecessary and currently doesn't compile
+#undef wxUSE_AUI
+#define wxUSE_AUI 0
 
 // no MDI under CE
 #undef wxUSE_MDI
@@ -71,13 +86,14 @@
 #undef wxUSE_OWNER_DRAWN
 #define wxUSE_OWNER_DRAWN 0
 
-// libtiff and regex apparently don't compile with eVC (to check with eVC4?)
-// other MSW settings not supported by CE
 #undef wxUSE_PRINTING_ARCHITECTURE
 #define wxUSE_PRINTING_ARCHITECTURE 0
 
-#undef wxUSE_REGEX
-#define wxUSE_REGEX 0
+// regex doesn't build with eVC but is ok with VC8
+#ifdef __EVC4__
+    #undef wxUSE_REGEX
+    #define wxUSE_REGEX 0
+#endif
 
 #undef wxUSE_RICHEDIT
 #define wxUSE_RICHEDIT 0
@@ -91,9 +107,13 @@
     #define wxUSE_STDPATHS 0
 #endif // WCE_PLATFORM_STANDARDSDK
 
+// there is no support for balloon taskbar icons
+#undef wxUSE_TASKBARICON_BALLOONS
+#define wxUSE_TASKBARICON_BALLOONS 0
+
 // not sure if this is supported by eVC but VC8 SDK lacks the tooltips control
 // related declarations
-#if defined(__VISUALC__) && __VISUALC__ >= 1400
+#if wxCHECK_VISUALC_VERSION(8)
     #undef wxUSE_TOOLTIPS
     #define wxUSE_TOOLTIPS 0
 #endif