show the taskbar icon even after Explorer restart (patch 723532) + some code cleanup

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 872b63304ed820fe1e29765339c6c78a5010cad4..e023e9b334973e990193f3887ede2c21853b2e1b 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -35,6 +35,9 @@
 /* the installation location prefix from configure */
 #undef wxINSTALL_PREFIX
 
+/* Define this to get extra features from GNU libc. */
+#undef _GNU_SOURCE
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 
@@ -60,6 +63,10 @@
    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
 
@@ -67,7 +74,8 @@
 #define __WXGTK127__ 1
 
 /* Define this if your version of GTK+ is greater than 1.3 */
-#undef __WXGTK20__
+/* #undef __WXGTK20__ */
+#endif
 
 /*
  * Define to 1 for Unix[-like] system
@@ -75,26 +83,29 @@
 #define wxUSE_UNIX 1
 
 #define __UNIX__
+
+#undef __AIX__
+#undef __BSD__
+#undef __DARWIN__
+#undef __EMX__
+#undef __FREEBSD__
+#undef __HPUX__
 #undef __LINUX__
+#undef __NETBSD__
+#undef __OPENBSD__
+#undef __OSF__
 #undef __SGI__
-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
-#undef __AIX__
-#undef __SUN__
 #undef __SOLARIS__
+#undef __SUN__
 #undef __SUNOS__
-#define __ALPHA__
-#undef __IA64__
-#undef __OSF__
-#undef __DARWIN__
-#undef __NETBSD__
-#undef __BSD__
-#undef __FREEBSD__
-#define __VMS__
+#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
@@ -110,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__)
@@ -145,6 +164,11 @@
  */
 #define HAVE_EXPLICIT 1
 
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#define HAVE_CONST_CAST 1
+
 /*
  * Use regex support
  */
@@ -368,6 +392,11 @@
  * Use this control
  */
 #define wxUSE_CHOICE 1
+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY !
+
 /*
  * Use this control
  */
@@ -377,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
 /*
@@ -638,7 +667,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)?
@@ -762,11 +791,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
  */
@@ -901,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
 
@@ -911,6 +947,9 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #define WX_GMTOFF_IN_TM
 
+/* Define if you have poll(2) function */
+#define HAVE_POLL 1
+
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
@@ -926,12 +965,6 @@
 /* Define if you have support for large (64 bit size) files */
 #undef HAVE_LARGEFILE_SUPPORT
 
-/* Required by HAVE_LARGEFILE_SUPPORT on some systems */
-#undef _FILE_OFFSET_BITS
-
-/* Ditto */
-#undef _LARGE_FILES
-
 /* Define if you have localtime() */
 #define HAVE_LOCALTIME
 
@@ -986,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
 
@@ -1124,9 +1160,34 @@
 /* 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 wprintf() and related functions */
+#define HAVE_WPRINTF 1
+
+/* Define this if you have vswprintf() and related functions */
+#define HAVE_VSWPRINTF 1
+
+/* Define this if you have _vsnwprintf */
+#undef HAVE__VSNWPRINTF
+
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
+/* ---------------------------------------------------------------------
+   Win32 adjustments section
+   ---------------------------------------------------------------------
+ */
+ 
+#ifdef __WIN32__
+
+/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibil
+      with wx/msw/setup.h */
+#define wxUSE_XPM_IN_MSW wxUSE_XPM
+
+#endif /* __WIN32__ */
+
 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly
  *  by configure.
@@ -1145,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__ */