X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e71508e160653f122f8e5d7f73c2ebf7f928964b..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/chkconf.h?ds=sidebyside diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index 5643870029..90518a77ae 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -408,6 +408,14 @@ # define wxUSE_MEDIACTRL 0 # endif # endif +# if wxUSE_WEB +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxWebView requires wxActiveXContainer under MSW" +# else +# undef wxUSE_WEB +# define wxUSE_WEB 0 +# endif +# endif #endif /* !wxUSE_ACTIVEX */ #if !wxUSE_THREADS @@ -421,6 +429,18 @@ # endif #endif /* !wxUSE_THREADS */ + +#if !wxUSE_OLE_AUTOMATION +# if wxUSE_WEB +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW" +# else +# undef wxUSE_WEB +# define wxUSE_WEB 0 +# endif +# endif +#endif /* !wxUSE_OLE_AUTOMATION */ + #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT # undef wxUSE_POSTSCRIPT # define wxUSE_POSTSCRIPT 1