Update announcement and readme files for 2.9.5 release.

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index f6fc5dab5ec346c339152ebb36679189b2c2f8f6..dbf8f2dd74f41a543f2c3f43b6b5f707d99324cc 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 : 20 June 2008                                                       *
+ * Date : 21 January 2013                                                    *

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


@@ -23,6 +23,11 @@
 /* Define as __inline if that's what the C compiler calls it.  */
 #undef inline
 
 /* Define as __inline if that's what the C compiler calls it.  */
 #undef inline
 

+#else
+
+#define __USE_STD_IOSTREAM 1
+#define _USE_STD_STAT 1
+

 #endif /* __cplusplus */
 
 /* fill in with the string wxGetOsDescription() will return */
 #endif /* __cplusplus */
 
 /* fill in with the string wxGetOsDescription() will return */


@@ -72,14 +77,22 @@
 /* #undef __WXLESSTIF__ */
 
 #ifdef __WXGTK__
 /* #undef __WXLESSTIF__ */
 
 #ifdef __WXGTK__

-/* Define this if your version of GTK+ is greater than 1.2 */
-#define __WXGTK12__ 1
+
+#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 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 */
 #define __WXGTK20__ 1
 
 /* Define this if your version of GTK+ is greater than 2.6 */


@@ -88,6 +101,9 @@
 /* Define this if your version of GTK+ is greater than 2.10 */
 #define __WXGTK210__ 1
 
 /* Define this if your version of GTK+ is greater than 2.10 */
 #define __WXGTK210__ 1
 

+/* Define this if your version of GTK+ is greater than 2.18 */
+#undef __WXGTK218__
+

 #include <types.h>
 typedef pid_t GPid;
 
 #include <types.h>
 typedef pid_t GPid;
 


@@ -96,6 +112,12 @@ typedef pid_t GPid;
 #endif
 #endif
 
 #endif
 #endif
 

+#ifdef VMS_GTK2
+#define wxUSE_CAIRO 1
+#else
+#define wxUSE_CAIRO 0
+#endif
+

 /*
  * Define to 1 for Unix[-like] system
  */
 /*
  * Define to 1 for Unix[-like] system
  */


@@ -113,6 +135,7 @@ typedef pid_t GPid;
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__

+#undef __QNX__

 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__
 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__


@@ -158,37 +181,37 @@ typedef pid_t GPid;
 
 /* --- start common options --- */
 
 
 /* --- start common options --- */
 

+#define wxUSE_COMPILER_TLS 1

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

-

 #define WXWIN_COMPATIBILITY_2_6 1
 
 #define WXWIN_COMPATIBILITY_2_8 1
 
 #define WXWIN_COMPATIBILITY_2_6 1
 
 #define WXWIN_COMPATIBILITY_2_8 1
 

-#define wxDIALOG_UNIT_COMPATIBILITY   1
-
+#define wxEVENTS_COMPATIBILITY_2_8 1

 
 

+#define wxDIALOG_UNIT_COMPATIBILITY   1

 
 

-#define wxUSE_DEBUG_CONTEXT 0
+#define wxUSE_DEBUG_CONTEXT 1

 
 

-#define wxUSE_DEBUGREPORT 0
+#define wxUSE_DEBUGREPORT 1

 
 #define wxUSE_MEMORY_TRACING 0
 
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 
 
 #define wxUSE_MEMORY_TRACING 0
 
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 

-#define wxUSE_DEBUG_NEW_ALWAYS 0
+#define wxUSE_DEBUG_NEW_ALWAYS 1

 
 

-#define wxUSE_ON_FATAL_EXCEPTION 0
+#define wxUSE_ON_FATAL_EXCEPTION 1

 
 #define wxUSE_STACKWALKER 0
 
 
 #ifndef wxUSE_UNICODE
 
 #define wxUSE_STACKWALKER 0
 
 
 #ifndef wxUSE_UNICODE

-#if defined( __WXX11__ ) || defined ( __WXMOTIF__ )
+#if defined( __WXX11__ )

     #define wxUSE_UNICODE 0
 #else
     #define wxUSE_UNICODE 1
     #define wxUSE_UNICODE 0
 #else
     #define wxUSE_UNICODE 1


@@ -202,15 +225,13 @@ typedef pid_t GPid;
 
 #define wxUSE_EXTENDED_RTTI 0
 
 
 #define wxUSE_EXTENDED_RTTI 0
 

-#define wxUSE_STL 0
-

 #define wxUSE_LOG 1
 
 #define wxUSE_LOGWINDOW 1
 
 #define wxUSE_LOGGUI 1
 
 #define wxUSE_LOG 1
 
 #define wxUSE_LOGWINDOW 1
 
 #define wxUSE_LOGGUI 1
 

-#define wxUSE_LOG_DIALOG 0
+#define wxUSE_LOG_DIALOG 1

 
 #define wxUSE_CMDLINE_PARSER 1
 
 
 #define wxUSE_CMDLINE_PARSER 1
 


@@ -218,24 +239,32 @@ typedef pid_t GPid;
 
 #define wxUSE_STREAMS       1
 
 
 #define wxUSE_STREAMS       1
 

+#define wxUSE_PRINTF_POS_PARAMS      0
+
+#define wxUSE_STL 0
+

 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)

-    #define wxUSE_STD_DEFAULT  0  
-#else

     #define wxUSE_STD_DEFAULT  0
     #define wxUSE_STD_DEFAULT  0

+#else
+    #define wxUSE_STD_DEFAULT  1

 #endif
 
 #endif
 

+#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+

 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
 

-#define wxUSE_PRINTF_POS_PARAMS 0
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH     1

 
 #define wxUSE_LONGLONG      1
 
 #define wxUSE_BASE64        1
 
 
 #define wxUSE_LONGLONG      1
 
 #define wxUSE_BASE64        1
 

-#define wxUSE_CONSOLE_EVENTLOOP 0
+#define wxUSE_CONSOLE_EVENTLOOP 1

 
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1
 
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1


@@ -251,7 +280,11 @@ typedef pid_t GPid;
 #define wxUSE_INTL          1
 #include <locale.h>
 
 #define wxUSE_INTL          1
 #include <locale.h>
 

+#if defined (__WXMOTIF__)
+#define wxUSE_XLOCALE 0
+#else

 #define wxUSE_XLOCALE 1
 #define wxUSE_XLOCALE 1

+#endif

 
 #define wxUSE_DATETIME      1
 
 
 #define wxUSE_DATETIME      1
 


@@ -259,6 +292,8 @@ typedef pid_t GPid;
 
 #define wxUSE_STOPWATCH     1
 
 
 #define wxUSE_STOPWATCH     1
 

+#define wxUSE_FSWATCHER     0
+

 #define wxUSE_CONFIG        1
 
 #define wxUSE_CONFIG_NATIVE   0
 #define wxUSE_CONFIG        1
 
 #define wxUSE_CONFIG_NATIVE   0


@@ -312,7 +347,9 @@ typedef pid_t GPid;
 
 #define wxUSE_VARIANT 1
 
 
 #define wxUSE_VARIANT 1
 

-#define wxUSE_REGEX       0
+#define wxUSE_ANY 1
+
+#define wxUSE_REGEX       1

 
 #define wxUSE_SYSTEM_OPTIONS 1
 
 
 #define wxUSE_SYSTEM_OPTIONS 1
 


@@ -320,20 +357,57 @@ typedef pid_t GPid;
 
 #define wxUSE_MEDIACTRL     1
 
 
 #define wxUSE_MEDIACTRL     1
 

-#define wxUSE_GSTREAMER     0
-

 #define wxUSE_XRC       1
 
 #define wxUSE_XML       wxUSE_XRC
 
 #define wxUSE_AUI       1
 
 #define wxUSE_XRC       1
 
 #define wxUSE_XML       wxUSE_XRC
 
 #define wxUSE_AUI       1
 

-#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_RIBBON  1
+
+#define wxUSE_PROPGRID  1
+
+#define wxUSE_WEBVIEW 0
+
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 0
+#else
+#define wxUSE_WEBVIEW_IE 0
+#endif
+
+#if defined(__WXGTK__) || defined(__WXOSX__)
+#define wxUSE_WEBVIEW_WEBKIT 0
+#else
+#define wxUSE_WEBVIEW_WEBKIT 0
+#endif
+
+#ifdef _MSC_VER
+#   if _MSC_VER >= 1310
+
+

 #define wxUSE_GRAPHICS_CONTEXT 0
 #define wxUSE_GRAPHICS_CONTEXT 0

+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+
+
+
+
+
+#ifdef __WXGTK3__
+#   define wxUSE_GRAPHICS_CONTEXT 1
+#else
+#   define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 #endif
 
 #define wxUSE_CONTROLS     1
 
 #endif
 
 #define wxUSE_CONTROLS     1
 

+#define wxUSE_MARKUP       1
+

 #ifdef __WXMOTIF__
 #define wxUSE_POPUPWIN 0
 #else
 #ifdef __WXMOTIF__
 #define wxUSE_POPUPWIN 0
 #else


@@ -345,6 +419,7 @@ typedef pid_t GPid;
 #define wxUSE_STC 1
 
 #define wxUSE_ANIMATIONCTRL 1
 #define wxUSE_STC 1
 
 #define wxUSE_ANIMATIONCTRL 1

+#define wxUSE_BANNERWINDOW  1

 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 1


@@ -354,6 +429,7 @@ typedef pid_t GPid;
 #define wxUSE_COLLPANE      1
 #define wxUSE_COLOURPICKERCTRL 1
 #define wxUSE_COMBOBOX     1
 #define wxUSE_COLLPANE      1
 #define wxUSE_COLOURPICKERCTRL 1
 #define wxUSE_COMBOBOX     1

+#define wxUSE_COMMANDLINKBUTTON 1

 #define wxUSE_DATAVIEWCTRL   1
 #define wxUSE_DATEPICKCTRL 1
 #define wxUSE_DIRPICKERCTRL 1
 #define wxUSE_DATAVIEWCTRL   1
 #define wxUSE_DATEPICKCTRL 1
 #define wxUSE_DIRPICKERCTRL 1


@@ -362,11 +438,13 @@ typedef pid_t GPid;
 #define wxUSE_FILEPICKERCTRL 1
 #define wxUSE_FONTPICKERCTRL 1
 #define wxUSE_GAUGE        1
 #define wxUSE_FILEPICKERCTRL 1
 #define wxUSE_FONTPICKERCTRL 1
 #define wxUSE_GAUGE        1

+#define wxUSE_HEADERCTRL 1

 #define wxUSE_HYPERLINKCTRL 1
 #define wxUSE_LISTBOX      1
 #define wxUSE_LISTCTRL     1
 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBTN     1
 #define wxUSE_HYPERLINKCTRL 1
 #define wxUSE_LISTBOX      1
 #define wxUSE_LISTCTRL     1
 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBTN     1

+#define wxUSE_RICHMSGDLG    1

 #define wxUSE_SCROLLBAR    1
 #define wxUSE_SEARCHCTRL    1
 #define wxUSE_SLIDER       1
 #define wxUSE_SCROLLBAR    1
 #define wxUSE_SEARCHCTRL    1
 #define wxUSE_SLIDER       1


@@ -377,12 +455,14 @@ 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
 #define wxUSE_TOGGLEBTN    0
 #endif
 #define wxUSE_TREECTRL     1
 #if defined (__WXMOTIF__) || defined( __WXGTK__ )
 #define wxUSE_TOGGLEBTN    1
 #else
 #define wxUSE_TOGGLEBTN    0
 #endif
 #define wxUSE_TREECTRL     1

+#define wxUSE_TREELISTCTRL  1

 
 #define wxUSE_STATUSBAR    1
 
 
 #define wxUSE_STATUSBAR    1
 


@@ -401,8 +481,6 @@ typedef pid_t GPid;
 
 #define wxUSE_TOOLBOOK 1
 
 
 #define wxUSE_TOOLBOOK 1
 

-#define wxUSE_TAB_DIALOG    1
-

 #define wxUSE_TASKBARICON 1
 
 #define wxUSE_GRID         1
 #define wxUSE_TASKBARICON 1
 
 #define wxUSE_GRID         1


@@ -415,8 +493,14 @@ typedef pid_t GPid;
 
 #define wxUSE_BITMAPCOMBOBOX 1
 
 
 #define wxUSE_BITMAPCOMBOBOX 1
 

+#define wxUSE_REARRANGECTRL 1
+

 #define wxUSE_ACCEL 1
 
 #define wxUSE_ACCEL 1
 

+#define wxUSE_ARTPROVIDER_STD 1
+
+#define wxUSE_ARTPROVIDER_TANGO 1
+

 #define wxUSE_HOTKEY 1
 
 #define wxUSE_CARET         1
 #define wxUSE_HOTKEY 1
 
 #define wxUSE_CARET         1


@@ -427,10 +511,18 @@ typedef pid_t GPid;
 
 #define wxUSE_IMAGLIST      1
 
 
 #define wxUSE_IMAGLIST      1
 

+#define wxUSE_INFOBAR 1
+

 #define wxUSE_MENUS         1
 
 #define wxUSE_NOTIFICATION_MESSAGE 1
 
 #define wxUSE_MENUS         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


@@ -482,6 +574,8 @@ typedef pid_t GPid;
 
 #define wxUSE_ABOUTDLG 1
 
 
 #define wxUSE_ABOUTDLG 1
 

+#define wxUSE_FILE_HISTORY 1
+

 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 #define wxUSE_WIN_METAFILES_ALWAYS  0
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 #define wxUSE_WIN_METAFILES_ALWAYS  0


@@ -534,7 +628,7 @@ typedef pid_t GPid;
 
 #define wxUSE_MOUSEWHEEL        1
 
 
 #define wxUSE_MOUSEWHEEL        1
 

-
+#define wxUSE_UIACTIONSIMULATOR 1

 
 #define wxUSE_POSTSCRIPT  1
 
 
 #define wxUSE_POSTSCRIPT  1
 


@@ -542,12 +636,6 @@ typedef pid_t GPid;
 
 #define wxUSE_SVG 1
 
 
 #define wxUSE_SVG 1
 

-#define REMOVE_UNUSED_ARG   1
-
-#define wxUSE_IOSTREAMH     1
-
-
-

 #define wxUSE_IMAGE         1
 
 #define wxUSE_LIBPNG        1
 #define wxUSE_IMAGE         1
 
 #define wxUSE_LIBPNG        1


@@ -572,12 +660,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 --- */
 


@@ -590,6 +687,16 @@ typedef pid_t GPid;
 #define wxUSE_UNICODE_UTF8 0
 #define wxUSE_UTF8_LOCALE_ONLY 0
 
 #define wxUSE_UNICODE_UTF8 0
 #define wxUSE_UTF8_LOCALE_ONLY 0
 

+/*
+   Use GStreamer for Unix.
+
+   Default is 0 as this requires a lot of dependencies which might not be
+   available.
+
+   Recommended setting: 1 (wxMediaCtrl won't work by default without it)
+ */
+#define wxUSE_GSTREAMER 0
+

 /* --- start MSW options --- */
 
 #ifndef wxUSE_UNICODE_MSLU
 /* --- start MSW options --- */
 
 #ifndef wxUSE_UNICODE_MSLU


@@ -616,7 +723,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
 


@@ -629,36 +736,17 @@ typedef pid_t GPid;
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 

+#define wxUSE_TIMEPICKCTRL_GENERIC 0

 
 #define wxUSE_CRASHREPORT 0
 
 /* --- end MSW options --- */
 
 
 #define wxUSE_CRASHREPORT 0
 
 /* --- end MSW options --- */
 

-/*
- * Supports bool type
- */
-#define HAVE_BOOL
-

 /*
  * Define if your compiler supports the explicit keyword
  */
 #define HAVE_EXPLICIT 1
 
 /*
  * Define if your compiler supports the explicit keyword
  */
 #define HAVE_EXPLICIT 1
 

-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_CONST_CAST 1
-
-/*
- * Define if your compiler supports reinterpret_cast<>()
- */
-#define HAVE_REINTERPRET_CAST 1
-
-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_STATIC_CAST 1
-

 /*
  * Define if your compiler has C99 va_copy
  */
 /*
  * Define if your compiler has C99 va_copy
  */


@@ -731,6 +819,16 @@ typedef pid_t GPid;
  */
 #undef HAVE_TR1_UNORDERED_SET
 
  */
 #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.
  */
 /*
  * Define if the compiler supports simple visibility declarations.
  */


@@ -782,9 +880,23 @@ typedef pid_t GPid;
  */
 #define wxUSE_LIBHILDON 0
 /*
  */
 #define wxUSE_LIBHILDON 0
 /*

- * Have glibc2
+ * Use the Hildon 2.0 framework

  */
  */

-#define wxHAVE_GLIBC2 0
+#define wxUSE_LIBHILDON2 0
+
+#define wxUSE_DC_TRANSFORM_MATRIX 1
+
+/*
+ * Use libnotify library.
+ * Use libnotify 0.7+ API.
+ */
+#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
  */
 /*
  * Use libXpm
  */


@@ -799,7 +911,11 @@ typedef pid_t GPid;
  */
 #undef HAVE___THREAD_KEYWORD
 
  */
 #undef HAVE___THREAD_KEYWORD
 

-/* compatibility */
+/*
+ * Define if large (64 bit file offsets) files are supported.
+ */
+#undef HAVE_LARGEFILE_SUPPORT
+

 /*
  * Use OpenGL
  */
 /*
  * Use OpenGL
  */


@@ -856,7 +972,7 @@ typedef pid_t GPid;
 
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
 
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE

- 
+

 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #define WX_SOCKLEN_T size_t
 
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #define WX_SOCKLEN_T size_t
 


@@ -867,7 +983,7 @@ typedef pid_t GPid;
 #undef WX_STATFS_T
 
 /* The signal handler prototype */
 #undef WX_STATFS_T
 
 /* The signal handler prototype */

-#undef wxTYPE_SA_HANDLER
+#define wxTYPE_SA_HANDLER int

 
 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
 
 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */


@@ -969,12 +1085,6 @@ typedef pid_t GPid;
 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 
 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 

-/* Define if you have strptime() */
-#define HAVE_STRPTIME 1
-
-/* 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 strtoull() and strtoll() */
 #define HAVE_STRTOULL 1
 


@@ -1008,12 +1118,27 @@ typedef pid_t GPid;
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 

-/* Define if you have wcslen function  */
+/* Define if you have wcscasecmp() function  */
+#undef HAVE_WCSCASECMP
+
+/* Define if you have wcsncasecmp() function  */
+#undef HAVE_WCSNCASECMP
+
+/* Define if you have wcslen function */

 #define HAVE_WCSLEN 1
 
 /* Define if you have wcsdup function  */
 #undef HAVE_WCSDUP
 
 #define HAVE_WCSLEN 1
 
 /* Define if you have wcsdup function  */
 #undef HAVE_WCSDUP
 

+/* Define if you have wcsftime() function  */
+#define HAVE_WCSFTIME 1
+
+/* Define if you have strnlen() function */
+#define HAVE_STRNLEN 1
+
+/* Define if you have wcsnlen() function */
+#undef HAVE_WCSNLEN
+

 /* Define if you have wcstoull() and wcstoll() */
 #undef HAVE_WCSTOULL
 
 /* Define if you have wcstoull() and wcstoll() */
 #undef HAVE_WCSTOULL
 


@@ -1124,6 +1249,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
 


@@ -1222,6 +1350,9 @@ typedef pid_t GPid;
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
 /* 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
 
 /* Define if fdopen is available.  */
 #define HAVE_FDOPEN 1
 


@@ -1234,19 +1365,24 @@ typedef pid_t GPid;
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 

+/* Define if setpriority() is available. */
+#undef HAVE_SETPRIORITY
+

 /* Define if locale_t is available */
 #undef HAVE_LOCALE_T
 
 /* Define if locale_t is available */
 #undef HAVE_LOCALE_T
 

+/* Define if you have inotify_xxx() functions. */
+#undef wxHAS_INOTIFY
+
+/* Define if you have kqueu_xxx() functions. */
+#undef wxHAS_KQUEUE
+

 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------
  */
 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------
  */

- 
-#ifdef __WIN32__

 
 

-/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibil
-      with wx/msw/setup.h */
-#define wxUSE_XPM_IN_MSW wxUSE_XPM
+#ifdef __WIN32__

 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 


@@ -1273,5 +1409,16 @@ typedef pid_t GPid;
 
 #undef HAVE_SYS_SELECT_H
 
 
 #undef HAVE_SYS_SELECT_H
 

+#if defined( __WXGTK__ ) && !defined( VMS_GTK2 )
+#define wxHAS_RAW_BITMAP 1
+#endif
+
+#ifdef VMS_GTK2
+#define GSEAL(x) x
+#endif
+
+#define __VMS_BROKEN_TEMPLATES
+
+#include <stdlib.h>

 
 #endif /* __WX_SETUP_H__ */
 
 #endif /* __WX_SETUP_H__ */