compilation fix for Borland C++

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 3019e028eebc966a3be5a27d8259e57a3a206794..6e8d2e815b09ede5dfe1ecd284ef5f18c6243bf8 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -57,6 +57,15 @@
 #   define wxUSE_UNICODE_MSLU 0
 #endif
 
+/*
+ * Don't use MSLU if compiling with Wine
+ */
+
+#if wxUSE_UNICODE_MSLU && defined(__WINE__)
+#   undef wxUSE_UNICODE_MSLU
+#   define wxUSE_UNICODE_MSLU 0
+#endif
+
 /*
  * All of the settings below require SEH support (__try/__catch) and can't work
  * without it.
@@ -179,6 +188,48 @@
 #   define wxUSE_DATEPICKCTRL_GENERIC 1
 #endif
 
+
+/* check that MSW-specific options are defined too */
+#ifndef wxUSE_ACTIVEX
+#    ifdef wxABORT_ON_CONFIG_ERROR
+#        error "wxUSE_ACTIVEX must be defined."
+#    else
+#        define wxUSE_ACTIVEX 0
+#    endif
+#endif /* !defined(wxUSE_ACTIVEX) */
+
+#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_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."
@@ -203,21 +254,40 @@
 #    endif
 #endif  /* wxUSE_UXTHEME_AUTO */
 
-#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_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) */
+/*
+   un/redefine the options which we can't compile (after checking that they're
+   defined
+ */
+#ifdef __WINE__
+    /* apparently it doesn't compile under Wine, remove it/when it does */
+    #if wxUSE_ACTIVEX
+        #undef wxUSE_ACTIVEX
+        #define wxUSE_ACTIVEX 0
+    #endif /* wxUSE_ACTIVEX */
+#endif /* __WINE__ */
+
+
+/* check settings consistency for MSW-specific ones */
+#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
@@ -236,6 +306,73 @@
 #            define wxUSE_DIALUP_MANAGER 0
 #        endif
 #    endif
-#endif  /* wxUSE_DYNAMIC_LOADER */
+#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 */
 
 #endif /* _WX_MSW_CHKCONF_H_ */