Ensure the correct cleanup order for GDI+-related modules in wxMSW.

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index ef26a4c63e7f3b23f924f880713f5f396a94581c..ea87c82930fd6c4391d43c0cad9b562f8605672c 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 : 23 August 2012                                                     *
+ * Date : 11 October 2012                                                    *
  *                                                                           *
  *****************************************************************************/
 
@@ -78,6 +78,10 @@
 
 #ifdef __WXGTK__
 
+#ifndef VMS_GTK2
+#define GDK_WINDOWING_X11 1
+#endif
+
 /* Define this if your version of GTK+ is greater than 1.2.7 */
 #define __WXGTK127__ 1
 
@@ -85,7 +89,9 @@
 #ifdef VMS_GTK2
 
 /* Define this if your version of GTK+ is >= 3.0 */
+#if 0
 #define __WXGTK3__ 1
+#endif
 
 #define __WXGTK20__ 1
 
@@ -391,8 +397,12 @@ typedef pid_t GPid;
 
 
 
+#ifdef __WXGTK3__
+#   define wxUSE_GRAPHICS_CONTEXT 1
+#else
 #   define wxUSE_GRAPHICS_CONTEXT 0
 #endif
+#endif
 
 #define wxUSE_CONTROLS     1
 
@@ -873,17 +883,20 @@ typedef pid_t GPid;
  * Use the Hildon 2.0 framework
  */
 #define wxUSE_LIBHILDON2 0
-/*
- * Use libnotify library.
- */
-#define wxUSE_LIBNOTIFY 0
 
 #define wxUSE_DC_TRANSFORM_MATRIX 1
 
 /*
  * Use libnotify library.
+ * Use libnotify 0.7+ API.
  */
+#ifdef VMS_GTK2
 #define wxUSE_LIBNOTIFY 1
+#define wxUSE_LIBNOTIFY_0_7 1
+#else
+#define wxUSE_LIBNOTIFY 0
+#define wxUSE_LIBNOTIFY_0_7 0
+#endif
 /*
  * Use libXpm
  */
@@ -1337,6 +1350,9 @@ typedef pid_t GPid;
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
+/* Define if you have abi::__forced_unwind in your <cxxabi.h>. */
+#undef HAVE_ABI_FORCEDUNWIND
+
 /* Define if fdopen is available.  */
 #define HAVE_FDOPEN 1