removed erraneously-added file

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 0108b6070bd61ee6fca744d5eb6f5204547d3fb5..c7a3321653f12268cdc661acdfdaacec3d72eb05 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -196,17 +196,21 @@
 
 #define wxUSE_THREADS 0
 
-#define wxUSE_STREAMS       0
+#define wxUSE_WEAKREF 0
 
-#define wxUSE_STD_IOSTREAM  0
+#define wxUSE_STREAMS       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 +233,8 @@
 
 #define wxUSE_INTL          0
 
+#define wxUSE_XLOCALE       0
+
 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0
@@ -1070,6 +1076,9 @@
 /* Define this if you have _vsnwprintf */
 #undef HAVE__VSNWPRINTF
 
+/* vswscanf() */
+#undef HAVE_VSWSCANF
+
 /* Define if fseeko and ftello are available.  */
 #undef HAVE_FSEEKO
 
@@ -1103,6 +1112,9 @@
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */