Rebake after bakefile changes.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 95fdf6c7d9908ea3a269a225f29a666c7f12c79b..eff79923b1c4a9d901f9df2e837191480d99b424 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -196,19 +196,19 @@
 
 #define wxUSE_THREADS 0
 
-#define wxUSE_WEAKREF 0
-
 #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
 
 
@@ -307,6 +307,8 @@
 
 #define wxUSE_AUI       0
 
+#define wxUSE_PROPGRID  0
+
 #define wxUSE_STC 0
 
 
@@ -672,6 +674,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.
  */
@@ -736,6 +758,10 @@
  * Define if you have pthread_cleanup_push/pop()
  */
 #undef wxHAVE_PTHREAD_CLEANUP
+/*
+ * Define if compiler has __thread keyword.
+ */
+#undef HAVE___THREAD_KEYWORD
 
 /* compatibility */
 /*
@@ -894,6 +920,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