X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/820a7a1b226803bc7b5ff4e23647dc1c875de956..0a7b022960a68e1d9cf2561375e8c0376e07e93b:/include/wx/msw/chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index d97953b1d4..59d5dbc433 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -14,25 +14,86 @@
 #ifndef _WX_MSW_CHKCONF_H_
 #define _WX_MSW_CHKCONF_H_
 
-/*
- * disable the settings which don't work for some compilers
- */
+/* ensure that MSW-specific settings are defined */
+#ifndef wxUSE_ACTIVEX
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_ACTIVEX must be defined."
+#    else
+#        define wxUSE_ACTIVEX 0
+#    endif
+#endif /* !defined(wxUSE_ACTIVEX) */
 
-/*
- * 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_CRASHREPORT
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CRASHREPORT must be defined."
+#   else
+#       define wxUSE_CRASHREPORT 0
+#   endif
+#endif /* !defined(wxUSE_CRASHREPORT) */
 
-#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
+#ifndef wxUSE_DC_CACHEING
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DC_CACHEING must be defined"
 #   else
-#       define wxUSE_NORLANDER_HEADERS 0
+#       define wxUSE_DC_CACHEING 1
 #   endif
-#endif
+#endif /* wxUSE_DC_CACHEING */
+
+#ifndef wxUSE_DIALUP_MANAGER
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_DIALUP_MANAGER must be defined."
+#    else
+#        define wxUSE_DIALUP_MANAGER 0
+#    endif
+#endif /* !defined(wxUSE_DIALUP_MANAGER) */
+
+#ifndef wxUSE_MS_HTML_HELP
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_MS_HTML_HELP must be defined."
+#    else
+#        define wxUSE_MS_HTML_HELP 0
+#    endif
+#endif /* !defined(wxUSE_MS_HTML_HELP) */
+
+#ifndef wxUSE_INICONF
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_INICONF must be defined."
+#    else
+#        define wxUSE_INICONF 0
+#    endif
+#endif /* !defined(wxUSE_INICONF) */
+
+#ifndef wxUSE_OLE
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_OLE must be defined."
+#    else
+#        define wxUSE_OLE 0
+#    endif
+#endif /* !defined(wxUSE_OLE) */
+
+#ifndef wxUSE_OLE_AUTOMATION
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_OLE_AUTOMATION must be defined."
+#    else
+#        define wxUSE_OLE_AUTOMATION 0
+#    endif
+#endif /* !defined(wxUSE_OLE_AUTOMATION) */
+
+#ifndef wxUSE_UNICODE_MSLU
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_UNICODE_MSLU must be defined."
+#    else
+#        define wxUSE_UNICODE_MSLU 0
+#    endif
+#endif  /* wxUSE_UNICODE_MSLU */
+
+#ifndef wxUSE_UXTHEME
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_UXTHEME must be defined."
+#    else
+#        define wxUSE_UXTHEME 0
+#    endif
+#endif  /* wxUSE_UXTHEME */
 
 /*
  * We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but
@@ -46,6 +107,20 @@
 #   define wxUSE_UNICODE_MSLU 0
 #endif
 
+
+/*
+ * disable the settings which don't work for some compilers
+ */
+
+#ifndef wxUSE_NORLANDER_HEADERS
+#   if ( wxCHECK_WATCOM_VERSION(1,0) || 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
+
 /*
  * All of the settings below require SEH support (__try/__catch) and can't work
  * without it.
@@ -60,7 +135,7 @@
 
 #    undef wxUSE_STACKWALKER
 #    define wxUSE_STACKWALKER 0
-#endif // compiler doesn't support SEH
+#endif /* compiler doesn't support SEH */
 
 /* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */
 #if defined(__MWERKS__)
@@ -89,6 +164,12 @@
 
 #endif /* __GNUWIN32__ */
 
+/* wxUSE_MFC is not defined when using configure as it doesn't make sense for
+   gcc or mingw32 anyhow */
+#ifndef wxUSE_MFC
+    #define wxUSE_MFC 0
+#endif /* !defined(wxUSE_MFC) */
+
 /* MFC duplicates these operators */
 #if wxUSE_MFC
 #   undef  wxUSE_GLOBAL_MEMORY_OPERATORS
@@ -120,6 +201,25 @@
 #   endif
 #endif
 
+/*
+   Win64-specific checks.
+ */
+#ifdef __WIN64__
+#   if wxUSE_STACKWALKER
+        /* this is not currently supported under Win64, volunteers needed to
+           make it work */
+#       undef wxUSE_STACKWALKER
+#       define wxUSE_STACKWALKER 0
+
+#       undef wxUSE_CRASHREPORT
+#       define wxUSE_CRASHREPORT 0
+#   endif
+#endif /* __WIN64__ */
+
+
+/*
+   Compiler-specific checks.
+ */
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
     /* BC++ 4.0 can't compile JPEG library */
 #   undef wxUSE_LIBJPEG
@@ -132,12 +232,6 @@
 #   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
-
 /* DMC++ doesn't have definitions for date picker control, so use generic control
  */
 #ifdef __DMC__
@@ -149,5 +243,144 @@
 #   define wxUSE_DATEPICKCTRL_GENERIC 1
 #endif
 
-#endif /* _WX_MSW_CHKCONF_H_ */
 
+
+/*
+   un/redefine the options which we can't compile (after checking that they're
+   defined
+ */
+#ifdef __WINE__
+#   if wxUSE_ACTIVEX
+#       undef wxUSE_ACTIVEX
+#       define wxUSE_ACTIVEX 0
+#   endif /* wxUSE_ACTIVEX */
+
+#   if wxUSE_UNICODE_MSLU
+#       undef wxUSE_UNICODE_MSLU
+#       define wxUSE_UNICODE_MSLU 0
+#   endif /* wxUSE_UNICODE_MSLU */
+#endif /* __WINE__ */
+
+
+/* check settings consistency for MSW-specific ones */
+#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION"
+#   else
+#       undef wxUSE_CRASHREPORT
+#       define wxUSE_CRASHREPORT 0
+#   endif
+#endif /* wxUSE_CRASHREPORT */
+
+#if !wxUSE_VARIANT
+#   if wxUSE_ACTIVEX
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxActiveXContainer requires wxVariant"
+#       else
+#           undef wxUSE_ACTIVEX
+#           define wxUSE_ACTIVEX 0
+#       endif
+#   endif
+
+#   if wxUSE_OLE_AUTOMATION
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxAutomationObject requires wxVariant"
+#       else
+#           undef wxUSE_OLE_AUTOMATION
+#           define wxUSE_OLE_AUTOMATION 0
+#       endif
+#   endif
+#endif /* !wxUSE_VARIANT */
+
+#if !wxUSE_DYNAMIC_LOADER
+#    if wxUSE_MS_HTML_HELP
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
+#        else
+#            undef wxUSE_MS_HTML_HELP
+#            define wxUSE_MS_HTML_HELP 0
+#        endif
+#    endif
+#    if wxUSE_DIALUP_MANAGER
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_DIALUP_MANAGER requires wxUSE_DYNAMIC_LOADER."
+#        else
+#            undef wxUSE_DIALUP_MANAGER
+#            define wxUSE_DIALUP_MANAGER 0
+#        endif
+#    endif
+#endif  /* !wxUSE_DYNAMIC_LOADER */
+
+#if !wxUSE_DYNLIB_CLASS
+#   if wxUSE_UXTHEME
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS"
+#       else
+#           undef wxUSE_UXTHEME
+#           define wxUSE_UXTHEME 0
+#       endif
+#   endif
+#   if wxUSE_MEDIACTRL
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_MEDIACTRL requires wxUSE_DYNLIB_CLASS"
+#       else
+#           undef wxUSE_MEDIACTRL
+#           define wxUSE_MEDIACTRL 0
+#       endif
+#   endif
+#   if wxUSE_INKEDIT
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_INKEDIT requires wxUSE_DYNLIB_CLASS"
+#       else
+#           undef wxUSE_INKEDIT
+#           define wxUSE_INKEDIT 0
+#       endif
+#   endif
+#endif  /* !wxUSE_DYNLIB_CLASS */
+
+#if !wxUSE_OLE
+#   if wxUSE_ACTIVEX
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxActiveXContainer requires wxUSE_OLE"
+#       else
+#           undef wxUSE_ACTIVEX
+#           define wxUSE_ACTIVEX 0
+#       endif
+#   endif
+
+#   if wxUSE_DATAOBJ
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_DATAOBJ requires wxUSE_OLE"
+#       else
+#           undef wxUSE_DATAOBJ
+#           define wxUSE_DATAOBJ 0
+#       endif
+#   endif
+
+#   if wxUSE_OLE_AUTOMATION
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxAutomationObject requires wxUSE_OLE"
+#       else
+#           undef wxUSE_OLE_AUTOMATION
+#           define wxUSE_OLE_AUTOMATION 0
+#       endif
+#   endif
+#endif /* !wxUSE_OLE */
+
+#if !wxUSE_ACTIVEX
+#   if wxUSE_MEDIACTRL
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxMediaCtl requires wxActiveXContainer"
+#       else
+#           undef wxUSE_MEDIACTRL
+#           define wxUSE_MEDIACTRL 0
+#       endif
+#   endif
+#endif /* !wxUSE_ACTIVEX */
+
+#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
+#   undef wxUSE_POSTSCRIPT
+#   define wxUSE_POSTSCRIPT 1
+#endif
+
+#endif /* _WX_MSW_CHKCONF_H_ */