X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01ebf7520366a4cf80975d820794fea394c96d7b..d8fdd58fa32f2dba817c9608c9e61b93606897f2:/include/wx/msw/chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 5f31c7f6f4..5bcee9d01c 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -9,6 +9,8 @@
  * Licence:     wxWindows licence
  */
 
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+
 #ifndef _WX_MSW_CHKCONF_H_
 #define _WX_MSW_CHKCONF_H_
 
@@ -16,14 +18,32 @@
  * disable the settings which don't work for some compilers
  */
 
+/*
+ * 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
+#endif
+
 #ifndef wxUSE_NORLANDER_HEADERS
-#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))))
+#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)
+ */
+
+#if defined(__GNUG__)
+    #undef wxUSE_ON_FATAL_EXCEPTION
+    #define wxUSE_ON_FATAL_EXCEPTION 0
+#endif
+
 /*
  * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
  */
@@ -76,6 +96,17 @@
 #define wxUSE_CHECKLISTBOX 0
 #endif
 
+#if wxUSE_SPINCTRL
+#   if !wxUSE_SPINBTN
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxSpinCtrl requires wxSpinButton on MSW"
+#       else
+#           undef wxUSE_SPINBTN
+#           define wxUSE_SPINBTN 1
+#       endif
+#   endif
+#endif
+
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
 /* BC++ 4.0 can't compile JPEG library */
 #undef wxUSE_LIBJPEG
@@ -93,6 +124,24 @@
 #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_ */