X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24671bc900cd5232e595efa87111b720d4f14237..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/features.h diff --git a/include/wx/features.h b/include/wx/features.h index 9dc0e83b03..d276ee8502 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 @@ -84,14 +84,43 @@ #undef wxHAS_XLOCALE_SUPPORT #endif -/* Direct access to bitmap data is only implemented for MSW/Mac/GTK2 */ -#if defined(__WXGTK20__) || defined(__WXMAC__) || \ - (defined(__WXMSW__) && !defined(__WATCOMC__)) - #define wxHAS_RAW_BITMAP +/* 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. + + Recent Sun CC versions support this but perhaps older ones can compile this + code too, adjust the version check if this is the case (unfortunately we + can't easily test for the things used in wx/event.h in configure so we have + to maintain these checks manually). The same applies to xlC 7: perhaps + earlier versions can compile this code too but they were not tested. + */ +#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) \ + || (defined(__SUNCC__) && __SUNCC__ >= 0x5100) \ + || (defined(__xlC__) && __xlC__ >= 0x700) + #define wxHAS_EVENT_BIND #endif -/* deprecated synonym which exists for compatibility only */ -#define wxHAVE_RAW_BITMAP wxHAS_RAW_BITMAP #endif /* _WX_FEATURES_H_ */