X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/617fb24fc95cea882fcd41b6cf6982abad0d8b29..6e3515377ca94ccc018f7a5ba8f185914081e601:/include/wx/features.h

diff --git a/include/wx/features.h b/include/wx/features.h
index 13fb102e92..4d004f8829 100644
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -38,6 +38,8 @@
     || defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
     #define wxHAS_TASK_BAR_ICON
 #else
+    #undef wxUSE_TASKBARICON
+    #define wxUSE_TASKBARICON 0
     #undef wxHAS_TASK_BAR_ICON
 #endif
 
@@ -72,5 +74,15 @@
     #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
+
 #endif /*  _WX_FEATURES_H_ */