/* 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)
+#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 only implemented for MSW/Mac/GTK2 */
+#if defined(__WXGTK20__) || defined(__WXMAC__) || \
+ (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_ */