X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/617fb24fc95cea882fcd41b6cf6982abad0d8b29..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/features.h?ds=sidebyside

diff --git a/include/wx/features.h b/include/wx/features.h
index 13fb102e92..1b9847304f 100644
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -35,9 +35,11 @@
 /*  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 wxUSE_TASKBARICON 0
     #undef wxHAS_TASK_BAR_ICON
 #endif
 
@@ -72,5 +74,26 @@
     #define wxHAS_NATIVE_TAB_TRAVERSAL
 #endif
 
+/* This is defined when the compiler provides some type of extended locale
+   functions.  Otherwise, we implement them ourselves to only support the
+   'C' locale */
+#if defined(HAVE_LOCALE_T) || \
+    (wxCHECK_VISUALC_VERSION(8) && !defined(__WXWINCE__))
+    #define wxHAS_XLOCALE_SUPPORT
+#else
+    #undef wxHAS_XLOCALE_SUPPORT
+#endif
+
+/* 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
+
+/* also define deprecated synonym which exists for compatibility only */
+#ifdef wxHAS_RAW_BITMAP
+    #define wxHAVE_RAW_BITMAP
+#endif
+
 #endif /*  _WX_FEATURES_H_ */