don't assume that __thread is available just because we use g++ 4, it doesn't support...

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 7c14228bc44536235338c88cfbb8d90e58b32a68..7de7bf7acd587b1f43b0958b63e2f5ae59b5f8c9 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 : 12 September 2008                                                  *

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


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


@@ -35,6 +31,9 @@
 /* the installation location prefix from configure */
 #undef wxINSTALL_PREFIX
 
 /* the installation location prefix from configure */
 #undef wxINSTALL_PREFIX
 

+/* Define this to get extra features from GNU libc. */
+#undef _GNU_SOURCE
+

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


@@ -50,8 +49,11 @@
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 #undef size_t
 

+/* Define if ssize_t type is available.  */
+#define HAVE_SSIZE_T 1
+

 /* Define if you have the ANSI C header files.  */
 /* 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


@@ -60,14 +62,39 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 

+/* Define this if you want to use GPE features */
+/* #undef __WXGPE__ */
+
+/* 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__

 /* 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 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 1.3 */
-#undef __WXGTK20__
+/* Define this if your version of GTK+ is greater than 2.0 */
+#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
+
+#include <types.h>
+typedef pid_t GPid;
+
+#define G_GNUC_INTERNAL
+
+#endif
+#endif

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


@@ -75,756 +102,724 @@
 #define wxUSE_UNIX 1
 
 #define __UNIX__
 #define wxUSE_UNIX 1
 
 #define __UNIX__

+
+#undef __AIX__
+#undef __BSD__
+#undef __DARWIN__
+#undef __EMX__
+#undef __FREEBSD__
+#undef __HPUX__

 #undef __LINUX__
 #undef __LINUX__

+#undef __NETBSD__
+#undef __OPENBSD__
+#undef __OSF__

 #undef __SGI__
 #undef __SGI__

-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
-#undef __AIX__
-#undef __SUN__

 #undef __SOLARIS__
 #undef __SOLARIS__

+#undef __SUN__

 #undef __SUNOS__
 #undef __SUNOS__

-#define __ALPHA__
-#undef __IA64__
-#undef __OSF__
-#undef __DARWIN__
-#undef __NETBSD__
-#undef __BSD__
-#undef __FREEBSD__
-#define __VMS__
+#undef __SVR4__
+#undef __SYSV__

 #undef __ULTRIX__
 #undef __ULTRIX__

-#undef __DATA_GENERAL__
-#undef __EMX__
-#undef _GNU_SOURCE
+#undef __UNIXWARE__
+#define __VMS__
+
+#undef __IA64__
+#define __ALPHA__
+
+/* NanoX (with wxX11) */
+#define wxUSE_NANOX 0

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

 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 

-#undef __WIN95__

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

+#ifndef __GNUWIN32__

 #undef __GNUWIN32__
 #undef __GNUWIN32__

+#endif
+#ifndef STRICT

 #undef STRICT
 #undef STRICT

+#endif
+#ifndef WINVER

 #undef WINVER
 #undef WINVER

+#endif

 
 

-/* enable native status bar under Win32 */
-#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
-#define wxUSE_NATIVE_STATUSBAR 1
-#define wxUSE_OWNER_DRAWN 1
+/* --- start common options --- */
+
+
+#ifndef wxUSE_GUI
+    #define wxUSE_GUI            1

 #endif
 
 #endif
 

-/* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
-#define wxUSE_RICHEDIT 1
+
+#define WXWIN_COMPATIBILITY_2_6 1
+
+#define WXWIN_COMPATIBILITY_2_8 1
+
+#define wxDIALOG_UNIT_COMPATIBILITY   1
+
+
+
+#define wxUSE_DEBUG_CONTEXT 0
+
+#define wxUSE_DEBUGREPORT 0
+
+#define wxUSE_MEMORY_TRACING 0
+
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+
+#define wxUSE_DEBUG_NEW_ALWAYS 0
+
+#define wxUSE_ON_FATAL_EXCEPTION 0
+
+#define wxUSE_STACKWALKER 0
+
+
+#ifndef wxUSE_UNICODE
+#if defined( __WXX11__ ) || defined ( __WXMOTIF__ )
+    #define wxUSE_UNICODE 0

 #else
 #else

-#define wxUSE_RICHEDIT 0
+    #define wxUSE_UNICODE 1
+#endif

 #endif
 
 #endif
 

-/*
- * Supports bool type
- */
-#define HAVE_BOOL
+#define wxUSE_WCHAR_T 1
+
+
+#define wxUSE_EXCEPTIONS    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_DIALOG 1
+
+#define wxUSE_CMDLINE_PARSER 1

 
 

-/*
- * Use regex support
- */
-#define wxUSE_REGEX 0
-/*
- * Use zlib
- */
-#define wxUSE_ZLIB 1
-/*
- * Use libpng
- */
-#define wxUSE_LIBPNG 1
-/*
- * Use libjpeg
- */
-#define wxUSE_LIBJPEG 1
-/*
- * Use libtiff
- */
-#define wxUSE_LIBTIFF 1
-/*
- * Use iODBC
- */
-#define wxUSE_ODBC 1
-#define wxODBC_FWD_ONLY_CURSORS 1
-#define wxODBC_BACKWARD_COMPATABILITY 0
-/*
- * Use freetype
- */
-#define wxUSE_FREETYPE 1
-/*
- * Use Threads
- */

 #define wxUSE_THREADS 1
 #define wxUSE_THREADS 1

-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0
-/*
- * Use libXpm
- */
-#define wxHAVE_LIB_XPM 1
-/*
- * Use OpenGL
- */
-#define wxUSE_OPENGL 1
-#define wxUSE_GLCANVAS 1
-/*
- * Use GUI
- */
-#define wxUSE_GUI 1
-/*
- * Don't use GUI (defined to 1 when compiling/using base only)
- */
-#define wxUSE_NOGUI 0

 
 

-/*
- * Catch fatal program exceptions
- */
-#define wxUSE_ON_FATAL_EXCEPTION 0
+#define wxUSE_STREAMS       1

 
 

-/*
- * Use constraints mechanism
- */
-#define wxUSE_CONSTRAINTS 1
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_DEFAULT  0  
+#else
+    #define wxUSE_STD_DEFAULT  0
+#endif

 
 

-/*
- * Use validators
- */
-#define wxUSE_VALIDATORS 1
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT

 
 

-/*
- * Use wxControl
- */
-#define wxUSE_CONTROLS 1
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT

 
 

-/*
- * Use wxPopupWindow (useful in wxUniv only for now)
- */
-#define wxUSE_POPUPWIN 1
+#define wxUSE_PRINTF_POS_PARAMS 0

 
 

-/*
-   Use wxTipWindow
-*/
-#define wxUSE_TIPWINDOW 1
+#define wxUSE_LONGLONG      1

 
 

-/*
- * Use accelerators
- */
-#define wxUSE_ACCEL 1
+#define wxUSE_BASE64        1

 
 

-/*
- * Use wxCalendarCtrl
- */
-#define wxUSE_CALENDARCTRL 1
+#define wxUSE_CONSOLE_EVENTLOOP 1

 
 

-/*
- * Use wxFileDialog
- */
-#define wxUSE_FILEDLG 1
+#define wxUSE_FILE          1
+#define wxUSE_FFILE         1

 
 

-/*
- * Use wxFindReplaceDialog
- */
-#define wxUSE_FINDREPLDLG 0
+#define wxUSE_FSVOLUME      1

 
 

-/*
- * Use wxFontDialog
- */
-#define wxUSE_FONTDLG 1
+#define wxUSE_STDPATHS      1
+
+#define wxUSE_TEXTBUFFER    1
+
+#define wxUSE_TEXTFILE      1
+
+#define wxUSE_INTL          1
+#include <locale.h>
+
+#define wxUSE_XLOCALE 1
+
+#define wxUSE_DATETIME      1
+
+#define wxUSE_TIMER         1
+
+#define wxUSE_STOPWATCH     1
+
+#define wxUSE_CONFIG        1
+
+#define wxUSE_CONFIG_NATIVE   0
+
+#define wxUSE_DIALUP_MANAGER   1
+
+#define wxUSE_DYNLIB_CLASS    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_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
+
+#define wxUSE_JOYSTICK            0
+
+#define wxUSE_FONTENUM 1
+
+#define wxUSE_FONTMAP 1

 
 

-/*
- * Use wxMimeTypesManager and related classes
- */

 #define wxUSE_MIMETYPE 1
 
 #define wxUSE_MIMETYPE 1
 

-/*
- * Use wxSystemOptions
- */
+#define wxUSE_PROTOCOL 1
+
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1
+
+#define wxUSE_URL 1
+
+#define wxUSE_URL_NATIVE 0
+
+#define wxUSE_VARIANT 1
+
+#define wxUSE_REGEX       0
+

 #define wxUSE_SYSTEM_OPTIONS 1
 
 #define wxUSE_SYSTEM_OPTIONS 1
 

-/*
- * Use wxMessageDialog (and wxMessageBox)
- */
-#define wxUSE_MSGDLG 1
+#define wxUSE_SOUND      1

 
 

-/*
- * Use wxNumberEntryDialog
- */
-#define wxUSE_NUMBERDLG 1
+#define wxUSE_MEDIACTRL     1

 
 

-/*
- * Use wxTextEntryDialog
- */
-#define wxUSE_TEXTDLG 1
+#define wxUSE_GSTREAMER     0

 
 

-/*
- * Use startup tips
- */
-#define wxUSE_STARTUP_TIPS 1
+#define wxUSE_XRC       1

 
 

-/*
- * Use progress dialog
- */
-#define wxUSE_PROGRESSDLG 1
+#define wxUSE_XML       wxUSE_XRC

 
 

-/*
- * Use chooser dialog
- */
-#define wxUSE_CHOICEDLG 1
+#define wxUSE_AUI       1

 
 

-/*
- * Use colour picker dialog
- */
-#define wxUSE_COLOURDLG 1
+#define wxUSE_PROPGRID  1
+
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+#define wxUSE_CONTROLS     1
+
+#ifdef __WXMOTIF__
+#define wxUSE_POPUPWIN 0
+#else
+#define wxUSE_POPUPWIN 1
+#endif
+
+#define wxUSE_TIPWINDOW    1
+
+#define wxUSE_STC 1
+
+#define wxUSE_ANIMATIONCTRL 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_DATAVIEWCTRL   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_HYPERLINKCTRL 1
+#define wxUSE_LISTBOX      1
+#define wxUSE_LISTCTRL     1
+#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
+#define wxUSE_STATBOX      1
+#define wxUSE_STATLINE     1
+#define wxUSE_STATTEXT     1
+#define wxUSE_STATBMP      1
+#define wxUSE_TEXTCTRL     1
+#if defined (__WXMOTIF__) || defined( __WXGTK__ )
+#define wxUSE_TOGGLEBTN    1
+#else
+#define wxUSE_TOGGLEBTN    0
+#endif
+#define wxUSE_TREECTRL     1
+
+#define wxUSE_STATUSBAR    1
+
+#define wxUSE_NATIVE_STATUSBAR        0
+
+#define wxUSE_TOOLBAR 1
+#define wxUSE_TOOLBAR_NATIVE 1
+
+#define wxUSE_NOTEBOOK 1
+
+#define wxUSE_LISTBOOK 1
+
+#define wxUSE_CHOICEBOOK 1
+
+#define wxUSE_TREEBOOK 1
+
+#define wxUSE_TOOLBOOK 1
+
+#define wxUSE_TAB_DIALOG    1
+
+#define wxUSE_TASKBARICON 1
+
+#define wxUSE_GRID         1
+
+#define wxUSE_MINIFRAME 1
+
+#define wxUSE_COMBOCTRL 1
+
+#define wxUSE_ODCOMBOBOX 1
+
+#define wxUSE_BITMAPCOMBOBOX 1
+
+#define wxUSE_ACCEL 1
+
+#define wxUSE_HOTKEY 1
+
+#define wxUSE_CARET         1
+
+#define wxUSE_DISPLAY       0
+
+#define wxUSE_GEOMETRY            1
+
+#define wxUSE_IMAGLIST      1
+
+#define wxUSE_MENUS         1
+
+#define wxUSE_NOTIFICATION_MESSAGE 1
+
+#define wxUSE_SASH          1
+
+#define wxUSE_SPLITTER      1
+
+#if defined (__WXMOTIF__) || defined( __WXX11__ )
+#define wxUSE_TOOLTIPS 0
+#else
+#define wxUSE_TOOLTIPS 1
+#endif
+
+#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_BUSYINFO      1
+
+#define wxUSE_CHOICEDLG     1
+
+#define wxUSE_COLOURDLG     1

 
 

-/*
- * Use directory chooser dialog
- */

 #define wxUSE_DIRDLG 1
 
 #define wxUSE_DIRDLG 1
 

-/*
- * Use wxDragImage class
- */
-#define wxUSE_DRAGIMAGE 1

 
 

-/*
- * Use property sheet classes
- */
-#define wxUSE_PROPSHEET 1
+#define wxUSE_FILEDLG       1

 
 

-/*
- * Use wxWizard
- */
-#define wxUSE_WIZARDDLG 1
+#define wxUSE_FINDREPLDLG       1
+
+#define wxUSE_FONTDLG       1
+
+#define wxUSE_MSGDLG        1
+
+#define wxUSE_PROGRESSDLG 1
+
+#define wxUSE_STARTUP_TIPS 1
+
+#define wxUSE_TEXTDLG 1
+
+#define wxUSE_NUMBERDLG 1

 
 

-/*
- * Use splash screen
- */

 #define wxUSE_SPLASH 1
 
 #define wxUSE_SPLASH 1
 

-/*
- * Joystick support (Linux/GTK only)
- */
-#define wxUSE_JOYSTICK 0
+#define wxUSE_WIZARDDLG 1
+
+#define wxUSE_ABOUTDLG 1
+
+#define wxUSE_METAFILE              0
+#define wxUSE_ENH_METAFILE          0
+#define wxUSE_WIN_METAFILES_ALWAYS  0
+
+
+#define wxUSE_MDI 1
+
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+
+#define wxUSE_MDI_ARCHITECTURE    1
+
+#define wxUSE_PRINTING_ARCHITECTURE  1
+
+#define wxUSE_HTML          1
+
+#define wxUSE_GLCANVAS       1
+
+#define wxUSE_RICHTEXT       1
+
+#define wxUSE_CLIPBOARD     1
+
+#define wxUSE_DATAOBJ       1
+
+#ifdef __WXGTK__
+#define wxUSE_DRAG_AND_DROP 1
+#else
+#define wxUSE_DRAG_AND_DROP 0
+#endif
+
+#define wxUSE_ACCESSIBILITY 0
+
+
+#define wxUSE_SNGLINST_CHECKER  1
+
+#define wxUSE_DRAGIMAGE 1
+
+#define wxUSE_IPC         1
+
+#define wxUSE_HELP        1
+
+#define wxUSE_MS_HTML_HELP 0
+
+#define wxUSE_WXHTML_HELP 1
+
+#define wxUSE_CONSTRAINTS 1
+
+
+#define wxUSE_SPLINES     1
+
+
+#define wxUSE_MOUSEWHEEL        1
+
+
+
+#define wxUSE_POSTSCRIPT  1
+
+#define wxUSE_AFM_FOR_POSTSCRIPT 1
+
+#define wxUSE_SVG 1
+
+#define REMOVE_UNUSED_ARG   1
+
+#define wxUSE_IOSTREAMH     1
+
+
+
+#define wxUSE_IMAGE         1
+
+#define wxUSE_LIBPNG        1
+
+#define wxUSE_LIBJPEG       1
+
+#define wxUSE_LIBTIFF       1
+
+#define wxUSE_TGA           1
+
+#define wxUSE_GIF           1
+
+#define wxUSE_PNM           1
+
+#define wxUSE_PCX           1
+
+#define wxUSE_IFF           1
+
+#define wxUSE_XPM           1
+
+#define wxUSE_ICO_CUR       1
+
+#define wxUSE_PALETTE       1
+
+#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
+
+/* --- end common options --- */

 
 /*
 
 /*

- * Use this control
- */
-#define wxUSE_CARET 1
-/*
- * Use this control
- */
-#define wxUSE_BUTTON 1
-/*
- * Use this control
- */
-#define wxUSE_BMPBUTTON 1
-/*
- * Use this control
- */
-#define wxUSE_CHECKBOX 1
-/*
- * Use this control
- */
-#define wxUSE_CHECKLISTBOX 1
-/*
- * Use this control
- */
-#define wxUSE_COMBOBOX 1
-/*
- * Use this control
- */
-#define wxUSE_CHOICE 1
-/*
- * Use this control
- */
-#define wxUSE_GAUGE 1
-/*
- * Use this control
- */
-#define wxUSE_GRID 1
-/*
- * Use this control
- */
-#define wxUSE_NEW_GRID 1
-/*
- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
- */
-#define wxUSE_IMAGLIST 1
-/*
- * Use this control
- */
-#define wxUSE_LISTBOX 1
-/*
- * Use this control
- */
-#define wxUSE_LISTCTRL 1
-/*
- * Use wxPlot class
- */
- #define wxUSE_PLOT 1
-/*
- * Use wxMenuBar, wxMenuItem and wxMenu
- */
-#define wxUSE_MENUS 1
-/*
- * Use this control
- */
-#define wxUSE_NOTEBOOK 1
-/*
- * Use this control
- */
-#define wxUSE_RADIOBOX 1
-/*
- * Use this control
- */
-#define wxUSE_RADIOBTN 1
-/*
- * Use this control
- */
-#define wxUSE_SASH 1
-/*
- * Use this control
- */
-#define wxUSE_SCROLLBAR 1
-/*
- * Use this control
- */
-#define wxUSE_SLIDER 1
-/*
- * Use this control
- */
-#define wxUSE_SPINBTN 1
-/*
- * Use this control
- */
-#define wxUSE_SPINCTRL 1
-/*
- * Use this control
- */
-#define wxUSE_SPLITTER 1
-/*
- * Use this control
- */
-#define wxUSE_STATBMP 1
-/*
- * Use this control
- */
-#define wxUSE_STATBOX 1
-/*
- * Use this control
- */
-#define wxUSE_STATLINE 1
-/*
- * Use this control
- */
-#define wxUSE_STATTEXT 1
-/*
- * Use this control
- */
-#define wxUSE_STATUSBAR 1
-/*
- * Use this control
- */
-#define wxUSE_TOGGLEBTN 1
-/*
- * Use Tab dialog class - obsolete, use wxNotebook instead
- */
-#define wxUSE_TAB_DIALOG 0
-/* compatibility */
-#define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
-/*
- * Use wxTextCtrl
+ * Unix/VMS-specific options

  */
  */

-#define wxUSE_TEXTCTRL 1
+#define wxUSE_SELECT_DISPATCHER 1
+#define wxUSE_EPOLL_DISPATCHER 0
+
+#define wxUSE_UNICODE_UTF8 0
+#define wxUSE_UTF8_LOCALE_ONLY 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

 
 

-/*
- * Use wxToollBar
- */
-#define wxUSE_TOOLBAR 1
+#define wxUSE_DC_CACHEING 1

 
 

-/* If 1, use the native toolbar, otherwise use the generic version
- * (wxToolBarSimple) which may also be use together with the native one.
- */
-#define wxUSE_TOOLBAR_NATIVE 1
+#define wxUSE_WXDIB 0

 
 

-/*
- * Use generic wxToolBar instead of/together with the native one?
- */
-#define wxUSE_TOOLBAR_SIMPLE 1
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0

 
 

-#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-  #if wxUSE_TOOLBAR
-    #define wxUSE_BUTTONBAR 1
-  #endif
-#endif
+#define wxUSE_REGKEY 0

 
 

-/*
- * Use wxTreeLayout class
- */
-#define wxUSE_TREELAYOUT 1
+#define wxUSE_RICHEDIT  0

 
 

-/*
- * Use this control
- */
-#define wxUSE_TREECTRL 1
+#define wxUSE_RICHEDIT2 0

 
 

-/*
- * Use wxLongLong (a.k.a. int64) class
- */
-#define wxUSE_LONGLONG 1
+#define wxUSE_OWNER_DRAWN 0

 
 

-/*
- * Use geometry classes
- */
-#define wxUSE_GEOMETRY 1
+#define wxUSE_TASKBARICON_BALLOONS 0

 
 

-/*
- * Use wxFFile class
- */
-#define wxUSE_FFILE 1
- 
-/*
- * Use wxCmdLineParser class
- */
-#define wxUSE_CMDLINE_PARSER 1
-/*
- * Use wxDateTime
- */
-#define wxUSE_DATETIME 1
-/*
- * Use wxFile class
- */
-#define wxUSE_FILE 1
-/*
- * Use wxTextBuffer class
- */
-#define wxUSE_TEXTBUFFER 1
-/*
- * Use wxTextFile class
- */
-#define wxUSE_TEXTFILE 1
-/*
- * Use log classes and logging functions
- */
-#define wxUSE_LOG 1
-/*
- * Use log window
- */
-#define wxUSE_LOGWINDOW 1
-/*
- * Use standard GUI logger
- */
-#define wxUSE_LOGGUI 1
-/*
- * Use old log dialog instead of new wxLogGui
- */
-#define wxUSE_LOG_DIALOG 0
-/*
- * Use wxStopWatch
- */
-#define wxUSE_STOPWATCH 1
-/*
- * Use time and date classes
- */
-#define wxUSE_TIMEDATE 1
-/*
- * Use wave class
- */
-#define wxUSE_WAVE 1
-/*
- * Use config system
- */
-#define wxUSE_CONFIG 1
-/*
- * Use font mapping/conversion classes
- */
-#define wxUSE_FONTMAP 1
-/*
- * Use intl system
- */
-#define wxUSE_INTL 1
-/*
- * Use streams
- */
-#define wxUSE_STREAMS 1
-/*
- * Use class serialization
- */
-#define wxUSE_SERIAL 1
-/*
- * Use sockets
- */
-#define wxUSE_SOCKETS 1
-/*
- * Use dialup manager
- */
-#define wxUSE_DIALUP_MANAGER 1
-/*
- * Use standard C++ streams if 1. If 0, use wxWin
- * streams implementation.
- */
-#define wxUSE_STD_IOSTREAM 0
-/*
- * wxLibrary class
- */
-#define wxUSE_DYNLIB_CLASS 1
+#define wxUSE_UXTHEME           0

 
 

-/*
- * Use wxTimer
- */
-#define wxUSE_TIMER 1
+#define wxUSE_INKEDIT  0

 
 

-/*
- * Use font metric files in GetTextExtent for wxPostScriptDC
- * Use consistent PostScript fonts for AFM and printing (!)
- */
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-#define wxUSE_NORMALIZED_PS_FONTS 1
+#define wxUSE_INICONF 0

 
 

-/* compatibility */
-#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS

 
 

-/*
- * Use PostScript device context
- */
-#define wxUSE_POSTSCRIPT 1
+#define wxUSE_DATEPICKCTRL_GENERIC 0

 
 

-/*
- * Compile wxString with some Unicode support?
- */
-#define wxUSE_WCHAR_T 0

 
 

-/*
- * Compile wxString in wide character (Unicode) mode?
- */
-#define wxUSE_UNICODE 0
+#define wxUSE_CRASHREPORT 0

 
 

-/*
- * 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()).
- */
-#define wxUSE_WCSRTOMBS 0
+/* --- end MSW options --- */

 
 /*
 
 /*

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

  */
  */

-#define wxUSE_EXPERIMENTAL_PRINTF 0
+#define HAVE_EXPLICIT 1

 
 /*
 
 /*

- * Use Interprocess communication
+ * Define if your compiler has C99 va_copy

  */
  */

-#define wxUSE_IPC 1
+#undef HAVE_VA_COPY
+

 /*
 /*

- * Use wxGetResource & wxWriteResource (change .Xdefaults)
+ * Define if va_list type is an array

  */
  */

-#define wxUSE_X_RESOURCES 1
+#undef VA_LIST_IS_ARRAY
+

 /*
 /*

- * Use clipboard
+ * Define if the compiler supports variadic macros

  */
  */

-#define wxUSE_CLIPBOARD 1
-/*
- * Use wxDataObject
-*/
-#define wxUSE_DATAOBJ 1
+#undef HAVE_VARIADIC_MACROS
+
+#if defined(__NAMESPACE_STD) && !defined(__NAMESPACE_STD_ONLY)

 /*
 /*

- * Use tooltips
+ * Define if your compiler has std::wstring

  */
  */

-#define wxUSE_TOOLTIPS 1
+#define HAVE_STD_WSTRING 1

 /*
 /*

- * Use dnd
+ * Define if your compiler has compliant std::string::compare

  */
  */

-#ifdef __WXGTK__
-#define wxUSE_DRAG_AND_DROP 1
+#define HAVE_STD_STRING_COMPARE 1

 #else
 #else

-#define wxUSE_DRAG_AND_DROP 0
-#endif
-/*
- * Use OLE (MSW only)
-*/
-#define wxUSE_OLE 0

 /*
 /*

- * Use spline
+ * Define if your compiler has std::wstring

  */
  */

-#define wxUSE_SPLINES 1
+/* #unfine HAVE_STD_WSTRING */

 /*
 /*

- * Use wxLibrary class
+ * Define if your compiler has compliant std::string::compare

  */
  */

-#define wxUSE_DYNLIB_CLASS 1
+#undef HAVE_STD_STRING_COMPARE
+#endif

 
 /*
 
 /*

- * Use the mdi architecture
+ * Define if your compiler has <hash_map>

  */
  */

-#define wxUSE_MDI_ARCHITECTURE 1
+#undef HAVE_HASH_MAP

 /*
 /*

- * Use the document/view architecture
+ * Define if your compiler has <ext/hash_map>

  */
  */

-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+#undef HAVE_EXT_HASH_MAP

 /*
 /*

- * Use the print/preview architecture
+ * Define if your compiler has std::hash_map/hash_set

  */
  */

-#define wxUSE_PRINTING_ARCHITECTURE 1
-
+#undef HAVE_STD_HASH_MAP

 /*
 /*

- * Use Prolog IO
+ * Define if your compiler has __gnu_cxx::hash_map/hash_set

  */
  */

-#define wxUSE_PROLOGIO 1
+#undef HAVE_GNU_CXX_HASH_MAP
+

 /*
 /*

- * Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
+ * Define if your compiler has std::unordered_map

  */
  */

-#define wxUSE_RESOURCES 1
-
-/* for compatibility */
-#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
+#undef HAVE_STD_UNORDERED_MAP

 
 /*
 
 /*

- * Use wxWindows help facility (needs wxUSE_IPC 1)
+ * Define if your compiler has std::unordered_set

  */
  */

-#define wxUSE_HELP 1
+#undef HAVE_STD_UNORDERED_SET
+

 /*
 /*

- * Use built-in HTML-based help controller
+ * Define if your compiler has std::tr1::unordered_map

  */
  */

-#define wxUSE_WXHTML_HELP 1
+#undef HAVE_TR1_UNORDERED_MAP

 
 /*
 
 /*

- * Use iostream.h rather than iostream
+ * Define if your compiler has std::tr1::unordered_set

  */
  */

-#define wxUSE_IOSTREAMH 1
+#undef HAVE_TR1_UNORDERED_SET
+

 /*
 /*

- * Use Apple Ieee-double converter
+ * Define if the compiler supports simple visibility declarations.

  */
  */

-#define wxUSE_APPLE_IEEE 0
+#undef HAVE_VISIBILITY

 
 /*
 
 /*

- * Compatibility with 2.0 API.
+ * Define if the compiler supports GCC's atomic memory access builtins

  */
  */

-#define WXWIN_COMPATIBILITY_2 0
+#undef HAVE_GCC_ATOMIC_BUILTINS
+

 /*
 /*

- * Compatibility with 2.2 API
+ * Define if compiler's visibility support in libstdc++ is broken

  */
  */

-#define WXWIN_COMPATIBILITY_2_2 1
+#undef HAVE_BROKEN_LIBSTDCXX_VISIBILITY
+

 /*
 /*

- * Enables debugging: memory tracing, assert, etc., contains debug level
+ * 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 WXDEBUG 0
+#undef WX_NO_REGEX_ADVANCED

 /*
 /*

- * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
- * WARNING: this code may not work with all architectures, especially
- * if alignment is an issue.
+ * 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_MEMORY_TRACING 0
+#undef HAVE_RE_SEARCH

 /*
 /*

- * Enable debugging version of global memory operators new and delete
- * Disable it, If this causes problems (e.g. link errors)
+ * Use SDL for audio (Unix)

  */
  */

-#define wxUSE_DEBUG_NEW_ALWAYS 0
+#define wxUSE_LIBSDL 0

 /*
 /*

- * VZ: What does this one do? (FIXME)
+ * Use GTK print for printing under GTK+ 2.0

  */
  */

-#define wxUSE_DEBUG_CONTEXT 0
+#ifdef VMS_GTK2
+#define wxUSE_GTKPRINT 1
+#else
+#define wxUSE_GTKPRINT 0
+#endif

 /*
 /*

- * In debug mode, causes new to be defined to
- * be WXDEBUG_NEW (see object.h). If this causes
- * problems (e.g. link errors), set this to 0.
+ * Use GNOME print for printing under GTK+ 2.0

  */
  */

-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#define wxUSE_LIBGNOMEPRINT 0

 /*
 /*

- * Matthews garbage collection (used for MrEd?)
+ * Use GNOME VFS for MIME types

  */
  */

-#define WXGARBAGE_COLLECTION_ON 1
+#define wxUSE_LIBGNOMEVFS 0

 /*
 /*

- * Use splines
+ * Use the Hildon framework

  */
  */

-#define wxUSE_SPLINES 1
+#define wxUSE_LIBHILDON 0

 /*
 /*

- * wxUSE_DYNAMIC_CLASSES is TRUE for the Xt port
+ * Have glibc2

  */
  */

-#define wxUSE_DYNAMIC_CLASSES 1
-
+#define wxHAVE_GLIBC2 0

 /*
 /*

- * Support for metafiles
+ * Use libXpm

  */
  */

-#define wxUSE_METAFILE 1
-
+#define wxHAVE_LIB_XPM 1

 /*
 /*

- * wxMiniFrame
+ * Define if you have pthread_cleanup_push/pop()

  */
  */

-#define wxUSE_MINIFRAME 1
+#define wxHAVE_PTHREAD_CLEANUP 1

 
 /*
 
 /*

- * wxHTML
+ * Define if compiler has __thread keyword.

  */
  */

-#define wxUSE_HTML 1
+#undef HAVE___THREAD_KEYWORD

 
 

+/* compatibility */

 /*
 /*

- * (virtual) filesystems code
+ * Use OpenGL

  */
  */

-#define wxUSE_FILESYSTEM 1
-#define wxUSE_FS_INET 1
-#define wxUSE_FS_ZIP 1
+#define wxUSE_OPENGL 1

 
 

+/* for compatibility */

 /*
 /*

- * A class that shows info window when app is busy
- * (works exactly like wxBusyCursor)
+ * Use wxWindows help facility

  */
  */

-#define wxUSE_BUSYINFO 1 
-
+#define wxUSE_HELP 1

 /*
 /*

- * Zip stream for accessing files stored inside .zip archives
+ * Use built-in HTML-based help controller

  */
  */

-#define wxUSE_ZIPSTREAM 1
-
+#define wxUSE_WXHTML_HELP 1

 /*
 /*

- * wxPalette class
+ * Use MS HTML Help controller (win32)

  */
  */

-#define wxUSE_PALETTE 1
-
+#define wxUSE_MS_HTML_HELP 0

 /*
 /*

- * wxImage support
+ * Use MS HTML Help via libmspack (Unix)

  */
  */

-#define wxUSE_IMAGE 1
+#define wxUSE_LIBMSPACK 1

 
 /*
 
 /*

- * GIF image format support
+ * Matthews garbage collection (used for MrEd?)

  */
  */

-#define wxUSE_GIF 1
+#define WXGARBAGE_COLLECTION_ON 1

 
 /*
 
 /*

- * PCX image format support
+ * wxWebKitCtrl

  */
  */

-#define wxUSE_PCX 1
+#define wxUSE_WEBKIT 1

 
 /*
 
 /*

- * PNM image format support
- */
-#define wxUSE_PNM 1
- 
-/*
- * XPM image format support
+ * Objective-C class name uniquifying

  */
  */

-#define wxUSE_XPM 1
+#define wxUSE_OBJC_UNIQUIFYING 0

 
 

-/*
- * Disable this if your compiler can't cope
- * with omission of prototype parameters.
- */
-#define REMOVE_UNUSED_ARG 1

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


@@ -836,97 +831,173 @@
  */
 #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
  
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
  
 /* 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 statvfs(2) argument */
+#undef WX_STATFS_T
+
+/* The signal handler prototype */
+#undef wxTYPE_SA_HANDLER

 
 /* gettimeofday() usually takes 2 arguments, but some really old systems might
  * have only one, in which case define WX_GETTIMEOFDAY_NO_TZ */
 #undef 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 */
 #undef WX_GETTIMEOFDAY_NO_TZ
 

-/* struct tm doesn't always have the tm_gmtoff field, define this if it is
- * present */
+/* struct tm doesn't always have the tm_gmtoff field, define this if it does */

 #define WX_GMTOFF_IN_TM
 
 #define WX_GMTOFF_IN_TM
 

-/* iconv()'s 2nd argument is char ** and not const char ** */
-#define WX_ICONV_TAKES_CHAR 1
+/* Define if you have poll(2) function */
+#define HAVE_POLL 1

 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 

+/* Define if you have __cxa_demangle() in <cxxabi.h> */
+#undef HAVE_CXA_DEMANGLE
+

 /* Define if you have dlopen() */
 #define HAVE_DLOPEN 1
 
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY
 
 /* Define if you have dlopen() */
 #define HAVE_DLOPEN 1
 
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY
 

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

 
 

-/* Define if you have the mktemp function.  */
-#define HAVE_MKTEMP 1
+/* Define if round() is available */
+/* #undef HAVE_ROUND */

 
 

-/* Define if you have the mkstemp function.  */
-#define HAVE_MKSTEMP 1
+/* 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 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_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 strptime() */
 #define HAVE_STRPTIME 1
 /* 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 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() */
 #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 wcslen function  */
 #define HAVE_WCSLEN 1
 
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 
 /* Define if you have wcslen function  */
 #define HAVE_WCSLEN 1
 

-/* define if you have vsscanf function */
-#undef HAVE_VSSCANF
+/* Define if you have wcsdup function  */
+#undef HAVE_WCSDUP

 
 

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


@@ -934,8 +1005,8 @@
 /* The number of bytes in a int.  */
 #define SIZEOF_INT 4
 
 /* The number of bytes in a int.  */
 #define SIZEOF_INT 4
 

-/* The number of bytes in a int *.  */
-#define SIZEOF_INT_P 4
+/* The number of bytes in a pointer.  */
+#define SIZEOF_VOID_P 4

 
 /* The number of bytes in a long.  */
 #define SIZEOF_LONG 4
 
 /* The number of bytes in a long.  */
 #define SIZEOF_LONG 4


@@ -946,35 +1017,91 @@
 /* The number of bytes in a short.  */
 #define SIZEOF_SHORT 2
 
 /* The number of bytes in a short.  */
 #define SIZEOF_SHORT 2
 

+/* The number of bytes in a size_t.  */
+#define SIZEOF_SIZE_T 4
+

 /* Define if size_t on your machine is the same type as unsigned int. */
 #define wxSIZE_T_IS_UINT  1
 
 /* 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 int. */
 #define wxSIZE_T_IS_UINT  1
 
 /* 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
 

+/* Define if you have Posix fnctl() function. */
+#define HAVE_FCNTL 1
+
+/* 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 nanosleep function.  */
-#undef HAVE_NANOSLEEP
+/* 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 shl_load function.  */
-#undef HAVE_SHL_LOAD
+/* Define if you have the mktemp function.  */
+#define HAVE_MKTEMP 1
+
+/* Define if you have the mkstemp function.  */
+#define HAVE_MKSTEMP 1

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


@@ -985,63 +1112,136 @@
 /* Define if you have the usleep function.  */
 #define HAVE_USLEEP 1
 
 /* Define if you have the usleep function.  */
 #define HAVE_USLEEP 1
 

-/* Define if you have the vfork function.  */
-#define HAVE_VFORK 1
-

 /* Define if you have the <X11/XKBlib.h> header file.  */
 /* 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.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
 

-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
-

 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
 
 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1
 

+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+

 /* Define if you have the <wchar.h> header file.  */
 #define HAVE_WCHAR_H 1
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wchar.h> header file.  */
 #define HAVE_WCHAR_H 1
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

-/* Define if you have the <iconv.h> header file.  */
+/* Define if you have the <wctype.h> header file.  */
+#if __CRTL_VER >= 70312000
+#define HAVE_WCTYPE_H 1
+#else
+#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 HAVE_ICONV_H 1
 

+/* Define as "const" if the declaration of iconv() needs const.  */
+#undef ICONV_CONST
+

 /* Define if you have the <langinfo.h> header file.  */
 #define HAVE_LANGINFO_H 1
 
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 
 /* Define if you have the <langinfo.h> header file.  */
 #define HAVE_LANGINFO_H 1
 
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 

-/*
- * Use MS HTML Help controller (win32)
- */
-#define wxUSE_MS_HTML_HELP 0
+/* Define if you have the <esd.h> header file.  */
+/* #undef HAVE_ESD_H */
+
+/* Define if you have the <sys/soundcard.h> header file. */
+/* #undef HAVE_SYS_SOUNDCARD_H */

 
 /* 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 putws() */
+#undef HAVE_PUTWS
+
+/* Define this if you have fputws() */
+#define HAVE_FPUTWS 1
+
+/* Define this if you have strcasecmp() function in <string.h> */
+#define HAVE_STRCASECMP_IN_STRING_H 1
+
+/* Define this if you have strcasecmp() function in <strings.h> */
+#undef HAVE_STRCASECMP_IN_STRINGS_H
+
+/* Define this if you have wprintf() and related functions */
+#define HAVE_WPRINTF 1
+
+/* Define this if you have vswprintf() and related functions */
+#define HAVE_VSWPRINTF 1
+
+/* Define this if you have _vsnwprintf */
+#undef HAVE__VSNWPRINTF
+

 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 

+/* Define if fseeko and ftello are available.  */
+#define HAVE_FSEEKO 1
+
+/* Define this is you have X11/extensions/shape.h */
+#define HAVE_XSHAPE 1
+
+/* Define this if you have type SPBCDATA */
+#undef HAVE_SPBCDATA
+
+/* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
+#undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+
+/* 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
+
+/* ---------------------------------------------------------------------
+   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
+
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
+/* Define if the header pbt.h is missing.  */
+#undef NEED_PBT_H
+
+#endif /* __WIN32__ */
+

 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly
  *  by configure.
  */
 
 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly
  *  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


@@ -1053,4 +1253,8 @@
 /* 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
+
+#define __VMS_BROKEN_TEMPLATES
+

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