fix MSVC /Wp64 warnings

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

diff --git a/include/wx/features.h b/include/wx/features.h
index 637a50e77ce216be98a5d8a4f90d2ed88e29bd26..4d004f882967e28a54cc7049de9eed49c7da353e 100644 (file)
--- 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
     || defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
     #define wxHAS_TASK_BAR_ICON
 #else

+    #undef wxUSE_TASKBARICON
+    #define wxUSE_TASKBARICON 0

     #undef wxHAS_TASK_BAR_ICON
 #endif
 
     #undef wxHAS_TASK_BAR_ICON
 #endif
 


@@ -66,5 +68,21 @@
     #define wxHAS_UTF8_FONTS
 #endif
 
     #define wxHAS_UTF8_FONTS
 #endif
 

+/* This is defined when the underlying toolkit handles tab traversal natively.
+   Otherwise we implement it ourselves in wxControlContainer. */
+#ifdef __WXGTK20__
+    #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_ */
 
 #endif /*  _WX_FEATURES_H_ */