Added C/wxString array constructors to wxArrayString

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 5bcee9d01cb58553b394fdc836f33ffc0f735be4..aa7293c8f577a09de235fbaf135329942b2373fb 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -21,69 +21,70 @@
 /*
  * 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
 
 /*
- * GCC does not have SEH (__try/__catch)
+ * All of the settings below require SEH support (__try/__catch) and can't work
+ * without it.
  */
-
-#if defined(__GNUG__)
+#if !defined(_MSC_VER) && \
+    (!defined(__BORLANDC__) || __BORLANDC__ < 0x0550)
     #undef wxUSE_ON_FATAL_EXCEPTION
     #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
 
-/*
- * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
- */
+    #undef wxUSE_CRASHREPORT
+    #define wxUSE_CRASHREPORT 0
+
+    #undef wxUSE_STACKWALKER
+    #define wxUSE_STACKWALKER 0
+#endif // compiler doesn't support SEH
 
+/* 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. */
@@ -108,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
+#   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
-#endif
-
-#endif
-    /* _WX_MSW_CHKCONF_H_ */
+#endif /* _WX_MSW_CHKCONF_H_ */