Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 11e8240f11ca9d3e3622b1f0af182f6cb15e75cb..cfa7fa2c419077eac4faedbff79df06f957e522f 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -2,8 +2,8 @@
  *                                                                           *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  *                                                                           *
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *

- * Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                             *
- * Date : 9 November 1999                                                    *
+ * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
+ * Date : 3 November 2011                                                    *

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


@@ -12,10 +12,6 @@
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
 
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include <wx/vms_x_fix.h>
 
 /* never undefine inline or const keywords for C++ compilation */
 #include <wx/vms_x_fix.h>
 
 /* never undefine inline or const keywords for C++ compilation */


@@ -27,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 */


@@ -57,7 +58,7 @@
 #define HAVE_SSIZE_T 1
 
 /* Define if you have the ANSI C header files.  */
 #define HAVE_SSIZE_T 1
 
 /* Define if you have the ANSI C header files.  */

-#define STDC_HEADERS
+#define STDC_HEADERS 1

 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t


@@ -72,18 +73,39 @@
 /* Define this if your version of Motif is greater than 2.0 */
 /* #undef __WXMOTIF20__ */
 
 /* Define this if your version of Motif is greater than 2.0 */
 /* #undef __WXMOTIF20__ */
 

+/* Define this if you are using Lesstif */
+/* #undef __WXLESSTIF__ */
+

 #ifdef __WXGTK__
 #ifdef __WXGTK__

-/* Define this if your version of GTK+ is greater than 1.2 */
-#define __WXGTK12__ 1

 
 /* 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 */
 
 /* 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 */

-/* #undef __WXGTK20__ */
+#ifdef VMS_GTK2
+#define __WXGTK20__ 1
+
+/* Define this if your version of GTK+ is greater than 2.6 */
+#define __WXGTK26__ 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;

 
 

-/* Define this if your version of GTK+ is greater than 2.4 */
-/* #undef __WXGTK24__ */
+#define G_GNUC_INTERNAL
+
+#endif
+#endif
+
+#ifdef VMS_GTK2
+#define wxUSE_CAIRO 1
+#else
+#define wxUSE_CAIRO 0

 #endif
 
 /*
 #endif
 
 /*


@@ -103,6 +125,7 @@
 #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__


@@ -122,6 +145,9 @@
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 

+/* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
+#undef __Point__
+

 /* MS-DOS with DJGPP */
 #undef __DOS__
 
 /* MS-DOS with DJGPP */
 #undef __DOS__
 


@@ -130,9 +156,6 @@
 #undef __WINDOWS__
 #endif
 
 #undef __WINDOWS__
 #endif
 

-#ifndef __WIN95__
-#undef __WIN95__
-#endif

 #ifndef __WIN32__
 #undef __WIN32__
 #endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif


@@ -153,38 +176,36 @@
     #define wxUSE_GUI            1
 #endif
 
     #define wxUSE_GUI            1
 #endif
 

+#define WXWIN_COMPATIBILITY_2_6 1

 
 

-#define WXWIN_COMPATIBILITY_2_2 1
+#define WXWIN_COMPATIBILITY_2_8 1

 
 

-#define WXWIN_COMPATIBILITY_2_4 1
+#define wxEVENTS_COMPATIBILITY_2_8 1

 
 #define wxDIALOG_UNIT_COMPATIBILITY   1
 
 
 #define wxDIALOG_UNIT_COMPATIBILITY   1
 

+#define wxUSE_DEBUG_CONTEXT 1

 
 

-
-#define wxUSE_DEBUG_CONTEXT 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

 
 

-#if defined(_MSC_VER) || \
-    (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#else
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+#define wxUSE_ON_FATAL_EXCEPTION 1

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

+#if defined( __WXX11__ )

     #define wxUSE_UNICODE 0
     #define wxUSE_UNICODE 0

+#else
+    #define wxUSE_UNICODE 1
+#endif

 #endif
 #endif

-
-#define wxUSE_UNICODE_MSLU 0

 
 #define wxUSE_WCHAR_T 1
 
 
 #define wxUSE_WCHAR_T 1
 


@@ -193,15 +214,13 @@
 
 #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
 


@@ -209,21 +228,52 @@
 
 #define wxUSE_STREAMS       1
 
 
 #define wxUSE_STREAMS       1
 

-#define wxUSE_STD_IOSTREAM  0
+#define wxUSE_PRINTF_POS_PARAMS      0
+
+#define wxUSE_STL 0

 
 

+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_DEFAULT  0
+#else
+    #define wxUSE_STD_DEFAULT  1
+#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_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH     1

 
 #define wxUSE_LONGLONG      1
 
 
 #define wxUSE_LONGLONG      1
 

+#define wxUSE_BASE64        1
+
+#define wxUSE_CONSOLE_EVENTLOOP 1
+

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

+#define wxUSE_STDPATHS      1
+

 #define wxUSE_TEXTBUFFER    1
 
 #define wxUSE_TEXTFILE      1
 
 #define wxUSE_INTL          1
 #define wxUSE_TEXTBUFFER    1
 
 #define wxUSE_TEXTFILE      1
 
 #define wxUSE_INTL          1

+#include <locale.h>
+
+#if defined (__WXMOTIF__)
+#define wxUSE_XLOCALE 0
+#else
+#define wxUSE_XLOCALE 1
+#endif

 
 #define wxUSE_DATETIME      1
 
 
 #define wxUSE_DATETIME      1
 


@@ -231,6 +281,8 @@
 
 #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


@@ -242,23 +294,32 @@
 #define wxUSE_DYNAMIC_LOADER  0
 
 #define wxUSE_SOCKETS       1
 #define wxUSE_DYNAMIC_LOADER  0
 
 #define wxUSE_SOCKETS       1

+#include <socket.h>
+
+#define wxUSE_IPV6          0

 
 #define wxUSE_FILESYSTEM    1
 
 #define wxUSE_FS_ZIP        1
 
 
 #define wxUSE_FILESYSTEM    1
 
 #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_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
 
 #define wxUSE_JOYSTICK            0
 
 #define wxUSE_ZLIB          1
 
 #define wxUSE_APPLE_IEEE          0
 
 #define wxUSE_JOYSTICK            0
 

+#define wxUSE_FONTENUM 1
+

 #define wxUSE_FONTMAP 1
 
 #define wxUSE_MIMETYPE 1
 #define wxUSE_FONTMAP 1
 
 #define wxUSE_MIMETYPE 1


@@ -273,7 +334,11 @@
 
 #define wxUSE_URL_NATIVE 0
 
 
 #define wxUSE_URL_NATIVE 0
 

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

 
 #define wxUSE_SYSTEM_OPTIONS 1
 
 
 #define wxUSE_SYSTEM_OPTIONS 1
 


@@ -281,23 +346,53 @@
 
 #define wxUSE_MEDIACTRL     1
 
 
 #define wxUSE_MEDIACTRL     1
 

-#define wxUSE_QUICKTIME     1
+#define wxUSE_XRC       1

 
 

-#define wxUSE_DIRECTSHOW    1
+#define wxUSE_XML       wxUSE_XRC

 
 

-#define wxUSE_GSTREAMER     0
+#define wxUSE_AUI       1

 
 

-#define wxUSE_XRC       1
+#define wxUSE_RIBBON  1
+
+#define wxUSE_PROPGRID  1

 
 

-#if wxUSE_XRC
-#define wxUSE_XML       1
+#define wxUSE_WEBVIEW 0
+
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 0

 #else
 #else

-#  define wxUSE_XML       1
+#define wxUSE_WEBVIEW_IE 0

 #endif
 
 #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
+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 #define wxUSE_CONTROLS     1
 
 
 #define wxUSE_CONTROLS     1
 

+#define wxUSE_MARKUP       1
+

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


@@ -306,20 +401,37 @@
 
 #define wxUSE_TIPWINDOW    1
 
 
 #define wxUSE_TIPWINDOW    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_CHECKBOX     1
 #define wxUSE_CHECKLISTBOX 1
 #define wxUSE_CHOICE       1
 #define wxUSE_BUTTON       1
 #define wxUSE_BMPBUTTON    1
 #define wxUSE_CALENDARCTRL 1
 #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_COMBOBOX     1

+#define wxUSE_COMMANDLINKBUTTON 1
+#define wxUSE_DATAVIEWCTRL   1

 #define wxUSE_DATEPICKCTRL 1
 #define wxUSE_DATEPICKCTRL 1

+#define wxUSE_DIRPICKERCTRL 1
+#define wxUSE_EDITABLELISTBOX 1
+#define wxUSE_FILECTRL      1
+#define wxUSE_FILEPICKERCTRL 1
+#define wxUSE_FONTPICKERCTRL 1

 #define wxUSE_GAUGE        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_LISTBOX      1
 #define wxUSE_LISTCTRL     1
 #define wxUSE_RADIOBOX     1
 #define wxUSE_RADIOBTN     1

+#define wxUSE_RICHMSGDLG    1

 #define wxUSE_SCROLLBAR    1
 #define wxUSE_SCROLLBAR    1

+#define wxUSE_SEARCHCTRL    1

 #define wxUSE_SLIDER       1
 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1
 #define wxUSE_SLIDER       1
 #define wxUSE_SPINBTN      1
 #define wxUSE_SPINCTRL     1


@@ -328,20 +440,18 @@
 #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
 

-#if defined(__WXMSW__) || defined(__WXMAC__)
-#define wxUSE_NATIVE_STATUSBAR        0
-#else

 #define wxUSE_NATIVE_STATUSBAR        0
 #define wxUSE_NATIVE_STATUSBAR        0

-#endif

 
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
 
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1


@@ -352,27 +462,52 @@
 
 #define wxUSE_CHOICEBOOK 1
 
 
 #define wxUSE_CHOICEBOOK 1
 

-#define wxUSE_TAB_DIALOG    1
+#define wxUSE_TREEBOOK 1
+
+#define wxUSE_TOOLBOOK 1
+
+#define wxUSE_TASKBARICON 1

 
 #define wxUSE_GRID         1
 
 #define wxUSE_MINIFRAME 1
 
 
 #define wxUSE_GRID         1
 
 #define wxUSE_MINIFRAME 1
 

+#define wxUSE_COMBOCTRL 1
+
+#define wxUSE_ODCOMBOBOX 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
 

-#define wxUSE_DISPLAY       1
+#define wxUSE_DISPLAY       0

 
 #define wxUSE_GEOMETRY            1
 
 #define wxUSE_IMAGLIST      1
 
 
 #define wxUSE_GEOMETRY            1
 
 #define wxUSE_IMAGLIST      1
 

+#define wxUSE_INFOBAR 1
+

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


@@ -385,6 +520,11 @@
 
 #define wxUSE_VALIDATORS 1
 
 
 #define wxUSE_VALIDATORS 1
 

+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif

 
 #define wxUSE_COMMON_DIALOGS 1
 
 
 #define wxUSE_COMMON_DIALOGS 1
 


@@ -417,10 +557,13 @@
 
 #define wxUSE_WIZARDDLG 1
 
 
 #define wxUSE_WIZARDDLG 1
 

+#define wxUSE_ABOUTDLG 1
+
+#define wxUSE_FILE_HISTORY 1

 
 

-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  1
+#define wxUSE_METAFILE              0
+#define wxUSE_ENH_METAFILE          0
+#define wxUSE_WIN_METAFILES_ALWAYS  0

 
 
 #define wxUSE_MDI 1
 
 
 #define wxUSE_MDI 1


@@ -435,6 +578,7 @@
 
 #define wxUSE_GLCANVAS       1
 
 
 #define wxUSE_GLCANVAS       1
 

+#define wxUSE_RICHTEXT       1

 
 #define wxUSE_CLIPBOARD     1
 
 
 #define wxUSE_CLIPBOARD     1
 


@@ -459,16 +603,8 @@
 
 #define wxUSE_MS_HTML_HELP 0
 
 
 #define wxUSE_MS_HTML_HELP 0
 

-

 #define wxUSE_WXHTML_HELP 1
 
 #define wxUSE_WXHTML_HELP 1
 

-#define wxUSE_RESOURCES   1
-
-/*
- * Use Prolog IO
- */
-#define wxUSE_PROLOGIO 1
-

 #define wxUSE_CONSTRAINTS 1
 
 
 #define wxUSE_CONSTRAINTS 1
 
 


@@ -477,27 +613,13 @@
 
 #define wxUSE_MOUSEWHEEL        1
 
 
 #define wxUSE_MOUSEWHEEL        1
 

-
+#define wxUSE_UIACTIONSIMULATOR 1

 
 #define wxUSE_POSTSCRIPT  1
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 1
 
 
 #define wxUSE_POSTSCRIPT  1
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 1
 

-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-
-#define wxUSE_ODBC          1
-
-#define wxODBC_FWD_ONLY_CURSORS         1
-
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
-
-#define REMOVE_UNUSED_ARG   1
-
-#define wxUSE_IOSTREAMH     1
-
-
+#define wxUSE_SVG 1

 
 #define wxUSE_IMAGE         1
 
 
 #define wxUSE_IMAGE         1
 


@@ -507,6 +629,8 @@
 
 #define wxUSE_LIBTIFF       1
 
 
 #define wxUSE_LIBTIFF       1
 

+#define wxUSE_TGA           1
+

 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1
 #define wxUSE_GIF           1
 
 #define wxUSE_PNM           1


@@ -521,29 +645,78 @@
 
 #define wxUSE_PALETTE       1
 
 
 #define wxUSE_PALETTE       1
 

-/* --- end common options --- */
+#define wxUSE_ALL_THEMES    0

 
 

-/* for some features we don't have dedicated configure switches, so just choose
- * the common values automatically */
-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1
-#endif
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0

 
 

-#if defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1
-#endif
+/* --- end common options --- */

 
 

-/* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
-#define wxUSE_RICHEDIT 1
-#else
-#define wxUSE_RICHEDIT 0
-#endif
+/*
+ * Unix/VMS-specific options
+ */
+#define wxUSE_SELECT_DISPATCHER 1
+#define wxUSE_EPOLL_DISPATCHER 0
+
+#define wxUSE_UNICODE_UTF8 0
+#define wxUSE_UTF8_LOCALE_ONLY 0

 
 /*
 
 /*

- * Supports bool type
+   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 HAVE_BOOL
+#define wxUSE_GSTREAMER 0
+
+/* --- start MSW options --- */
+
+#ifndef wxUSE_UNICODE_MSLU
+    #define wxUSE_UNICODE_MSLU 0
+#endif
+
+#define wxUSE_MFC           0
+
+#define wxUSE_OLE           0
+
+#define wxUSE_OLE_AUTOMATION 0
+
+#define wxUSE_ACTIVEX 0
+
+#define wxUSE_DC_CACHEING 1
+
+#define wxUSE_WXDIB 0
+
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
+
+#define wxUSE_REGKEY 0
+
+#define wxUSE_RICHEDIT  0
+
+#define wxUSE_RICHEDIT2 0
+
+#define wxUSE_OWNER_DRAWN 0
+
+#define wxUSE_TASKBARICON_BALLOONS 0
+
+#define wxUSE_UXTHEME           0
+
+#define wxUSE_INKEDIT  0
+
+#define wxUSE_INICONF 0
+
+
+#define wxUSE_DATEPICKCTRL_GENERIC 0
+
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
+#define wxUSE_CRASHREPORT 0
+
+/* --- end MSW options --- */

 
 /*
  * Define if your compiler supports the explicit keyword
 
 /*
  * Define if your compiler supports the explicit keyword


@@ -551,30 +724,30 @@
 #define HAVE_EXPLICIT 1
 
 /*
 #define HAVE_EXPLICIT 1
 
 /*

- * Define if your compiler supports const_cast<>()
+ * Define if your compiler has C99 va_copy

  */
  */

-#define HAVE_CONST_CAST 1
+#undef HAVE_VA_COPY

 
 /*
 
 /*

- * Define if your compiler supports reinterpret_cast<>()
+ * Define if va_list type is an array

  */
  */

-#define HAVE_REINTERPRET_CAST 1
+#undef VA_LIST_IS_ARRAY

 
 /*
 
 /*

- * Define if your compiler supports const_cast<>()
+ * Define if the compiler supports variadic macros

  */
  */

-#define HAVE_STATIC_CAST 1
+#undef HAVE_VARIADIC_MACROS

 
 

+#if defined(__NAMESPACE_STD) && !defined(__NAMESPACE_STD_ONLY)

 /*
 /*

- * Define if your compiler has C99 va_copy
+ * Define if your compiler has std::wstring

  */
  */

-#undef HAVE_VA_COPY
-
+#define HAVE_STD_WSTRING 1

 /*
 /*

- * Define if va_list type is an array
+ * Define if your compiler has compliant std::string::compare

  */
  */

-#undef VA_LIST_IS_ARRAY
-
+#define HAVE_STD_STRING_COMPARE 1
+#else

 /*
  * Define if your compiler has std::wstring
  */
 /*
  * Define if your compiler has std::wstring
  */


@@ -583,6 +756,8 @@
  * Define if your compiler has compliant std::string::compare
  */
 #undef HAVE_STD_STRING_COMPARE
  * Define if your compiler has compliant std::string::compare
  */
 #undef HAVE_STD_STRING_COMPARE

+#endif
+

 /*
  * Define if your compiler has <hash_map>
  */
 /*
  * Define if your compiler has <hash_map>
  */


@@ -601,87 +776,117 @@
 #undef HAVE_GNU_CXX_HASH_MAP
 
 /*
 #undef HAVE_GNU_CXX_HASH_MAP
 
 /*

- * The built-in regex supports advanced REs in additional to POSIX's basic
- * and extended. Your system regex probably won't support this, and in this
- * case WX_NO_REGEX_ADVANCED should be defined.
+ * Define if your compiler has std::unordered_map

  */
  */

-#undef WX_NO_REGEX_ADVANCED
+#undef HAVE_STD_UNORDERED_MAP
+

 /*
 /*

- * Use SDL for audio (Unix)
+ * Define if your compiler has std::unordered_set

  */
  */

-#define wxUSE_LIBSDL 0
+#undef HAVE_STD_UNORDERED_SET
+

 /*
 /*

- * Use GNOME print for printing under GTK+ 2.0
+ * Define if your compiler has std::tr1::unordered_map

  */
  */

-#define wxUSE_LIBGNOMEPRINT 0
+#undef HAVE_TR1_UNORDERED_MAP
+

 /*
 /*

- * Use iODBC
+ * Define if your compiler has std::tr1::unordered_set

  */
  */

-#define wxUSE_BUILTIN_IODBC 0
+#undef HAVE_TR1_UNORDERED_SET
+

 /*
 /*

- * Use freetype
+ * Define if your compiler has <tr1/type_traits>

  */
  */

-#define wxUSE_FREETYPE 1
+#undef HAVE_TR1_TYPE_TRAITS
+

 /*
 /*

- * Have glibc2
+ * Define if your compiler has <type_traits>

  */
  */

-#define wxHAVE_GLIBC2 0
+#undef HAVE_TYPE_TRAITS
+

 /*
 /*

- * Use libXpm
+ * Define if the compiler supports simple visibility declarations.

  */
  */

-#define wxHAVE_LIB_XPM 1
+#undef HAVE_VISIBILITY
+

 /*
 /*

- * Use consistent PostScript fonts for AFM and printing (!)
+ * Define if the compiler supports GCC's atomic memory access builtins

  */
  */

-#define wxUSE_NORMALIZED_PS_FONTS 1
-
-/* compatibility */
-#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
+#undef HAVE_GCC_ATOMIC_BUILTINS

 
 /*
 
 /*

- * Use OpenGL
+ * Define if compiler's visibility support in libstdc++ is broken

  */
  */

-#define wxUSE_OPENGL 1
+#undef HAVE_BROKEN_LIBSTDCXX_VISIBILITY

 
 /*
 
 /*

- * Set to 1 to compile MS Windows XP theme engine support
+ * The built-in regex supports advanced REs in additional to POSIX's basic
+ * and extended. Your system regex probably won't support this, and in this
+ * case WX_NO_REGEX_ADVANCED should be defined.
+ */
+#undef WX_NO_REGEX_ADVANCED
+/*
+ * On GNU systems use re_search instead of regexec, since the latter does a
+ * strlen on the search text affecting the performance of some operations.

  */
  */

-/* #define wxUSE_UXTHEME 1 */
-
+#undef HAVE_RE_SEARCH
+/*
+ * Use SDL for audio (Unix)
+ */
+#define wxUSE_LIBSDL 0
+/*
+ * Use GTK print for printing under GTK+ 2.0
+ */
+#ifdef VMS_GTK2
+#define wxUSE_GTKPRINT 1
+#else
+#define wxUSE_GTKPRINT 0
+#endif
+/*
+ * Use GNOME print for printing under GTK+ 2.0
+ */
+#define wxUSE_LIBGNOMEPRINT 0
+/*
+ * Use GNOME VFS for MIME types
+ */
+#define wxUSE_LIBGNOMEVFS 0
+/*
+ * Use the Hildon framework
+ */
+#define wxUSE_LIBHILDON 0

 /*
 /*

- *  Set to 1 to auto-adapt to MS Windows XP themes where possible
- * (notably, wxNotebook pages)
+ * Use the Hildon 2.0 framework

  */
  */

-/* #define wxUSE_UXTHEME_AUTO 1*/
+#define wxUSE_LIBHILDON2 0
+
+#define wxUSE_DC_TRANSFORM_MATRIX 1

 
 /*
 
 /*

- * Work around a bug in GNU libc 5.x wcstombs() implementation.
- *
- * Note that you must link your programs with libc.a if you enable this and you
- * have libc 5 (you should enable this for libc6 where wcsrtombs() is
- * thread-safe version of wcstombs()).
+ * Use libXpm

  */
  */

-#define wxUSE_WCSRTOMBS 0
+#define wxHAVE_LIB_XPM 1
+/*
+ * Define if you have pthread_cleanup_push/pop()
+ */
+#define wxHAVE_PTHREAD_CLEANUP 1

 
 /*
 
 /*

- * Use the new experimental implementation of wxString::Printf()?
- *
- * Warning: enabling this may cause internal compiler errors with gcc!
+ * Define if compiler has __thread keyword.

  */
  */

-#define wxUSE_EXPERIMENTAL_PRINTF 0
+#undef HAVE___THREAD_KEYWORD

 
 /*
 
 /*

- * Use wxGetResource & wxWriteResource (change .Xdefaults)
+ * Define if large (64 bit file offsets) files are supported.

  */
  */

-#define wxUSE_X_RESOURCES 1
+#undef HAVE_LARGEFILE_SUPPORT
+

 /*
 /*

- * Use OLE (MSW only)
+ * Use OpenGL

  */
  */

-#define wxUSE_OLE 0
+#define wxUSE_OPENGL 1

 
 /* for compatibility */
 
 /* for compatibility */

-#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
-

 /*
  * Use wxWindows help facility
  */
 /*
  * Use wxWindows help facility
  */


@@ -709,6 +914,11 @@
  */
 #define wxUSE_WEBKIT 1
 
  */
 #define wxUSE_WEBKIT 1
 

+/*
+ * Objective-C class name uniquifying
+ */
+#define wxUSE_OBJC_UNIQUIFYING 0
+

 /*
  * The const keyword is being introduced more in wxWindows.
  * You can use this setting to maintain backward compatibility.
 /*
  * The const keyword is being introduced more in wxWindows.
  * You can use this setting to maintain backward compatibility.


@@ -720,11 +930,16 @@
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #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
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE

- 
+

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

-#define SOCKLEN_T size_t
+#define WX_SOCKLEN_T size_t

 
 /* The type of 5th argument to getsockopt() - usually size_t or int */
 #define SOCKOPTLEN_T size_t
 
 /* The type of 5th argument to getsockopt() - usually size_t or int */
 #define SOCKOPTLEN_T size_t


@@ -733,7 +948,7 @@
 #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 */


@@ -757,23 +972,30 @@
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY
 
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY
 

-/* Define if you have ftime() */
-#define HAVE_FTIME
+/* Define if fsync() is available */
+#define HAVE_FSYNC 1

 
 

-/* Define if you have support for large (64 bit size) files */
-#undef HAVE_LARGEFILE_SUPPORT
+/* Define if round() is available */
+/* #undef HAVE_ROUND */

 
 

-/* Define if you have localtime() */
-#define HAVE_LOCALTIME
+/* Define if you have ftime() */
+#define HAVE_FTIME

 
 /* Define if you have nanosleep() */
 
 /* Define if you have nanosleep() */

+#if __CRTL_VER >= 70320000
+#define HAVE_NANOSLEEP 1
+#else

 #undef HAVE_NANOSLEEP
 #undef HAVE_NANOSLEEP

+#endif

 
 /* Define if you have sched_yield */
 
 /* Define if you have sched_yield */

-#undef HAVE_SCHED_YIELD
+#define HAVE_SCHED_YIELD 1

 
 /* Define if you have pthread_mutexattr_t and functions to work with it */
 
 /* Define if you have pthread_mutexattr_t and functions to work with it */

-#undef HAVE_PTHREAD_MUTEXATTR_T
+#define HAVE_PTHREAD_MUTEXATTR_T 1
+
+/* Define if you have pthread_mutexattr_settype() declaration */
+#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1

 
 /* Define if you have PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
 #undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER
 
 /* Define if you have PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
 #undef HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER


@@ -781,56 +1003,109 @@
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 

-/* Define if you have sigaction() */
-#define HAVE_SIGACTION 1
+/* Define if you have pthread_mutex_timedlock */
+#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK

 
 

-/* Define if you have sigemptyset() */
-#define HAVE_SIGEMPTYSET 1
+/* Define if you have pthread_attr_setstacksize */
+#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1

 
 /* Define if you have the putenv function.  */
 #define HAVE_PUTENV 1
 
 /* Define if you have the setenv function.  */
 
 /* Define if you have the putenv function.  */
 #define HAVE_PUTENV 1
 
 /* Define if you have the setenv function.  */

+#   if __CRTL_VER >= 70000000
+#define HAVE_SETENV 1
+#define HAVE_UNSETENV 1
+#else

 #undef HAVE_SETENV
 #undef HAVE_SETENV

- 
+#endif
+

 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 

+#if __CRTL_VER >= 70312000
+/* Define if you have snprintf() */
+#define HAVE_SNPRINTF 1
+
+/* Define if you have snprintf() declaration in the header */
+#define HAVE_SNPRINTF_DECL 1
+#else
+/* Define if you have snprintf() */
+#undef HAVE_SNPRINTF
+
+/* Define if you have snprintf() declaration in the header */
+#undef HAVE_SNPRINTF_DECL
+#endif
+
+/* Define if you have a snprintf() which supports positional arguments
+   (defined in the unix98 standard) */
+#undef HAVE_UNIX98_PRINTF
+

 /* define if you have statfs function */
 #undef HAVE_STATFS
 
 /* define if you have statfs function */
 #undef HAVE_STATFS
 

+/* define if you have statfs prototype */
+#undef HAVE_STATFS_DECL
+

 /* 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 strtoull() and strtoll() */
+#define HAVE_STRTOULL 1
+

 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 
 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 

-/* Define if you can specify exit functions to a thread */
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-
-/* Define if you have timegm() function */
-#undef HAVE_TIMEGM
+#if __CRTL_VER >= 70312000
+/* Define if you have vsnprintf() */
+#define HAVE_VSNPRINTF 1

 
 

+/* Define if you have vsnprintf() declaration in the header */
+#define HAVE_VSNPRINTF_DECL 1
+#else

 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
 /* Define if you have vsnprintf() declaration in the header */
 #undef HAVE_VSNPRINTF_DECL
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
 /* Define if you have vsnprintf() declaration in the header */
 #undef HAVE_VSNPRINTF_DECL

+#endif
+
+/* Define if you have a _broken_ vsnprintf() declaration in the header,
+ * with 'char*' for the 3rd parameter instead of 'const char*' */
+#undef HAVE_BROKEN_VSNPRINTF_DECL
+
+/* Define if you have vsscanf() */
+#define HAVE_VSSCANF 1
+
+/* Define if you have vsscanf() declaration in the header */
+#define HAVE_VSSCANF_DECL 1

 
 /* 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 HAVE_WCSLEN 1
 

-/* define if you have vsscanf function */
-#undef HAVE_VSSCANF
+/* Define if you have wcsdup function  */
+#undef HAVE_WCSDUP
+
+/* Define if you have wcsftime() function  */
+#define HAVE_WCSFTIME 1

 
 

-/* The number of bytes in a char.  */
-#define SIZEOF_CHAR 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

 
 /* The number of bytes in a wchar_t.  */
 #define SIZEOF_WCHAR_T 4
 
 /* The number of bytes in a wchar_t.  */
 #define SIZEOF_WCHAR_T 4


@@ -859,8 +1134,8 @@
 /* Define if size_t on your machine is the same type as unsigned long. */
 #undef wxSIZE_T_IS_ULONG
 
 /* Define if size_t on your machine is the same type as unsigned long. */
 #undef wxSIZE_T_IS_ULONG
 

-/* Define if you have the dlopen function.  */
-#define HAVE_DLOPEN 1
+/* Define if wchar_t is distinct type in your compiler. */
+#define wxWCHAR_T_IS_REAL_TYPE 1

 
 /* Define if you have the dlerror function.  */
 #define HAVE_DLERROR 1
 
 /* Define if you have the dlerror function.  */
 #define HAVE_DLERROR 1


@@ -871,14 +1146,57 @@
 /* Define if you have BSD flock() function. */
 #undef HAVE_FLOCK
 
 /* Define if you have BSD flock() function. */
 #undef HAVE_FLOCK
 

+/* Define if you have getaddrinfo function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define if you have a gethostbyname_r function taking 6 arguments. */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_6
+
+/* Define if you have a gethostbyname_r function taking 5 arguments. */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_5
+
+/* Define if you have a gethostbyname_r function taking 3 arguments. */
+#undef HAVE_FUNC_GETHOSTBYNAME_R_3
+
+/* Define if you only have a gethostbyname function */
+#define HAVE_GETHOSTBYNAME 1
+

 /* Define if you have the gethostname function.  */
 #define HAVE_GETHOSTNAME 1
 
 /* Define if you have the gethostname function.  */
 #define HAVE_GETHOSTNAME 1
 

+/* Define if you have a getservbyname_r function taking 6 arguments. */
+#undef HAVE_FUNC_GETSERVBYNAME_R_6
+
+/* Define if you have a getservbyname_r function taking 5 arguments. */
+#undef HAVE_FUNC_GETSERVBYNAME_R_5
+
+/* Define if you have a getservbyname_r function taking 4 arguments. */
+#undef HAVE_FUNC_GETSERVBYNAME_R_4
+
+/* Define if you only have a getservbyname function */
+#define HAVE_GETSERVBYNAME 1
+
+/* Define if you have the gmtime_r function.  */
+#if __CRTL_VER >= 70000000 && \
+    (defined _POSIX_C_SOURCE || !defined _ANSI_C_SOURCE)
+#define HAVE_GMTIME_R 1
+#else
+#undef HAVE_GMTIME_R
+#endif
+

 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 
 /* Define if you have the inet_aton function.  */
 /* Define if you have the inet_addr function.  */
 #define HAVE_INET_ADDR 1
 
 /* Define if you have the inet_aton function.  */

-#undef HAVE_INET_ATON
+#define HAVE_INET_ATON 1
+
+/* Define if you have the localtime_r function.  */
+#if __CRTL_VER >= 70000000 && \
+    (defined _POSIX_C_SOURCE || !defined _ANSI_C_SOURCE)
+#define HAVE_LOCALTIME_R 1
+#else
+#undef HAVE_LOCALTIME_R
+#endif

 
 /* Define if you have the mktemp function.  */
 #define HAVE_MKTEMP 1
 
 /* Define if you have the mktemp function.  */
 #define HAVE_MKTEMP 1


@@ -886,20 +1204,12 @@
 /* Define if you have the mkstemp function.  */
 #define HAVE_MKSTEMP 1
 
 /* Define if you have the mkstemp function.  */
 #define HAVE_MKSTEMP 1
 

-/* Define if you have the nanosleep function.  */
-#undef HAVE_NANOSLEEP
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
-
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
-
-/* Define if you have the shl_load function.  */
-#undef HAVE_SHL_LOAD
-

 /* Define if you have strtok_r function. */
 /* Define if you have strtok_r function. */

+#   if __CRTL_VER >= 70301000
+#define HAVE_STRTOK_R 1
+#else

 #undef HAVE_STRTOK_R
 #undef HAVE_STRTOK_R

+#endif

 
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_THR_SETCONCURRENCY
 
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_THR_SETCONCURRENCY


@@ -911,19 +1221,11 @@
 #define HAVE_USLEEP 1
 
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #define HAVE_USLEEP 1
 
 /* Define if you have the <X11/XKBlib.h> header file.  */

+#if __CRTL_VER >= 80200000
+#define HAVE_X11_XKBLIB_H 1
+#else

 #undef HAVE_X11_XKBLIB_H
 #undef HAVE_X11_XKBLIB_H

-
-/* Define if you have the fnmatch() function */
-#undef HAVE_FNMATCH
-
-/* Define if you have the <fnmatch.h> header file.  */
-#undef HAVE_FNMATCH_H
-
-/* Define if you have the <iostream> header file.  */
-#undef HAVE_IOSTREAM
-
-/* Define if you have the <linux/joystick.h> header file.  */
-#undef HAVE_LINUX_JOYSTICK_H
+#endif

 
 /* Define if you have the <sched.h> header file.  */
 #undef HAVE_SCHED_H
 
 /* Define if you have the <sched.h> header file.  */
 #undef HAVE_SCHED_H


@@ -941,7 +1243,14 @@
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wctype.h> header file.  */

+#if __CRTL_VER >= 70312000
+#define HAVE_WCTYPE_H 1
+#else

 #undef HAVE_WCTYPE_H
 #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
 
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1


@@ -964,14 +1273,8 @@
 /* Define if you have wcsrtombs() function */
 #define HAVE_WCSRTOMBS 1
 
 /* Define if you have wcsrtombs() function */
 #define HAVE_WCSRTOMBS 1
 

-/* Define this if you have wputc() */
-#define HAVE_WPUTC 1
-
-/* Define this if you have wputchar() */
-#define HAVE_WPUTCHAR 1
-

 /* Define this if you have putws() */
 /* Define this if you have putws() */

-#define HAVE_PUTWS 1
+#undef HAVE_PUTWS

 
 /* Define this if you have fputws() */
 #define HAVE_FPUTWS 1
 
 /* Define this if you have fputws() */
 #define HAVE_FPUTWS 1


@@ -1009,17 +1312,43 @@
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 

+/* Define if fdopen is available.  */
+#define HAVE_FDOPEN 1
+
+/* Define if sysconf is available. */
+#define HAVE_SYSCONF 1
+
+/* Define if getpwuid_r is available. */
+#undef HAVE_GETPWUID_R
+
+/* Define if getgrgid_r is available. */
+#undef HAVE_GETGRGID_R
+
+/* 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__
 
 /* 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
 

+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
+/* Define if the header pbt.h is missing.  */
+#undef NEED_PBT_H
+

 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*


@@ -1027,8 +1356,6 @@
  *  by configure.
  */
 
  *  by configure.
  */
 

-#include "wx/chkconf.h"
-

 /*
     define some constants identifying wxWindows version in more details t
     just the version number
 /*
     define some constants identifying wxWindows version in more details t
     just the version number


@@ -1040,4 +1367,18 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #define wxHAS_WORKING_GTK_DC_BLIT 1
 
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #define wxHAS_WORKING_GTK_DC_BLIT 1
 

+#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__ */