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 54288e8af764bf7971607f719df681dd565de3fa..97fcb89a6a7d0d86076bf89e0aff890d29e24381 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -53,9 +53,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 

-/* Define this if your version of GTK+ is greater than 1.2 */
-#undef __WXGTK12__
-

 /* Define this if your version of GTK+ is greater than 1.2.7 */
 #undef __WXGTK127__
 
 /* Define this if your version of GTK+ is greater than 1.2.7 */
 #undef __WXGTK127__
 


@@ -331,12 +328,19 @@
 
 #define wxUSE_STC 0
 
 
 #define wxUSE_STC 0
 

-#define wxUSE_WEB 0
-
-#define wxUSE_WEBVIEW_WEBKIT 0
+#define wxUSE_WEBVIEW 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
 
 
 #ifdef _MSC_VER


@@ -371,6 +375,7 @@
 #define wxUSE_TIPWINDOW    0
 
 #define wxUSE_ANIMATIONCTRL 0
 #define wxUSE_TIPWINDOW    0
 
 #define wxUSE_ANIMATIONCTRL 0

+#define wxUSE_BANNERWINDOW  0

 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0
 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0


@@ -406,8 +411,10 @@
 #define wxUSE_STATTEXT      0
 #define wxUSE_STATBMP       0
 #define wxUSE_TEXTCTRL      0
 #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_TOGGLEBTN     0
 #define wxUSE_TREECTRL      0

+#define wxUSE_TREELISTCTRL  0

 
 #define wxUSE_STATUSBAR    0
 
 
 #define wxUSE_STATUSBAR    0
 


@@ -463,6 +470,8 @@
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
 
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
 

+#define wxUSE_RICHTOOLTIP 0
+

 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0


@@ -672,6 +681,8 @@
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 

+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+

 
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */
 
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */


@@ -807,10 +818,6 @@
  * Use the Hildon 2.0 framework
  */
 #define wxUSE_LIBHILDON2 0
  * Use the Hildon 2.0 framework
  */
 #define wxUSE_LIBHILDON2 0

-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0

 /*
  * Use libXpm
  */
 /*
  * Use libXpm
  */