Compilation fixes for wxUSE_LOCALE and wxUSE_XLOCALE set to 0.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 99f4fd8a5350e9e59de9a40a2f44404b958a6a85..fe2e031afbfe266ee60de2f9e08aa50a93d1585e 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -216,7 +216,11 @@
     #define wxUSE_STD_DEFAULT  0
 #endif
 
-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif
 
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
@@ -224,6 +228,8 @@
 
 #define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
 
+#define wxUSE_IOSTREAMH     0
+
 
 
 #define wxUSE_LONGLONG      0
@@ -568,11 +574,6 @@
 #define wxUSE_SVG 0
 
 
-#define REMOVE_UNUSED_ARG   0
-
-#define wxUSE_IOSTREAMH     0
-
-
 
 #define wxUSE_IMAGE         0