Fix handling of help buttons with non-empty label under OS X.

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index f97172fdec06e52678254628b56e8854471db282..3230f397128f70c056c46469380e7d444eb52dd2 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 7 October 2009                                                     *
+ * Date : 1 July 2010                                                        *
  *                                                                           *
  *****************************************************************************/
 
@@ -88,6 +88,9 @@
 /* Define this if your version of GTK+ is greater than 2.10 */
 #define __WXGTK210__ 1
 
+/* Define this if your version of GTK+ is greater than 2.18 */
+#undef __WXGTK218__
+
 #include <types.h>
 typedef pid_t GPid;
 
@@ -113,6 +116,7 @@ typedef pid_t GPid;
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__
+#undef __QNX__
 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__
@@ -187,7 +191,7 @@ typedef pid_t GPid;
 
 
 #ifndef wxUSE_UNICODE
-#if defined( __WXX11__ ) || defined ( __WXMOTIF__ )
+#if defined( __WXX11__ )
     #define wxUSE_UNICODE 0
 #else
     #define wxUSE_UNICODE 1
@@ -250,7 +254,7 @@ typedef pid_t GPid;
 #define wxUSE_INTL          1
 #include <locale.h>
 
-#if defined (__WXMOTIF__) || defined( __WXX11__ )
+#if defined (__WXMOTIF__)
 #define wxUSE_XLOCALE 0
 #else
 #define wxUSE_XLOCALE 1
@@ -262,6 +266,8 @@ typedef pid_t GPid;
 
 #define wxUSE_STOPWATCH     1
 
+#define wxUSE_FSWATCHER     0
+
 #define wxUSE_CONFIG        1
 
 #define wxUSE_CONFIG_NATIVE   0
@@ -335,8 +341,23 @@ typedef pid_t GPid;
 
 #define wxUSE_PROPGRID  1
 
-#ifndef wxUSE_GRAPHICS_CONTEXT
+#ifdef _MSC_VER
+#   if _MSC_VER >= 1310
+
+
 #define wxUSE_GRAPHICS_CONTEXT 0
+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 
 #define wxUSE_CONTROLS     1
@@ -492,6 +513,8 @@ typedef pid_t GPid;
 
 #define wxUSE_ABOUTDLG 1
 
+#define wxUSE_FILE_HISTORY 1
+
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 #define wxUSE_WIN_METAFILES_ALWAYS  0
@@ -544,7 +567,7 @@ typedef pid_t GPid;
 
 #define wxUSE_MOUSEWHEEL        1
 
-
+#define wxUSE_UIACTIONSIMULATOR 1
 
 #define wxUSE_POSTSCRIPT  1
 
@@ -731,6 +754,16 @@ typedef pid_t GPid;
  */
 #undef HAVE_TR1_UNORDERED_SET
 
+/*
+ * Define if your compiler has <tr1/type_traits>
+ */
+#undef HAVE_TR1_TYPE_TRAITS
+
+/*
+ * Define if your compiler has <type_traits>
+ */
+#undef HAVE_TYPE_TRAITS
+
 /*
  * Define if the compiler supports simple visibility declarations.
  */
@@ -1251,6 +1284,12 @@ typedef pid_t GPid;
 /* Define if locale_t is available */
 #undef HAVE_LOCALE_T
 
+/* Define if you have inotify_xxx() functions. */
+#undef wxHAS_INOTIFY
+
+/* Define if you have kqueu_xxx() functions. */
+#undef wxHAS_KQUEUE
+
 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------
@@ -1291,6 +1330,10 @@ typedef pid_t GPid;
 #define wxHAS_RAW_BITMAP 1
 #endif
 
+#ifdef VMS_GTK2
+#define GSEAL(x) x
+#endif
+
 #define __VMS_BROKEN_TEMPLATES
 
 #include <stdlib.h>