Update configuration for OpenVMS

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index b1f8916a9f43c33f6c570a597ab87f4e467e066c..76e8e8d0c90e140f0b658def5c252bf003b84d8b 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -189,8 +189,6 @@
 
 #define wxUSE_EXTENDED_RTTI 0
 
-#define wxUSE_STL 0
-
 #define wxUSE_LOG 0
 
 #define wxUSE_LOGWINDOW 0
@@ -205,6 +203,12 @@
 
 #define wxUSE_STREAMS       0
 
+#define wxUSE_PRINTF_POS_PARAMS      0
+
+
+
+#define wxUSE_STL 0
+
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
     #define wxUSE_STD_DEFAULT  0
@@ -212,11 +216,16 @@
     #define wxUSE_STD_DEFAULT  0
 #endif
 
+#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
 
-#define wxUSE_PRINTF_POS_PARAMS      0
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH     0
+
 
 
 #define wxUSE_LONGLONG      0
@@ -349,6 +358,8 @@
 
 #define wxUSE_CONTROLS     0
 
+#define wxUSE_MARKUP       0
+
 #define wxUSE_POPUPWIN     0
 
 #define wxUSE_TIPWINDOW    0
@@ -559,11 +570,6 @@
 #define wxUSE_SVG 0
 
 
-#define REMOVE_UNUSED_ARG   0
-
-#define wxUSE_IOSTREAMH     0
-
-
 
 #define wxUSE_IMAGE         0