Make a couple virtuals protected so they can be overridden.

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index adc76a8601326c3c4c59389005200a60ee0ec992..9c328ce4a2b9fd1fb490995d0a7c2ad484139f86 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)                            *
  * 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 : 29 June 2012                                                       *

  *                                                                           *
  *****************************************************************************/
 
  *                                                                           *
  *****************************************************************************/
 


@@ -171,6 +171,7 @@ typedef pid_t GPid;
 
 /* --- start common options --- */
 
 
 /* --- start common options --- */
 

+#define wxUSE_COMPILER_TLS 1

 
 #ifndef wxUSE_GUI
     #define wxUSE_GUI            1
 
 #ifndef wxUSE_GUI
     #define wxUSE_GUI            1


@@ -358,9 +359,17 @@ typedef pid_t GPid;
 
 #define wxUSE_WEBVIEW 0
 
 
 #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
 
 #ifdef _MSC_VER
 #   if _MSC_VER >= 1310


@@ -432,6 +441,7 @@ typedef pid_t GPid;
 #define wxUSE_STATTEXT     1
 #define wxUSE_STATBMP      1
 #define wxUSE_TEXTCTRL     1
 #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
 #if defined (__WXMOTIF__) || defined( __WXGTK__ )
 #define wxUSE_TOGGLEBTN    1
 #else


@@ -493,6 +503,12 @@ typedef pid_t GPid;
 
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
 
 #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
 #define wxUSE_SASH          1
 
 #define wxUSE_SPLITTER      1


@@ -630,12 +646,21 @@ typedef pid_t GPid;
 
 #define wxUSE_PALETTE       1
 
 
 #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
 #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 --- */
 
 
 /* --- end common options --- */
 


@@ -684,7 +709,7 @@ typedef pid_t GPid;
 
 #define wxUSE_RICHEDIT2 0
 
 
 #define wxUSE_RICHEDIT2 0
 

-#define wxUSE_OWNER_DRAWN 0
+#define wxUSE_OWNER_DRAWN 1

 
 #define wxUSE_TASKBARICON_BALLOONS 0
 
 
 #define wxUSE_TASKBARICON_BALLOONS 0
 


@@ -697,6 +722,7 @@ typedef pid_t GPid;
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 

+#define wxUSE_TIMEPICKCTRL_GENERIC 0

 
 #define wxUSE_CRASHREPORT 0
 
 
 #define wxUSE_CRASHREPORT 0
 


@@ -846,10 +872,6 @@ typedef pid_t GPid;
 
 #define wxUSE_DC_TRANSFORM_MATRIX 1
 
 
 #define wxUSE_DC_TRANSFORM_MATRIX 1
 

-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0

 /*
  * Use libXpm
  */
 /*
  * Use libXpm
  */


@@ -1202,6 +1224,9 @@ typedef pid_t GPid;
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_THR_SETCONCURRENCY
 
 /* 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
 
 /* Define if you have the uname function.  */
 #define HAVE_UNAME 1