X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c06469f66f5293111453161ad2e0cae12363f98b..001ad728a48bcfc7a763027b41f10ba1a25ce276:/setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 3ad1d29a82..2de279f93a 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 : 6 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
@@ -171,6 +168,8 @@ typedef pid_t GPid;
 
 #define WXWIN_COMPATIBILITY_2_6 1
 
+#define WXWIN_COMPATIBILITY_2_8 1
+
 #define wxDIALOG_UNIT_COMPATIBILITY   1
 
 
@@ -219,7 +218,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
 
@@ -260,12 +264,16 @@ typedef pid_t GPid;
 
 #define wxUSE_FS_ZIP        1
 
+#define wxUSE_FS_ARCHIVE    1
+
 #define wxUSE_FS_INET       1
 
 #define wxUSE_ARCHIVE_STREAMS     1
 
 #define wxUSE_ZIPSTREAM     1
 
+#define wxUSE_TARSTREAM     1
+
 #define wxUSE_ZLIB          1
 
 #define wxUSE_APPLE_IEEE          0
@@ -300,11 +308,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
 
@@ -329,6 +333,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
@@ -343,6 +348,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
@@ -533,6 +539,8 @@ typedef pid_t GPid;
 
 #define wxUSE_LIBTIFF       1
 
+#define wxUSE_TGA           1
+
 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1
@@ -558,14 +566,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
@@ -797,6 +805,11 @@ typedef pid_t GPid;
  */
 #define CONST_COMPATIBILITY 0
 
+/*
+ * use the session manager to detect KDE/GNOME
+ */
+#define wxUSE_DETECT_SM     0
+
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
  
@@ -930,6 +943,9 @@ typedef pid_t GPid;
 /* Define if you have strptime() declaration */
 #define HAVE_STRPTIME_DECL 1
 
+/* Define if you have strtoull() and strtoll() */
+#define HAVE_STRTOULL 1
+
 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 
@@ -960,6 +976,9 @@ typedef pid_t GPid;
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 
+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL
+
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
@@ -1128,6 +1147,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
 
@@ -1206,7 +1228,7 @@ typedef pid_t GPid;
 #undef HAVE_PANGO_XFT
 
 /* Define if fdopen is available.  */
-#undef HAVE_FDOPEN
+#define HAVE_FDOPEN 1
 
 /* ---------------------------------------------------------------------
    Win32 adjustments section
@@ -1221,10 +1243,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