X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c232ecbafb32b1f607d788677f1d5775af3132a..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/msw/chkconf.h diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index 9841894966..930edc47a4 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -15,6 +15,22 @@ #define _WX_MSW_CHKCONF_H_ /* 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) */ + +#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_DC_CACHEING # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_DC_CACHEING must be defined" @@ -23,26 +39,69 @@ # 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) */ -/* - * disable the settings which don't work for some compilers - */ +#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) */ -/* - * 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_INICONF +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_INICONF must be defined." +# else +# define wxUSE_INICONF 0 +# endif +#endif /* !defined(wxUSE_INICONF) */ -#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_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_TASKBARICON_BALLOONS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TASKBARICON_BALLOONS must be defined." # else -# define wxUSE_NORLANDER_HEADERS 0 +# define wxUSE_TASKBARICON_BALLOONS 0 # endif -#endif +#endif /* wxUSE_TASKBARICON_BALLOONS */ + +#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 @@ -56,6 +115,30 @@ # 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 + +/* + * See WINVER definition in wx/msw/wrapwin.h for the explanation of this test + * logic. + */ +#if (defined(__VISUALC__) && (__VISUALC__ < 1300)) && \ + (!defined(WINVER) || WINVER < 0x0500) +# undef wxUSE_TASKBARICON_BALLOONS +# define wxUSE_TASKBARICON_BALLOONS 0 +#endif + /* * All of the settings below require SEH support (__try/__catch) and can't work * without it. @@ -70,7 +153,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__) @@ -167,12 +250,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__ @@ -184,103 +261,144 @@ # define wxUSE_DATEPICKCTRL_GENERIC 1 #endif -#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 */ -#ifndef wxUSE_UXTHEME_AUTO -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_UXTHEME_AUTO must be defined." -# else -# define wxUSE_UXTHEME_AUTO 0 -# endif -#endif /* wxUSE_UXTHEME_AUTO */ +/* + 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 */ -#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) */ +# if wxUSE_UNICODE_MSLU +# undef wxUSE_UNICODE_MSLU +# define wxUSE_UNICODE_MSLU 0 +# endif /* wxUSE_UNICODE_MSLU */ +#endif /* __WINE__ */ -#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) */ + +/* 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 -# define wxUSE_DYNAMIC_LOADER 1 +# 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 -# define wxUSE_DYNAMIC_LOADER 1 +# undef wxUSE_DIALUP_MANAGER +# 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 */ -/* - Finally, although this is not really a configuration check, do it here for - now as we'll supplement it with a real consistency check verifying that - wxUSE_UNICODE_MSLU corresponds to USE_MSLU in the makefiles. But for MSVC - we can do even better: not just check for consistency but even link in the - lib ourselves if needed. - - Notice that this is used for DLL wx build, as otherwise we have to do the - same for the main executable and not the (static) library. It is done in - msvc/wx/setup.h in that case. - */ -#if wxUSE_UNICODE_MSLU && \ - (defined(WXMAKINGDLL) || \ - defined(WXMAKINGDLL_NET) || \ - defined(WXMAKINGDLL_CORE) || \ - defined(WXMAKINGDLL_ADV) || \ - defined(WXMAKINGDLL_ODBC) || \ - defined(WXMAKINGDLL_DBGRID) || \ - defined(WXMAKINGDLL_HTML) || \ - defined(WXMAKINGDLL_GL) || \ - defined(WXMAKINGDLL_XML) || \ - defined(WXMAKINGDLL_XRC) || \ - defined(WXMAKINGDLL_MEDIA)) - // first remove all default libraries - #pragma comment(linker, "/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib") - - // then add unicows.lib as the first library - #pragma comment(lib, "unicows.lib") - - // and only then re-add back all the other ones - #pragma comment(lib, "kernel32.lib") - #pragma comment(lib, "user32.lib") - #pragma comment(lib, "gdi32.lib") - #pragma comment(lib, "winspool.lib") - #pragma comment(lib, "comdlg32.lib") - #pragma comment(lib, "advapi32.lib") - #pragma comment(lib, "shell32.lib") - #pragma comment(lib, "oleacc.lib") +#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_ */ -