/* 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
#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