moved WinCE-specific part into wx/msw/wince/chkconf.h; added more stuff to it (partly...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index b0d3e253e386e82904353b43f746180540be63d4..aa7293c8f577a09de235fbaf135329942b2373fb 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -21,18 +21,17 @@
 /*
  * If using PostScript-in-MSW in Univ, must enable PostScript
  */
-
 #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
-#undef wxUSE_POSTSCRIPT
-#define wxUSE_POSTSCRIPT 1
+#   undef wxUSE_POSTSCRIPT
+#   define wxUSE_POSTSCRIPT 1
 #endif
 
 #ifndef wxUSE_NORLANDER_HEADERS
-#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || defined(__WINE__) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
-#   define wxUSE_NORLANDER_HEADERS 1
-#else
-#   define wxUSE_NORLANDER_HEADERS 0
-#endif
+#   if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || defined(__WINE__) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
+#       define wxUSE_NORLANDER_HEADERS 1
+#   else
+#       define wxUSE_NORLANDER_HEADERS 0
+#   endif
 #endif
 
 /*
@@ -51,46 +50,41 @@
     #define wxUSE_STACKWALKER 0
 #endif // compiler doesn't support SEH
 
-/*
- * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
- */
-
+/* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
 #if defined(__MWERKS__)
     #undef wxUSE_DEBUG_NEW_ALWAYS
     #define wxUSE_DEBUG_NEW_ALWAYS      0
 #endif
 
 #if defined(__GNUWIN32__)
-/* These don't work as expected for mingw32 and cygwin32 */
-#undef  wxUSE_MEMORY_TRACING
-#define wxUSE_MEMORY_TRACING            0
-
-#undef  wxUSE_GLOBAL_MEMORY_OPERATORS
-#define wxUSE_GLOBAL_MEMORY_OPERATORS   0
-
-#undef  wxUSE_DEBUG_NEW_ALWAYS
-#define wxUSE_DEBUG_NEW_ALWAYS          0
-
-/* Cygwin betas don't have wcslen */
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-#  if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
-#    undef wxUSE_WCHAR_T
-#    define wxUSE_WCHAR_T 0
-#  endif
-#endif
+    /* These don't work as expected for mingw32 and cygwin32 */
+#   undef  wxUSE_MEMORY_TRACING
+#   define wxUSE_MEMORY_TRACING            0
+
+#   undef  wxUSE_GLOBAL_MEMORY_OPERATORS
+#   define wxUSE_GLOBAL_MEMORY_OPERATORS   0
+
+#   undef  wxUSE_DEBUG_NEW_ALWAYS
+#   define wxUSE_DEBUG_NEW_ALWAYS          0
 
+/* some Cygwin versions don't have wcslen */
+#   if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#   if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#       undef wxUSE_WCHAR_T
+#       define wxUSE_WCHAR_T 0
+#   endif
 #endif
- /* __GNUWIN32__ */
+
+#endif /* __GNUWIN32__ */
 
 /* MFC duplicates these operators */
 #if wxUSE_MFC
-#undef  wxUSE_GLOBAL_MEMORY_OPERATORS
-#define wxUSE_GLOBAL_MEMORY_OPERATORS   0
+#   undef  wxUSE_GLOBAL_MEMORY_OPERATORS
+#   define wxUSE_GLOBAL_MEMORY_OPERATORS   0
 
-#undef  wxUSE_DEBUG_NEW_ALWAYS
-#define wxUSE_DEBUG_NEW_ALWAYS          0
-#endif
- /* wxUSE_MFC */
+#   undef  wxUSE_DEBUG_NEW_ALWAYS
+#   define wxUSE_DEBUG_NEW_ALWAYS          0
+#endif /* wxUSE_MFC */
 
 #if (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)
 /* GnuWin32 doesn't have appropriate headers for e.g. IUnknown. */
@@ -115,40 +109,22 @@
 #endif
 
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
-/* BC++ 4.0 can't compile JPEG library */
-#undef wxUSE_LIBJPEG
-#define wxUSE_LIBJPEG 0
+    /* BC++ 4.0 can't compile JPEG library */
+#   undef wxUSE_LIBJPEG
+#   define wxUSE_LIBJPEG 0
 #endif
 
 /* wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode */
 #if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
-#undef wxUSE_DEBUG_NEW_ALWAYS
-#define wxUSE_DEBUG_NEW_ALWAYS 0
+#   undef wxUSE_DEBUG_NEW_ALWAYS
+#   define wxUSE_DEBUG_NEW_ALWAYS 0
 #endif
 
+/* Early Watcom version don't have good enough wide char support */
 #if defined(__WXMSW__) && (defined(__WATCOMC__) && __WATCOMC__ < 1200)
-#undef wxUSE_WCHAR_T
-#define wxUSE_WCHAR_T 0
-#endif
-
-/* Media not supported in eVC3 */
-#if defined(_WIN32_WCE)
-    #if (_WIN32_WCE < 400)
-        #undef wxUSE_DIRECTSHOW
-        #undef wxUSE_MEDIACTRL
-        #define wxUSE_DIRECTSHOW 0
-        #define wxUSE_MEDIACTRL 0
-    #endif
-#endif
-
-/* Disable controls for pointing devices */
-#if defined(__SMARTPHONE__)
-    #undef wxUSE_NOTEBOOK
-    #undef wxUSE_LISTBOOK
-    #define wxUSE_NOTEBOOK 0
-    #define wxUSE_LISTBOOK 0
+#   undef wxUSE_WCHAR_T
+#   define wxUSE_WCHAR_T 0
 #endif
 
-#endif
-    /* _WX_MSW_CHKCONF_H_ */
+#endif /* _WX_MSW_CHKCONF_H_ */
 

diff --git a/include/wx/msw/wince/chkconf.h b/include/wx/msw/wince/chkconf.h
index abdb5bb42a688fbb1f64c9033b403b30c4415e65..eafc5c8b2e136584bfa7c2958afbea043f42ff65 100644 (file)
--- a/include/wx/msw/wince/chkconf.h
+++ b/include/wx/msw/wince/chkconf.h
@@ -19,5 +19,49 @@
     #define wxUSE_STDPATHS 0
 #endif // WCE_PLATFORM_STANDARDSDK
 
+// DDE doesn't exist under WinCE and wxIPC is DDE-based under MSW
+#undef wxUSE_IPC
+#define wxUSE_IPC 0
+
+// metafiles are not supported neither
+#undef wxUSE_ENH_METAFILE
+#define wxUSE_ENH_METAFILE 0
+
+#undef wxUSE_METAFILE
+#define wxUSE_METAFILE 0
+
+// eVC doesn't support SEH
+#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
+
+// libtiff and regex apparently don't compile with eVC (to check with eVC4?)
+// 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
+
+#undef wxUSE_REGEX
+#define wxUSE_REGEX 0
+
+
+// Disable controls which don't make sense for phones
+#if defined(__SMARTPHONE__)
+    #undef wxUSE_LISTBOOK
+    #define wxUSE_LISTBOOK 0
+
+    #undef wxUSE_NOTEBOOK
+    #define wxUSE_NOTEBOOK 0
+
+    #undef wxUSE_STATUSBAR
+    #define wxUSE_STATUSBAR 0
+#endif // __SMARTPHONE__
+
 #endif // _WX_MSW_WINCE_CHKCONF_H_
 

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index dddfa207b9421fc599d1aecaae1718f7edcdf66c..fc65136f9685025688acda49b4bd7a5557c96c89 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -1052,10 +1052,11 @@
 // Windows CE specific stuff
 // ----------------------------------------------------------------------------
 
-// stuff which doesn't work/compile/make sense under Windows CE in alphabetical
-// order (please keep it!)
+// list of things which don't make sense under Windows CE in alphabetical order
+// (please keep it!)
 //
-// TODO: explain why each item is disabled and whether it can be enabled
+// NB: stuff which doesn't work at all under CE is forcefully disabled in
+//     wx/msw/wince/chkconf.h
 
 // wxCheckListBox requires wxOwnerDrawn which is disabled below
 #undef wxUSE_CHECKLISTBOX
@@ -1067,7 +1068,7 @@
 
 // Windows CE doesn't use RAS so wxDialUpManager doesn't work under it
 #undef wxUSE_DIALUP_MANAGER
-#define wxUSE_DIALUP_MANAGER
+#define wxUSE_DIALUP_MANAGER 0
 
 #undef wxUSE_DYNAMIC_LOADER
 #define wxUSE_DYNAMIC_LOADER 0
@@ -1078,9 +1079,6 @@
 #undef wxUSE_FSVOLUME
 #define wxUSE_FSVOLUME 0
 
-#undef wxUSE_MEDIACTRL
-#define wxUSE_MEDIACTRL 0
-
 // MDI is not supported under CE
 #undef wxUSE_MDI
 #define wxUSE_MDI 0
@@ -1104,11 +1102,6 @@
 #undef wxUSE_PRINTING_ARCHITECTURE
 #define wxUSE_PRINTING_ARCHITECTURE 0
 
-#ifdef __SMARTPHONE__
-    #undef wxUSE_STATUSBAR
-    #define wxUSE_STATUSBAR 0
-#endif
-
 // doesn't make much sense in absence of mouse...
 #undef wxUSE_TOOLTIPS
 #define wxUSE_TOOLTIPS 0