X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24671bc900cd5232e595efa87111b720d4f14237..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/features.h?ds=sidebyside diff --git a/include/wx/features.h b/include/wx/features.h index 9dc0e83b03..1b9847304f 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,16 @@ #undef wxHAS_XLOCALE_SUPPORT #endif -/* Direct access to bitmap data is only implemented for MSW/Mac/GTK2 */ -#if defined(__WXGTK20__) || defined(__WXMAC__) || \ +/* Direct access to bitmap data is not implemented in all ports yet */ +#if defined(__WXGTK20__) || defined(__WXMAC__) || defined(__WXDFB__) || \ (defined(__WXMSW__) && !defined(__WATCOMC__)) #define wxHAS_RAW_BITMAP #endif -/* deprecated synonym which exists for compatibility only */ -#define wxHAVE_RAW_BITMAP wxHAS_RAW_BITMAP +/* also define deprecated synonym which exists for compatibility only */ +#ifdef wxHAS_RAW_BITMAP + #define wxHAVE_RAW_BITMAP +#endif #endif /* _WX_FEATURES_H_ */