make wxConvUTF8 available in wchar_t-less mode, too

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index d09add5c37d64444e6001079276caafbbfac038b..dc7aae8e990e1e1ba4ff87a7dd3fb0b54b8f833b 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -63,6 +63,7 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
+#ifdef __WXGTK__
 /* Define this if your version of GTK+ is greater than 1.2 */
 #define __WXGTK12__ 1
 
@@ -71,6 +72,7 @@
 
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK20__
+#endif
 
 /*
  * Define to 1 for Unix[-like] system
@@ -114,13 +116,21 @@
 #undef __WINDOWS__
 #endif
 
+#ifndef __WIN95__
 #undef __WIN95__
+#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
+#ifndef __GNUWIN32__
 #undef __GNUWIN32__
+#endif
+#ifndef STRICT
 #undef STRICT
+#endif
+#ifndef WINVER
 #undef WINVER
+#endif
 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
@@ -642,7 +652,7 @@
 /*
  * Compile wxString with some Unicode (wide character) support?
  */
-#define wxUSE_WCHAR_T 0
+#define wxUSE_WCHAR_T 1
 
 /*
  * Compile wxWindows in Unicode mode (Win32 only for now)?
@@ -766,11 +776,15 @@
 /*
  * Compatibility with 2.0 API.
  */
-#define WXWIN_COMPATIBILITY_2 0
+#define WXWIN_COMPATIBILITY_2 1
 /*
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 1
+/*
+ * Compatibility with 2.4 API
+ */
+#define WXWIN_COMPATIBILITY_2_4 1
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
@@ -905,6 +919,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #define SOCKLEN_T size_t
 
+/* The type of statvfs(2) argument */
+#undef WX_STATFS_T
+
 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 
@@ -987,6 +1004,9 @@
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
+/* Define if you have vsnprintf() declaration in the header */
+#undef HAVE_VSNPRINTF_DECL
+
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1