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 adc76a8601326c3c4c59389005200a60ee0ec992..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 : 26 September 2011                                                  *
+ * Date : 11 October 2012                                                    *
  *                                                                           *
  *****************************************************************************/
 
@@ -78,11 +78,21 @@
 
 #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
 
 /* Define this if your version of GTK+ is greater than 2.0 */
 #ifdef VMS_GTK2
+
+/* Define this if your version of GTK+ is >= 3.0 */
+#if 0
+#define __WXGTK3__ 1
+#endif
+
 #define __WXGTK20__ 1
 
 /* Define this if your version of GTK+ is greater than 2.6 */
@@ -171,6 +181,7 @@ typedef pid_t GPid;
 
 /* --- start common options --- */
 
+#define wxUSE_COMPILER_TLS 1
 
 #ifndef wxUSE_GUI
     #define wxUSE_GUI            1
@@ -358,9 +369,17 @@ typedef pid_t GPid;
 
 #define wxUSE_WEBVIEW 0
 
-#define wxUSE_WEBVIEW_WEBKIT 0
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 0
+#else
+#define wxUSE_WEBVIEW_IE 0
+#endif
 
-#define wxUSE_WEBVIEW_IE     0
+#if defined(__WXGTK__) || defined(__WXOSX__)
+#define wxUSE_WEBVIEW_WEBKIT 0
+#else
+#define wxUSE_WEBVIEW_WEBKIT 0
+#endif
 
 #ifdef _MSC_VER
 #   if _MSC_VER >= 1310
@@ -378,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
 
@@ -432,6 +455,7 @@ typedef pid_t GPid;
 #define wxUSE_STATTEXT     1
 #define wxUSE_STATBMP      1
 #define wxUSE_TEXTCTRL     1
+#define wxUSE_TIMEPICKCTRL  1
 #if defined (__WXMOTIF__) || defined( __WXGTK__ )
 #define wxUSE_TOGGLEBTN    1
 #else
@@ -493,6 +517,12 @@ typedef pid_t GPid;
 
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
+#if defined (__WXMOTIF__)
+#define wxUSE_RICHTOOLTIP 0
+#else
+#define wxUSE_RICHTOOLTIP 1
+#endif
+
 #define wxUSE_SASH          1
 
 #define wxUSE_SPLITTER      1
@@ -630,12 +660,21 @@ typedef pid_t GPid;
 
 #define wxUSE_PALETTE       1
 
+#if defined( __WXX11__ )
+#define wxUSE_ALL_THEMES    1
+
+#define wxUSE_THEME_GTK     1
+#define wxUSE_THEME_METAL   1
+#define wxUSE_THEME_MONO    1
+#define wxUSE_THEME_WIN32   1
+#else
 #define wxUSE_ALL_THEMES    0
 
 #define wxUSE_THEME_GTK     0
 #define wxUSE_THEME_METAL   0
 #define wxUSE_THEME_MONO    0
 #define wxUSE_THEME_WIN32   0
+#endif
 
 /* --- end common options --- */
 
@@ -684,7 +723,7 @@ typedef pid_t GPid;
 
 #define wxUSE_RICHEDIT2 0
 
-#define wxUSE_OWNER_DRAWN 0
+#define wxUSE_OWNER_DRAWN 1
 
 #define wxUSE_TASKBARICON_BALLOONS 0
 
@@ -697,6 +736,7 @@ typedef pid_t GPid;
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
 
 #define wxUSE_CRASHREPORT 0
 
@@ -847,9 +887,16 @@ typedef pid_t GPid;
 #define wxUSE_DC_TRANSFORM_MATRIX 1
 
 /*
- * Have glibc2
+ * Use libnotify library.
+ * Use libnotify 0.7+ API.
  */
-#define wxHAVE_GLIBC2 0
+#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
  */
@@ -1202,6 +1249,9 @@ typedef pid_t GPid;
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_THR_SETCONCURRENCY
 
+/* Define if you have pthread_setconcurrency function */
+#define HAVE_PTHREAD_SET_CONCURRENCY 1
+
 /* Define if you have the uname function.  */
 #define HAVE_UNAME 1
 
@@ -1300,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