X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3e3a3e177c7b975135066c7976dca7f539266901..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/msw/chkconf.h diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index b0d3e253e3..ac012a67f5 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -21,18 +21,29 @@ /* * 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 +# undef wxUSE_POSTSCRIPT +# define wxUSE_POSTSCRIPT 1 #endif #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 -#else -# define wxUSE_NORLANDER_HEADERS 0 +# if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || 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 + +/* + * We don't want to give an error if wxUSE_UNICODE_MSLU is enabled but + * wxUSE_UNICODE is not as this would make it impossible to simply set the + * former in wx/setup.h as then the library wouldn't compile in non-Unicode + * configurations, so instead simply unset it silently when it doesn't make + * sense. + */ +#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE +# undef wxUSE_UNICODE_MSLU +# define wxUSE_UNICODE_MSLU 0 #endif /* @@ -41,66 +52,61 @@ */ #if !defined(_MSC_VER) && \ (!defined(__BORLANDC__) || __BORLANDC__ < 0x0550) - #undef wxUSE_ON_FATAL_EXCEPTION - #define wxUSE_ON_FATAL_EXCEPTION 0 +# undef wxUSE_ON_FATAL_EXCEPTION +# define wxUSE_ON_FATAL_EXCEPTION 0 - #undef wxUSE_CRASHREPORT - #define wxUSE_CRASHREPORT 0 +# undef wxUSE_CRASHREPORT +# define wxUSE_CRASHREPORT 0 - #undef wxUSE_STACKWALKER - #define wxUSE_STACKWALKER 0 +# undef wxUSE_STACKWALKER +# define wxUSE_STACKWALKER 0 #endif // compiler doesn't support SEH -/* - * wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior - */ - +/* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior */ #if defined(__MWERKS__) - #undef wxUSE_DEBUG_NEW_ALWAYS - #define wxUSE_DEBUG_NEW_ALWAYS 0 +# undef wxUSE_DEBUG_NEW_ALWAYS +# define wxUSE_DEBUG_NEW_ALWAYS 0 #endif #if defined(__GNUWIN32__) -/* These don't work as expected for mingw32 and cygwin32 */ -#undef wxUSE_MEMORY_TRACING -#define wxUSE_MEMORY_TRACING 0 - -#undef wxUSE_GLOBAL_MEMORY_OPERATORS -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 - -/* Cygwin betas don't have wcslen */ -#if defined(__CYGWIN__) || defined(__CYGWIN32__) -# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) -# undef wxUSE_WCHAR_T -# define wxUSE_WCHAR_T 0 -# endif -#endif + /* These don't work as expected for mingw32 and cygwin32 */ +# undef wxUSE_MEMORY_TRACING +# define wxUSE_MEMORY_TRACING 0 + +# undef wxUSE_GLOBAL_MEMORY_OPERATORS +# define wxUSE_GLOBAL_MEMORY_OPERATORS 0 +# undef wxUSE_DEBUG_NEW_ALWAYS +# define wxUSE_DEBUG_NEW_ALWAYS 0 + +/* some Cygwin versions don't have wcslen */ +# if defined(__CYGWIN__) || defined(__CYGWIN32__) +# if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) +# undef wxUSE_WCHAR_T +# define wxUSE_WCHAR_T 0 +# endif #endif - /* __GNUWIN32__ */ + +#endif /* __GNUWIN32__ */ /* MFC duplicates these operators */ #if wxUSE_MFC -#undef wxUSE_GLOBAL_MEMORY_OPERATORS -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 +# undef wxUSE_GLOBAL_MEMORY_OPERATORS +# define wxUSE_GLOBAL_MEMORY_OPERATORS 0 -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 -#endif - /* wxUSE_MFC */ +# undef wxUSE_DEBUG_NEW_ALWAYS +# define wxUSE_DEBUG_NEW_ALWAYS 0 +#endif /* wxUSE_MFC */ #if (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) -/* GnuWin32 doesn't have appropriate headers for e.g. IUnknown. */ -#undef wxUSE_DRAG_AND_DROP -#define wxUSE_DRAG_AND_DROP 0 + /* GnuWin32 doesn't have appropriate headers for e.g. IUnknown. */ +# undef wxUSE_DRAG_AND_DROP +# define wxUSE_DRAG_AND_DROP 0 #endif -#if !wxUSE_OWNER_DRAWN -#undef wxUSE_CHECKLISTBOX -#define wxUSE_CHECKLISTBOX 0 +#if !wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__) +# undef wxUSE_CHECKLISTBOX +# define wxUSE_CHECKLISTBOX 0 #endif #if wxUSE_SPINCTRL @@ -114,41 +120,53 @@ # 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 -#define wxUSE_LIBJPEG 0 + /* BC++ 4.0 can't compile JPEG library */ +# undef wxUSE_LIBJPEG +# define wxUSE_LIBJPEG 0 #endif /* wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode */ #if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL)) -#undef wxUSE_DEBUG_NEW_ALWAYS -#define wxUSE_DEBUG_NEW_ALWAYS 0 +# undef wxUSE_DEBUG_NEW_ALWAYS +# 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 - -/* Media not supported in eVC3 */ -#if defined(_WIN32_WCE) - #if (_WIN32_WCE < 400) - #undef wxUSE_DIRECTSHOW - #undef wxUSE_MEDIACTRL - #define wxUSE_DIRECTSHOW 0 - #define wxUSE_MEDIACTRL 0 - #endif +# undef wxUSE_WCHAR_T +# define wxUSE_WCHAR_T 0 #endif -/* Disable controls for pointing devices */ -#if defined(__SMARTPHONE__) - #undef wxUSE_NOTEBOOK - #undef wxUSE_LISTBOOK - #define wxUSE_NOTEBOOK 0 - #define wxUSE_LISTBOOK 0 +/* DMC++ doesn't have definitions for date picker control, so use generic control + */ +#ifdef __DMC__ +# if wxUSE_DATEPICKCTRL +# undef wxUSE_DATEPICKCTRL_GENERIC +# undef wxUSE_DATEPICKCTRL +# endif +# define wxUSE_DATEPICKCTRL 0 +# define wxUSE_DATEPICKCTRL_GENERIC 1 #endif -#endif - /* _WX_MSW_CHKCONF_H_ */ +#endif /* _WX_MSW_CHKCONF_H_ */