use std menu ids for stock items

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 1df5f82cb731ad5898489fa10f3c3d6e3b962927..e718230c58e10d650a3e8e1e6f2e26ecf52324b5 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -203,7 +203,12 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
-#define wxUSE_STD_STRING  0
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  0
+#endif
 
 #define wxUSE_PRINTF_POS_PARAMS      0
 
@@ -289,11 +294,7 @@
 
 #define wxUSE_XRC       0
 
-#if wxUSE_XRC
-#define wxUSE_XML       0
-#else
-#  define wxUSE_XML       0
-#endif
+#define wxUSE_XML       wxUSE_XRC
 
 #define wxUSE_AUI       0
 
@@ -316,6 +317,7 @@
 #define wxUSE_CHECKBOX      0
 #define wxUSE_CHECKLISTBOX  0
 #define wxUSE_CHOICE        0
+#define wxUSE_COLLPANE      0
 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0
 #define wxUSE_DATAVIEWCTRL  0
@@ -1056,6 +1058,9 @@
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCTYPE_H
 
+/* Define if you have <widec.h> (Solaris only) */
+#undef HAVE_WIDEC_H
+
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #undef HAVE_ICONV