fix for defect #4827

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 585313f3e0e147e78cb440de398699eb9d81c162..ebec1d786a8ace62f7890ea71ebafcff43941a0a 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -198,15 +198,17 @@
 
 #define wxUSE_STREAMS       0
 
-#define wxUSE_STD_IOSTREAM  0
-
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0
 #else
-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0
 #endif
 
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
+
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
+
 #define wxUSE_PRINTF_POS_PARAMS      0
 
 
@@ -229,6 +231,8 @@
 
 #define wxUSE_INTL          0
 
+#define wxUSE_XLOCALE       0
+
 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0
@@ -399,6 +403,8 @@
 
 #define wxUSE_MENUS         0
 
+#define wxUSE_NOTIFICATION_MESSAGE 0
+
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
@@ -407,6 +413,12 @@
 
 #define wxUSE_VALIDATORS 0
 
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
+
 
 #define wxUSE_COMMON_DIALOGS 0
 
@@ -580,6 +592,8 @@
 
 #define wxUSE_OWNER_DRAWN 0
 
+#define wxUSE_TASKBARICON_BALLOONS 0
+
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0
@@ -591,11 +605,6 @@
 
 
 #define wxUSE_CRASHREPORT 0
-
-
-
-#define wxUSE_BITMAP_MESSAGE         0
-
 /* --- end MSW options --- */
 
 /*
@@ -663,6 +672,26 @@
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
+/*
+ * Define if your compiler has std::unordered_map
+ */
+#undef HAVE_STD_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::unordered_set
+ */
+#undef HAVE_STD_UNORDERED_SET
+
+/*
+ * Define if your compiler has std::tr1::unordered_map
+ */
+#undef HAVE_TR1_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::tr1::unordered_set
+ */
+#undef HAVE_TR1_UNORDERED_SET
+
 /*
  * Define if the compiler supports simple visibility declarations.
  */
@@ -885,6 +914,12 @@
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_VSNPRINTF_DECL
 
+/* Define if you have vsscanf() */
+#undef HAVE_VSSCANF
+
+/* Define if you have vsscanf() declaration in the header */
+#undef HAVE_VSSCANF_DECL
+
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
@@ -1065,6 +1100,9 @@
 /* Define this if you have _vsnwprintf */
 #undef HAVE__VSNWPRINTF
 
+/* vswscanf() */
+#undef HAVE_VSWSCANF
+
 /* Define if fseeko and ftello are available.  */
 #undef HAVE_FSEEKO
 
@@ -1080,9 +1118,6 @@
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
-/* Define if gtk_icon_size_lookup is missing from the GTK+ headers */
-#undef NEED_GTK_ICON_SIZE_LOOKUP
-
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
@@ -1101,6 +1136,9 @@
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */