Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index fc43f2c17b2ce75238a0935f1e9bd0e72aef2fcc..97fcb89a6a7d0d86076bf89e0aff890d29e24381 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -330,10 +330,17 @@
 
 #define wxUSE_WEBVIEW 0
 
-#define wxUSE_WEBVIEW_WEBKIT 0
-
-#define wxUSE_WEBVIEW_IE     0
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 0
+#else
+#define wxUSE_WEBVIEW_IE 0
+#endif
 
+#if defined(__WXGTK__) || defined(__WXOSX__)
+#define wxUSE_WEBVIEW_WEBKIT 0
+#else
+#define wxUSE_WEBVIEW_WEBKIT 0
+#endif
 
 
 #ifdef _MSC_VER
@@ -404,6 +411,7 @@
 #define wxUSE_STATTEXT      0
 #define wxUSE_STATBMP       0
 #define wxUSE_TEXTCTRL      0
+#define wxUSE_TIMEPICKCTRL  0
 #define wxUSE_TOGGLEBTN     0
 #define wxUSE_TREECTRL      0
 #define wxUSE_TREELISTCTRL  0
@@ -462,6 +470,8 @@
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
 
+#define wxUSE_RICHTOOLTIP 0
+
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
@@ -671,6 +681,8 @@
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
 
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */
@@ -806,10 +818,6 @@
  * Use the Hildon 2.0 framework
  */
 #define wxUSE_LIBHILDON2 0
-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0
 /*
  * Use libXpm
  */