X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e4ae332ac7d85be3592640ffef56a60924cc1c9..03773e400b6ff2692f2a9ba045d652c3b7b7109d:/include/wx/features.h diff --git a/include/wx/features.h b/include/wx/features.h index 52c84a27e0..27e19d7969 100644 --- a/include/wx/features.h +++ b/include/wx/features.h @@ -35,7 +35,7 @@ /* taskbar is implemented in the major ports */ #if defined(__WXMSW__) || defined(__WXCOCOA__) \ || defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \ - || defined(__WXMAC_OSX__) || defined(__WXCOCOA__) + || defined(__WXOSX_MAC__) || defined(__WXCOCOA__) #define wxHAS_TASK_BAR_ICON #else #undef wxUSE_TASKBARICON @@ -77,11 +77,42 @@ /* This is defined when the compiler provides some type of extended locale functions. Otherwise, we implement them ourselves to only support the 'C' locale */ -#if defined(HAVE_LOCALE_T) || wxCHECK_VISUALC_VERSION(8) +#if defined(HAVE_LOCALE_T) || \ + (wxCHECK_VISUALC_VERSION(8) && !defined(__WXWINCE__)) #define wxHAS_XLOCALE_SUPPORT #else #undef wxHAS_XLOCALE_SUPPORT #endif +/* Direct access to bitmap data is not implemented in all ports yet */ +#if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \ + defined(__WXMSW__) + + /* + These compilers can't deal with templates in wx/rawbmp.h: + - HP aCC for PA-RISC + - Watcom < 1.8 + */ + #if !wxONLY_WATCOM_EARLIER_THAN(1, 8) && \ + !(defined(__HP_aCC) && defined(__hppa)) + #define wxHAS_RAW_BITMAP + #endif +#endif + +/* also define deprecated synonym which exists for compatibility only */ +#ifdef wxHAS_RAW_BITMAP + #define wxHAVE_RAW_BITMAP +#endif + +/* + If this is defined, wxEvtHandler::Bind<>() is available (not all compilers + have the required template support for this and in particular under Windows + where only g++ and MSVC >= 7 currently support it. + */ +#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) + #define wxHAS_EVENT_BIND +#endif + + #endif /* _WX_FEATURES_H_ */