X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1111fe434b5f9699891197691f744eb68445e486..9106ea703ca324d591ce3cfebe6b36935063e1e9:/setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index e22421f97f..3230f39712 100644
--- 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 : 4 February 2010                                                    *
+ * Date : 1 July 2010                                                        *
  *                                                                           *
  *****************************************************************************/
 
@@ -116,6 +116,7 @@ typedef pid_t GPid;
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__
+#undef __QNX__
 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__
@@ -190,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
@@ -253,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
@@ -340,7 +341,24 @@ typedef pid_t GPid;
 
 #define wxUSE_PROPGRID  1
 
+#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
 
@@ -495,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
@@ -547,7 +567,7 @@ typedef pid_t GPid;
 
 #define wxUSE_MOUSEWHEEL        1
 
-
+#define wxUSE_UIACTIONSIMULATOR 1
 
 #define wxUSE_POSTSCRIPT  1
 
@@ -734,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.
  */