more about virtual functions access specifier changing

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 0aa702b24ade5fa4460c154416df06974890dd70..96a8354d1705a96b1f868c8bf3d1578b544675aa 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -1,9 +1,9 @@
-       /*****************************************************************************
+/*****************************************************************************
  *                                                                           *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 30 October 2006                                                    *
+ * Date : 19 December 2006                                                   *
  *                                                                           *
  *****************************************************************************/
 
@@ -143,9 +143,6 @@ typedef pid_t GPid;
 #undef __WINDOWS__
 #endif
 
-#ifndef __WIN95__
-#undef __WIN95__
-#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
@@ -219,7 +216,12 @@ typedef pid_t GPid;
 
 #define wxUSE_STD_IOSTREAM  0
 
-#define wxUSE_STD_STRING  0
+#if defined(__DMC__) || defined(__WATCOMC__) \
+     || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  0
+#endif
 
 #define wxUSE_PRINTF_POS_PARAMS 0
 
@@ -304,11 +306,7 @@ typedef pid_t GPid;
 
 #define wxUSE_XRC       1
 
-#if wxUSE_XRC
-#define wxUSE_XML       1
-#else
-#  define wxUSE_XML       1
-#endif
+#define wxUSE_XML       wxUSE_XRC
 
 #define wxUSE_AUI       1
 
@@ -333,6 +331,7 @@ typedef pid_t GPid;
 #define wxUSE_CHECKBOX     1
 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE       1
+#define wxUSE_COLLPANE      1
 #define wxUSE_COLOURPICKERCTRL 1
 #define wxUSE_COMBOBOX     1
 #define wxUSE_DATAVIEWCTRL   1
@@ -347,6 +346,7 @@ typedef pid_t GPid;
 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBTN     1
 #define wxUSE_SCROLLBAR    1
+#define wxUSE_SEARCHCTRL    1
 #define wxUSE_SLIDER       1
 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1
@@ -564,14 +564,14 @@ typedef pid_t GPid;
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
+#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
 /* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else
@@ -1145,6 +1145,9 @@ typedef pid_t GPid;
 #undef HAVE_WCTYPE_H
 #endif
 
+/* Define if you have <widec.h> (Solaris only) */
+#undef HAVE_WIDEC_H
+
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 
@@ -1238,10 +1241,6 @@ typedef pid_t GPid;
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
-/* Define if the system headers declare the type boolean (which will conflict
- * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
-#undef HAVE_BOOLEAN
-
 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H