Minor corrections to make dist after reports

[wxWidgets.git] / include / wx / features.h

diff --git a/include/wx/features.h b/include/wx/features.h
index 9dc0e83b03e36959eecf953859d0f91c0eba5415..1b9847304f2bf94576b3922e491afef75922235c 100644 (file)
--- 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__) \
 /*  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
     #define wxHAS_TASK_BAR_ICON
 #else
     #undef wxUSE_TASKBARICON


@@ -84,14 +84,16 @@
     #undef wxHAS_XLOCALE_SUPPORT
 #endif
 
     #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
 
         (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_ */
 
 
 #endif /*  _WX_FEATURES_H_ */