Removing vestiges of wxUSE_NEW_GRID

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 43530a6b234f4d1e030107eeba238cc96456df77..d9aea207ec09af18024c86006431ab839634bc41 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -63,6 +63,9 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
+/* Define this if your version of Motif is greater than 2.0 */
+/* #undef __WXMOTIF20__ */
+
 #ifdef __WXGTK__
 /* Define this if your version of GTK+ is greater than 1.2 */
 #define __WXGTK12__ 1
@@ -71,7 +74,7 @@
 #define __WXGTK127__ 1
 
 /* Define this if your version of GTK+ is greater than 1.3 */
-#undef __WXGTK20__
+/* #undef __WXGTK20__ */
 #endif
 
 /*
@@ -80,27 +83,29 @@
 #define wxUSE_UNIX 1
 
 #define __UNIX__
-#undef __LINUX__
-#undef __SGI__
-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
+
 #undef __AIX__
-#undef __SUN__
-#undef __SOLARIS__
-#undef __SUNOS__
-#define __ALPHA__
-#undef __IA64__
-#undef __OSF__
-#undef __DARWIN__
-#undef __NETBSD__
 #undef __BSD__
+#undef __DARWIN__
+#undef __EMX__
 #undef __FREEBSD__
+#undef __HPUX__
+#undef __LINUX__
+#undef __NETBSD__
 #undef __OPENBSD__
-#define __VMS__
+#undef __OSF__
+#undef __SGI__
+#undef __SOLARIS__
+#undef __SUN__
+#undef __SUNOS__
+#undef __SVR4__
+#undef __SYSV__
 #undef __ULTRIX__
-#undef __DATA_GENERAL__
-#undef __EMX__
+#undef __UNIXWARE__
+#define __VMS__
+
+#undef __IA64__
+#define __ALPHA__
 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0
@@ -116,13 +121,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__)
@@ -135,7 +148,7 @@
 #endif
 
 /* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0
@@ -151,6 +164,11 @@
  */
 #define HAVE_EXPLICIT 1
 
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#define HAVE_CONST_CAST 1
+
 /*
  * Use regex support
  */
@@ -374,6 +392,11 @@
  * Use this control
  */
 #define wxUSE_CHOICE 1
+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY !
+
 /*
  * Use this control
  */
@@ -383,12 +406,12 @@
  */
 #define wxUSE_GRID 1
 /*
- * Use this control
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)
  */
 #define wxUSE_NEW_GRID 1
 /*
- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
+ * Use wxImageList class
  */
 #define wxUSE_IMAGLIST 1
 /*
@@ -768,11 +791,11 @@
 /*
  * 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 0
+#define WXWIN_COMPATIBILITY_2_2 1
 /*
  * Compatibility with 2.4 API
  */
@@ -911,6 +934,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
 
@@ -993,6 +1019,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
 
@@ -1177,4 +1206,7 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #define wxHAS_WORKING_GTK_DC_BLIT 1
 
+/* Define this is you have X11/extensions/shape.h */
+#define HAVE_XSHAPE 1
+
 #endif /* __WX_SETUP_H__ */