use wxRect::Contains(), not Inside() (fixes compilation for WXWIN_COMPATIBILITY_2_6==0

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index c270f9e98cf8a91e6dead2d9f6aa89cba9511d41..c93c220075e85ea1fe619e19bfd8a89b83575835 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -378,6 +378,8 @@ typedef pid_t GPid;
 
 #define wxUSE_ODCOMBOBOX 1
 
+#define wxUSE_BITMAPCOMBOBOX 1
+
 #define wxUSE_ACCEL 1
 
 #define wxUSE_HOTKEY 1
@@ -597,6 +599,21 @@ typedef pid_t GPid;
  */
 #undef VA_LIST_IS_ARRAY
 
+/*
+ * Define if the compiler supports variadic macros
+ */
+#undef HAVE_VARIADIC_MACROS
+
+#if defined(__NAMESPACE_STD) && !defined(__NAMESPACE_STD_ONLY)
+/*
+ * Define if your compiler has std::wstring
+ */
+#define HAVE_STD_WSTRING 1
+/*
+ * Define if your compiler has compliant std::string::compare
+ */
+#define HAVE_STD_STRING_COMPARE 1
+#else
 /*
  * Define if your compiler has std::wstring
  */
@@ -605,6 +622,8 @@ typedef pid_t GPid;
  * Define if your compiler has compliant std::string::compare
  */
 #undef HAVE_STD_STRING_COMPARE
+#endif
+
 /*
  * Define if your compiler has <hash_map>
  */
@@ -1132,6 +1151,14 @@ typedef pid_t GPid;
 /* Define this if you have wprintf() and related functions */
 #define HAVE_WPRINTF 1
 
+
+/* Define this if you have swprintf() */
+#define HAVE_SWPRINTF 1
+
+/* Define if you have a _broken_ swprintf() declaration in the header,
+ * without a 'size_t max' parameter as second argument */
+#undef HAVE_BROKEN_SWPRINTF_DECL
+
 /* Define this if you have vswprintf() and related functions */
 #define HAVE_VSWPRINTF 1
 
@@ -1172,6 +1199,13 @@ typedef pid_t GPid;
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
+/* Define if the system headers declare the type boolean (which will conflict
+ * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
+#undef HAVE_BOOLEAN
+
+/* Define if the header pbt.h is missing.  */
+#undef NEED_PBT_H
+
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*