compilation fix for wxGetEmptyString() with wxUSE_STL == 1

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 519419dbcbb07e46eb927362100645b383ada4d8..b3e8f515671c3fae2e7ce569490144f471382c53 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -172,6 +172,11 @@
  */
 #define HAVE_CONST_CAST 1
 
+/*
+ * Define if your compiler supports reinterpret_cast<>()
+ */
+#define HAVE_REINTERPRET_CAST 1
+
 /*
  * Define if your compiler supports const_cast<>()
  */
@@ -182,9 +187,25 @@
  */
 /* #unfine HAVE_STD_WSTRING */
 /*
- * Define if your compiler has compilant std::string::compare
+ * Define if your compiler has compliant std::string::compare
+ */
+#undef HAVE_STD_STRING_COMPARE
+/*
+ * Define if your compiler has <hash_map>
+ */
+#undef HAVE_HASH_MAP
+/*
+ * Define if your compiler has <ext/hash_map>
+ */
+#undef HAVE_EXT_HASH_MAP
+/*
+ * Define if your compiler has std::hash_map/hash_set
  */
-/* #undef HAVE_STD_STRING_COMPARE */
+#undef HAVE_STD_HASH_MAP
+/*
+ * Define if your compiler has __gnu_cxx::hash_map/hash_set
+ */
+#undef HAVE_GNU_CXX_HASH_MAP
 
 /*
  * use STL for containers and wxString
@@ -434,7 +455,7 @@
 /*
  * Use wxDisplay class
  */
-#define wxUSE_DISPLAY !
+#define wxUSE_DISPLAY 1
 
 /*
  * Use this control
@@ -474,6 +495,7 @@
  */
 #define wxUSE_NOTEBOOK 1
 #define wxUSE_LISTBOOK 1
+#define wxUSE_CHOICEBOOK 1
 /*
  * Use this control
  */
@@ -722,6 +744,16 @@
  */
 /* #define wxUSE_UXTHEME_AUTO 1*/
 
+/*
+ *  Set to 1 to use mousewheel events on Windows
+ */
+/* #undef wxUSE_MOUSEWHEEL */
+
+/*
+ * Hotkey support (Windows)
+ */
+/* #define wxUSE_HOTKEY 1 */
+
 /*
  * Use wxURL class
  */
@@ -762,7 +794,7 @@
 /*
  * Use tooltips
  */
-#ifdef __WXMOTIF__
+#if defined (__WXMOTIF__) || defined( __WXX11__ )
 #define wxUSE_TOOLTIPS 0
 #else
 #define wxUSE_TOOLTIPS 1
@@ -784,6 +816,10 @@
  */
 #define wxUSE_SPLINES 1
 
+/*
+ * Use MDI.
+ */
+#define wxUSE_MDI 1
 /*
  * Use the mdi architecture
  */
@@ -897,6 +933,16 @@
  */
 #define wxUSE_HTML 1
 
+/*
+ * wxXRC
+ */
+#define wxUSE_XRC 1
+
+/*
+ * wxWebKitCtrl
+ */
+#define wxUSE_WEBKIT 1
+
 /*
  * (virtual) filesystems code
  */
@@ -915,11 +961,6 @@
  */
 #define wxUSE_ZIPSTREAM 1
 
-/*
- * Use gzip streams, requires wxUSE_ZLIB
- */
-#define wxUSE_GZSTREAM 1
-
 /*
  * wxPalette class
  */
@@ -1219,8 +1260,17 @@
 /* Define if you have wcsrtombs() function */
 #define HAVE_WCSRTOMBS 1
 
-/* Define this if you have fputws() and putwc() */
-#define HAVE_FPUTWC 1
+/* Define this if you have wputc() */
+#define HAVE_WPUTC 1
+
+/* Define this if you have wputchar() */
+#define HAVE_WPUTCHAR 1
+
+/* Define this if you have putws() */
+#define HAVE_PUTWS 1
+
+/* Define this if you have fputws() */
+#define HAVE_FPUTWS 1
 
 /* Define this if you have strcasecmp() function in <string.h> */
 #define HAVE_STRCASECMP_IN_STRING_H 1
@@ -1274,4 +1324,10 @@
 /* Define this is you have X11/extensions/shape.h */
 #define HAVE_XSHAPE 1
 
+/* Define this if you have type SPBCDATA */
+#undef HAVE_SPBCDATA
+
+/* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
+#undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+
 #endif /* __WX_SETUP_H__ */