X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b5f83357d8a50f58eb49fab9a4667575f7b2ffb..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/chkconf.h?ds=sidebyside diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index f855d59ab5..90518a77ae 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -239,7 +239,7 @@ Compiler-specific checks. */ -// Borland +/* Borland */ #ifdef __BORLANDC__ #if __BORLANDC__ < 0x500 @@ -254,10 +254,6 @@ # define wxUSE_DEBUG_NEW_ALWAYS 0 #endif -/* compiling src/msw/gdiplus.cpp results in "macro expansion too long" error */ -#undef wxUSE_GRAPHICS_CONTEXT -#define wxUSE_GRAPHICS_CONTEXT 0 - #endif /* __BORLANDC__ */ /* DMC++ doesn't have definitions for date picker control, so use generic control @@ -340,6 +336,14 @@ #endif /* !wxUSE_DYNAMIC_LOADER */ #if !wxUSE_DYNLIB_CLASS +# if wxUSE_DC_TRANSFORM_MATRIX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_DC_TRANSFORM_MATRIX requires wxUSE_DYNLIB_CLASS" +# else +# undef wxUSE_DC_TRANSFORM_MATRIX +# define wxUSE_DC_TRANSFORM_MATRIX 0 +# endif +# endif # if wxUSE_UXTHEME # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_UXTHEME requires wxUSE_DYNLIB_CLASS" @@ -404,22 +408,42 @@ # 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 +# if wxUSE_FSWATCHER +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxFileSystemWatcher requires wxThread under MSW" +# else +# undef wxUSE_FSWATCHER +# define wxUSE_FSWATCHER 0 +# endif +# 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 #endif -/* - Currently only recent MSVC compilers can build the new events code under - Windows. - */ -#if !wxEVENTS_COMPATIBILITY_2_8 -# if !wxCHECK_VISUALC_VERSION(7) -# undef wxEVENTS_COMPATIBILITY_2_8 -# define wxEVENTS_COMPATIBILITY_2_8 1 -# endif -#endif - #endif /* _WX_MSW_CHKCONF_H_ */