X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/890d70ebeaf39ee13012d22751d64d8de070275c..ede7b01760e920b31520b15c919445db882a8012:/include/wx/features.h?ds=inline diff --git a/include/wx/features.h b/include/wx/features.h index ed27473c6f..27e19d7969 100644 --- a/include/wx/features.h +++ b/include/wx/features.h @@ -86,10 +86,15 @@ /* Direct access to bitmap data is not implemented in all ports yet */ #if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \ - (defined(__WXMSW__) && !defined(__WATCOMC__)) - - // HP aCC for PA-RISC can't compile rawbmp.h - #if !defined(__HP_aCC) || !defined(__hppa) + 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 @@ -102,10 +107,12 @@ /* 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, for the others it will be - undefined in wx/chkconf.h). + where only g++ and MSVC >= 7 currently support it. */ -#define wxHAS_EVENT_BIND +#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) + #define wxHAS_EVENT_BIND +#endif + #endif /* _WX_FEATURES_H_ */