fixed compilation if wxUSE_STL=1

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

diff --git a/include/wx/features.h b/include/wx/features.h
index 14f0f1821a2729604ce3b566800b31b30a4ebfb8..637a50e77ce216be98a5d8a4f90d2ed88e29bd26 100644 (file)
--- a/include/wx/features.h
+++ b/include/wx/features.h
@@ -25,7 +25,8 @@
 #endif
 
 /*  the raw keyboard codes are generated under wxGTK and wxMSW only */
 #endif
 
 /*  the raw keyboard codes are generated under wxGTK and wxMSW only */

-#if defined(__WXGTK__) || defined(__WXMSW__) || defined(__WXMAC__)
+#if defined(__WXGTK__) || defined(__WXMSW__) || defined(__WXMAC__) \
+    || defined(__WXDFB__)

     #define wxHAS_RAW_KEY_CODES
 #else
     #undef wxHAS_RAW_KEY_CODES
     #define wxHAS_RAW_KEY_CODES
 #else
     #undef wxHAS_RAW_KEY_CODES


@@ -59,5 +60,11 @@
     #undef wxHAS_REGEX_ADVANCED
 #endif
 
     #undef wxHAS_REGEX_ADVANCED
 #endif
 

+/* Pango-based ports and wxDFB use UTF-8 for text and font encodings
+ * internally and so their fonts can handle any encodings: */
+#if wxUSE_PANGO || defined(__WXDFB__)
+    #define wxHAS_UTF8_FONTS
+#endif
+

 #endif /*  _WX_FEATURES_H_ */
 
 #endif /*  _WX_FEATURES_H_ */