Bumping the version number also requires that version.h be modified,

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index bc36f3e78af1a369c7fb29d6aae0334cfb4eee21..07bde38e74f1c9ac765cdb9085f3f9a86153da07 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 : 6 October 2006                                                     *

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


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


@@ -53,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


@@ -69,6 +68,9 @@
 /* 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__
 /* Define this if your version of GTK+ is greater than 1.2 */
 #define __WXGTK12__ 1
 #ifdef __WXGTK__
 /* Define this if your version of GTK+ is greater than 1.2 */
 #define __WXGTK12__ 1


@@ -76,8 +78,22 @@
 /* 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.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.4 */
+#define __WXGTK24__ 1
+
+/* Define this if your version of GTK+ is greater than 2.6 */
+#define __WXGTK26__ 1
+
+#include <types.h>
+typedef pid_t GPid;
+
+#define G_GNUC_INTERNAL
+
+#endif

 #endif
 
 /*
 #endif
 
 /*


@@ -116,6 +132,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__
 


@@ -140,861 +159,629 @@
 #undef WINVER
 #endif
 
 #undef WINVER
 #endif
 

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

 
 

-#if defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1
-#endif

 
 

-/* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
-#define wxUSE_RICHEDIT 1
-#else
-#define wxUSE_RICHEDIT 0
+#ifndef wxUSE_GUI
+    #define wxUSE_GUI            1

 #endif
 
 #endif
 

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

 
 

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

 
 

-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_CONST_CAST 1
+#define WXWIN_COMPATIBILITY_2_6 1

 
 

-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_STATIC_CAST 1
+#define wxDIALOG_UNIT_COMPATIBILITY   1

 
 

-/*
- * Define if your compiler has std::wstring
- */
-/* #unfine HAVE_STD_WSTRING */
-/*
- * Define if your compiler has compliant std::string::compare
- */
-#undef HAVE_STD_STRING_COMPARE
-/*
- * Define if your compiler has <hash_map>
- */
-#undef HAVE_HASH_MAP
-/*
- * Define if your compiler has <ext/hash_map>
- */
-#undef HAVE_EXT_HASH_MAP
-/*
- * Define if your compiler has std::hash_map/hash_set
- */
-#undef HAVE_STD_HASH_MAP
-/*
- * Define if your compiler has __gnu_cxx::hash_map/hash_set
- */
-#undef HAVE_GNU_CXX_HASH_MAP

 
 

-/*
- * use STL for containers and wxString
- */
+
+#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
+    #define wxUSE_UNICODE 0
+#endif
+
+#define wxUSE_WCHAR_T 1
+
+
+#define wxUSE_EXCEPTIONS    0
+
+#define wxUSE_EXTENDED_RTTI 0
+

 #define wxUSE_STL 0
 #define wxUSE_STL 0

-/*
- * Use regex support
- */
-#define wxUSE_REGEX 0
-/*
- * 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
-/*
- * Use XML support
- */
-#define wxUSE_XML 1
-/*
- * 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 SDL for audio (Unix)
- */
-#define wxUSE_LIBSDL 0
-/*
- * Use iODBC
- */
-#define wxUSE_ODBC 1
-#define wxUSE_BUILTIN_IODBC 0
-#define wxODBC_FWD_ONLY_CURSORS 1
-#define wxODBC_BACKWARD_COMPATABILITY 0
-/*
- * Use freetype
- */
-#define wxUSE_FREETYPE 1
-/*
- * Use Threads
- */
+
+#define wxUSE_LOG 1
+
+#define wxUSE_LOGWINDOW 1
+
+#define wxUSE_LOGGUI 1
+
+#define wxUSE_LOG_DIALOG 0
+
+#define wxUSE_CMDLINE_PARSER 1
+

 #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

 
 

-#define wxUSE_BASE 1
-#define __WXBASE__ 1
+#define wxUSE_STREAMS       1

 
 

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

 
 

-/*
- * Use wxSingleInstanceChecker class
- */
-#define wxUSE_SNGLINST_CHECKER 1
+#define wxUSE_STD_STRING  0

 
 

-/*
- * Use constraints mechanism
- */
-#define wxUSE_CONSTRAINTS 1
+#define wxUSE_PRINTF_POS_PARAMS 0

 
 

-/*
- * Use validators
- */
-#define wxUSE_VALIDATORS 1
+#define wxUSE_LONGLONG      1

 
 

-/*
- * Use wxControl
- */
-#define wxUSE_CONTROLS 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_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
+
+#define wxUSE_FILESYSTEM    1
+
+#define wxUSE_FS_ZIP        1
+
+#define wxUSE_FS_INET       1
+
+#define wxUSE_ARCHIVE_STREAMS     1
+
+#define wxUSE_ZIPSTREAM     1
+
+#define wxUSE_ZLIB          1
+
+#define wxUSE_APPLE_IEEE          0
+
+#define wxUSE_JOYSTICK            0
+
+#define wxUSE_FONTMAP 1
+
+#define wxUSE_MIMETYPE 1
+
+#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_SOUND      1
+
+#define wxUSE_MEDIACTRL     1
+
+#define wxUSE_GSTREAMER     0
+
+#define wxUSE_XRC       1
+
+#if wxUSE_XRC
+#define wxUSE_XML       1
+#else
+#  define wxUSE_XML       1
+#endif
+
+#define wxUSE_AUI       1
+
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+#define wxUSE_CONTROLS     1

 
 

-/*
- * Use wxPopupWindow (useful in wxUniv only for now)
- */

 #ifdef __WXMOTIF__
 #define wxUSE_POPUPWIN 0
 #else
 #define wxUSE_POPUPWIN 1
 #endif
 
 #ifdef __WXMOTIF__
 #define wxUSE_POPUPWIN 0
 #else
 #define wxUSE_POPUPWIN 1
 #endif
 

-/*
-   Use wxTipWindow
-*/
-#define wxUSE_TIPWINDOW 1
+#define wxUSE_TIPWINDOW    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_COLOURPICKERCTRL 1
+#define wxUSE_COMBOBOX     1
+#define wxUSE_DATAVIEWCTRL   1
+#define wxUSE_DATEPICKCTRL 1
+#define wxUSE_DIRPICKERCTRL 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_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_GRID         1
+
+#define wxUSE_MINIFRAME 1
+
+#define wxUSE_COMBOCTRL 1
+
+#define wxUSE_ODCOMBOBOX 1
+
+#define wxUSE_BITMAPCOMBOBOX 1

 
 

-/*
- * Use accelerators
- */

 #define wxUSE_ACCEL 1
 
 #define wxUSE_ACCEL 1
 

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

 
 

-/*
- * Use wxFileDialog
- */
-#define wxUSE_FILEDLG 1
+#define wxUSE_CARET         1

 
 

-/*
- * Use wxFindReplaceDialog
- */
-#define wxUSE_FINDREPLDLG 0
+#define wxUSE_DISPLAY       0

 
 

-/*
- * Use wxFontDialog
- */
-#define wxUSE_FONTDLG 1
+#define wxUSE_GEOMETRY            1

 
 

-/*
- * Use wxMimeTypesManager and related classes
- */
-#define wxUSE_MIMETYPE 1
+#define wxUSE_IMAGLIST      1

 
 

-/*
- * Use wxSystemOptions
- */
-#define wxUSE_SYSTEM_OPTIONS 1
+#define wxUSE_MENUS         1

 
 

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

 
 

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

 
 

-/*
- * Use wxTextEntryDialog
- */
-#define wxUSE_TEXTDLG 1
+#if defined (__WXMOTIF__) || defined( __WXX11__ )
+#define wxUSE_TOOLTIPS 0
+#else
+#define wxUSE_TOOLTIPS 1
+#endif

 
 

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

 
 

-/*
- * Use progress dialog
- */
-#define wxUSE_PROGRESSDLG 1

 
 

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

 
 

-/*
- * Use colour picker dialog
- */
-#define wxUSE_COLOURDLG 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

 
 

-/*
- * 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 wxDisplay class
- */
-#define wxUSE_DISPLAY 1

 
 

-/*
- * Use this control
- */
-#define wxUSE_GAUGE 1
-/*
- * Use this control
- */
-#define wxUSE_GRID 1
-/*
- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
- */
-#define wxUSE_NEW_GRID 1
-/*
- * Use wxImageList class
- */
-#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
-#define wxUSE_LISTBOOK 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
- */
-#define wxUSE_TEXTCTRL 1
+#define wxUSE_METAFILE              0
+#define wxUSE_ENH_METAFILE          0
+#define wxUSE_WIN_METAFILES_ALWAYS  0

 
 

-/*
- * Use wxToollBar
- */
-#define wxUSE_TOOLBAR 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_MDI 1

 
 

-/*
- * Use wxTreeLayout class
- */
-#define wxUSE_TREELAYOUT 1
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1

 
 

-/*
- * Use this control
- */
-#define wxUSE_TREECTRL 1
+#define wxUSE_MDI_ARCHITECTURE    1

 
 

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

 
 

-/*
- * Use geometry classes
- */
-#define wxUSE_GEOMETRY 1
+#define wxUSE_HTML          1

 
 

-/*
- * Use wxCmdLineParser class
- */
-#define wxUSE_CMDLINE_PARSER 1
-/*
- * Use wxDateTime
- */
-#define wxUSE_DATETIME 1
-/*
- * Use wxFile class
- */
-#define wxUSE_FILE 1
-/*
- * Use wxFFile class
- */
-#define wxUSE_FFILE 1
-/*
- * Use wxFSVolume class
- */
-#define wxUSE_FSVOLUME 1
+#define wxUSE_GLCANVAS       1

 
 

-/*
- * Use wxTextBuffer class
- */
-#define wxUSE_TEXTBUFFER 1
-/*
- * Use wxTextFile class
- */
-#define wxUSE_TEXTFILE 1
+#define wxUSE_RICHTEXT       1

 
 

-#define wxUSE_EXCEPTIONS 0
+#define wxUSE_CLIPBOARD     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_SOUND 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 wxProtocol and related classes
- */
-#define wxUSE_PROTOCOL 1
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-/*
- * Use streams
- */
-#define wxUSE_STREAMS 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
-/*
- * Use wxObjectLoader
- */
-#define wxUSE_DYNAMIC_LOADER 0
+#define wxUSE_DATAOBJ       1

 
 

-/*
- * Use wxTimer
- */
-#define wxUSE_TIMER 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_WXHTML_HELP 1
+
+#define wxUSE_RESOURCES   1

 
 /*
 
 /*

- * Use font metric files in GetTextExtent for wxPostScriptDC
- * Use consistent PostScript fonts for AFM and printing (!)
+ * Use Prolog IO

  */
  */

+#define wxUSE_PROLOGIO 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_AFM_FOR_POSTSCRIPT 1

-#define wxUSE_NORMALIZED_PS_FONTS 1

 
 

-/* compatibility */
-#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
+#define wxUSE_ODBC          1

 
 

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

 
 

-/*
- * Compile wxString with some Unicode (wide character) support?
- */
-#define wxUSE_WCHAR_T 1
+#define wxODBC_BACKWARD_COMPATABILITY 0
+
+
+#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_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 --- */
+
+/* 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
+#else
+#define wxUSE_OWNER_DRAWN 0
+#endif
+
+/* enable rich edit under Win32 */
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#define wxUSE_RICHEDIT2 1
+#else
+#define wxUSE_RICHEDIT 0
+#define wxUSE_RICHEDIT2 0
+#endif

 
 

-/*
- * Compile wxWindows in Unicode mode?
- */
-#define wxUSE_UNICODE 0
+#define wxUSE_INKEDIT 1

 
 

-/*
- * Use MS Layer for Unicode on Win9X (Win32 only)?
- */

 #define wxUSE_UNICODE_MSLU 0
 
 #define wxUSE_UNICODE_MSLU 0
 

-/*
- * Set to 1 to compile MS Windows XP theme engine support
- */
-/* #define wxUSE_UXTHEME 1 */
+#define wxUSE_DC_CACHEING 1

 
 

-/*
- *  Set to 1 to auto-adapt to MS Windows XP themes where possible
- * (notably, wxNotebook pages)
- */
-/* #define wxUSE_UXTHEME_AUTO 1*/
+#define wxUSE_GADGETS 1

 
 /*
 
 /*

- *  Set to 1 to use mousewheel events on Windows
+ * Supports bool type

  */
  */

-/* #undef wxUSE_MOUSEWHEEL */
+#define HAVE_BOOL

 
 /*
 
 /*

- * Hotkey support (Windows)
+ * Define if your compiler supports the explicit keyword

  */
  */

-/* #define wxUSE_HOTKEY 1 */
+#define HAVE_EXPLICIT 1

 
 /*
 
 /*

- * Use wxURL class
+ * Define if your compiler supports const_cast<>()

  */
  */

-#define wxUSE_URL 1
+#define HAVE_CONST_CAST 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()).
+ * Define if your compiler supports reinterpret_cast<>()

  */
  */

-#define wxUSE_WCSRTOMBS 0
+#define HAVE_REINTERPRET_CAST 1

 
 /*
 
 /*

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

  */
  */

-#define wxUSE_EXPERIMENTAL_PRINTF 0
+#define HAVE_STATIC_CAST 1

 
 /*
 
 /*

- * Use Interprocess communication
- */
-#define wxUSE_IPC 1
-/*
- * Use wxGetResource & wxWriteResource (change .Xdefaults)
- */
-#define wxUSE_X_RESOURCES 1
-/*
- * Use clipboard
- */
-#define wxUSE_CLIPBOARD 1
-/*
- * Use wxDataObject
-*/
-#define wxUSE_DATAOBJ 1
-/*
- * Use tooltips
- */
-#if defined (__WXMOTIF__) || defined( __WXX11__ )
-#define wxUSE_TOOLTIPS 0
-#else
-#define wxUSE_TOOLTIPS 1
-#endif
-/*
- * Use dnd
- */
-#ifdef __WXGTK__
-#define wxUSE_DRAG_AND_DROP 1
-#else
-#define wxUSE_DRAG_AND_DROP 0
-#endif
-/*
- * Use OLE (MSW only)
-*/
-#define wxUSE_OLE 0
-/*
- * Use spline
+ * Define if your compiler has C99 va_copy

  */
  */

-#define wxUSE_SPLINES 1
+#undef HAVE_VA_COPY

 
 /*
 
 /*

- * Use MDI.
+ * Define if va_list type is an array

  */
  */

-#define wxUSE_MDI 1
+#undef VA_LIST_IS_ARRAY
+

 /*
 /*

- * Use the mdi architecture
+ * Define if the compiler supports variadic macros

  */
  */

-#define wxUSE_MDI_ARCHITECTURE 1
+#undef HAVE_VARIADIC_MACROS
+
+#if defined(__NAMESPACE_STD) && !defined(__NAMESPACE_STD_ONLY)

 /*
 /*

- * Use the document/view architecture
+ * Define if your compiler has std::wstring

  */
  */

-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+#define HAVE_STD_WSTRING 1

 /*
 /*

- * Use the print/preview architecture
+ * Define if your compiler has compliant std::string::compare

  */
  */

-#define wxUSE_PRINTING_ARCHITECTURE 1
-
+#define HAVE_STD_STRING_COMPARE 1
+#else

 /*
 /*

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

  */
  */

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

 /*
 /*

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

  */
  */

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

 
 /*
 
 /*

- * Use wxWindows help facility
+ * Define if your compiler has <hash_map>

  */
  */

-#define wxUSE_HELP 1
+#undef HAVE_HASH_MAP

 /*
 /*

- * Use built-in HTML-based help controller
+ * Define if your compiler has <ext/hash_map>

  */
  */

-#define wxUSE_WXHTML_HELP 1
+#undef HAVE_EXT_HASH_MAP

 /*
 /*

- * Use MS HTML Help controller (win32)
+ * Define if your compiler has std::hash_map/hash_set

  */
  */

-#define wxUSE_MS_HTML_HELP 0
+#undef HAVE_STD_HASH_MAP

 /*
 /*

- * Use MS HTML Help via libmspack (Unix)
+ * Define if your compiler has __gnu_cxx::hash_map/hash_set

  */
  */

-#define wxUSE_LIBMSPACK 1
+#undef HAVE_GNU_CXX_HASH_MAP

 
 /*
 
 /*

- * Use iostream.h rather than iostream
+ * 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 wxUSE_IOSTREAMH 1
+#undef WX_NO_REGEX_ADVANCED

 /*
 /*

- * Use Apple Ieee-double converter
+ * 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_APPLE_IEEE 0
-
+#undef HAVE_RE_SEARCH

 /*
 /*

- * Compatibility with 2.2 API
+ * Use SDL for audio (Unix)

  */
  */

-#define WXWIN_COMPATIBILITY_2_2 1
+#define wxUSE_LIBSDL 0

 /*
 /*

- * Compatibility with 2.4 API
+ * Use GNOME print for printing under GTK+ 2.0

  */
  */

-#define WXWIN_COMPATIBILITY_2_4 1
+#define wxUSE_LIBGNOMEPRINT 0

 /*
 /*

- * Enables debugging: memory tracing, assert, etc., contains debug level
+ * Use GNOME VFS for MIME types

  */
  */

-#define WXDEBUG 0
+#define wxUSE_LIBGNOMEVFS 0

 /*
 /*

- * 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.
+ * Use the Hildon framework

  */
  */

-#define wxUSE_MEMORY_TRACING 0
+#define wxUSE_LIBHILDON 0

 /*
 /*

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

  */
  */

-#define wxUSE_DEBUG_NEW_ALWAYS 0
+#define wxUSE_BUILTIN_IODBC 0

 /*
 /*

- * VZ: What does this one do? (FIXME)
+ * Use freetype

  */
  */

-#define wxUSE_DEBUG_CONTEXT 0
+#define wxUSE_FREETYPE 1

 /*
 /*

- * 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.
+ * Have glibc2

  */
  */

-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+#define wxHAVE_GLIBC2 0

 /*
 /*

- * Matthews garbage collection (used for MrEd?)
+ * Use libXpm

  */
  */

-#define WXGARBAGE_COLLECTION_ON 1
+#define wxHAVE_LIB_XPM 1

 /*
 /*

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

  */
  */

-#define wxUSE_SPLINES 1
+#define wxHAVE_PTHREAD_CLEANUP 1

 /*
 /*

- * wxUSE_DYNAMIC_CLASSES is TRUE for the Xt port
+ * Use consistent PostScript fonts for AFM and printing (!)

  */
  */

-#define wxUSE_DYNAMIC_CLASSES 1
+#define wxUSE_NORMALIZED_PS_FONTS 1

 
 

-/*
- * Support for metafiles
- */
-#define wxUSE_METAFILE 1
-#define wxUSE_ENH_METAFILE 1
+/* compatibility */
+#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS

 
 /*
 
 /*

- * wxMiniFrame
+ * Use OpenGL

  */
  */

-#define wxUSE_MINIFRAME 1
+#define wxUSE_OPENGL 1

 
 /*
 
 /*

- * wxHTML
+ * Set to 1 to compile MS Windows XP theme engine support

  */
  */

-#define wxUSE_HTML 1
+/* #define wxUSE_UXTHEME 1 */

 
 /*
 
 /*

- * (virtual) filesystems code
+ *  Set to 1 to auto-adapt to MS Windows XP themes where possible
+ * (notably, wxNotebook pages)

  */
  */

-#define wxUSE_FILESYSTEM 1
-#define wxUSE_FS_INET 1
-#define wxUSE_FS_ZIP 1
+/* #define wxUSE_UXTHEME_AUTO 1*/

 
 /*
 
 /*

- * A class that shows info window when app is busy
- * (works exactly like wxBusyCursor)
+ * 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_BUSYINFO 1 
+#define wxUSE_WCSRTOMBS 0

 
 /*
 
 /*

- * Zip stream for accessing files stored inside .zip archives
+ * Use the new experimental implementation of wxString::Printf()?
+ *
+ * Warning: enabling this may cause internal compiler errors with gcc!

  */
  */

-#define wxUSE_ZIPSTREAM 1
+#define wxUSE_EXPERIMENTAL_PRINTF 0

 
 /*
 
 /*

- * wxPalette class
+ * Use wxGetResource & wxWriteResource (change .Xdefaults)

  */
  */

-#define wxUSE_PALETTE 1
-
+#define wxUSE_X_RESOURCES 1

 /*
 /*

- * wxImage support
+ * Use OLE and OLE Automation (MSW only)

  */
  */

-#define wxUSE_IMAGE 1
+#define wxUSE_OLE 0
+#define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_ACTIVEX 0

 
 

-/*
- * GIF image format support
- */
-#define wxUSE_GIF 1
+/* for compatibility */
+#define wxUSE_WX_RESOURCES wxUSE_RESOURCES

 
 /*
 
 /*

- * PCX image format support
+ * Use wxWindows help facility

  */
  */

-#define wxUSE_PCX 1
-
+#define wxUSE_HELP 1

 /*
 /*

- * IFF image format support
+ * Use built-in HTML-based help controller

  */
  */

-#define wxUSE_IFF 1
-
+#define wxUSE_WXHTML_HELP 1

 /*
 /*

- * PNM image format support
+ * Use MS HTML Help controller (win32)

  */
  */

-#define wxUSE_PNM 1
- 
+#define wxUSE_MS_HTML_HELP 0

 /*
 /*

- * XPM image format support
+ * Use MS HTML Help via libmspack (Unix)

  */
  */

-#define wxUSE_XPM 1
+#define wxUSE_LIBMSPACK 1

 
 /*
 
 /*

- * MS ICO (and CUR,ANI derivatives) image format support (on any platform)
- */
-#define wxUSE_ICO_CUR 1
-
-/* 
- * Set to 1 if for dynamically loadable plugins support 
+ * Matthews garbage collection (used for MrEd?)

  */
  */

-#define wxUSE_PLUGINS 1
+#define WXGARBAGE_COLLECTION_ON 1

 
 /*
 
 /*

- * Disable this if your compiler can't cope
- * with omission of prototype parameters.
+ * wxWebKitCtrl

  */
  */

-#define REMOVE_UNUSED_ARG 1
+#define wxUSE_WEBKIT 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.


@@ -1010,7 +797,10 @@
 #undef WX_TIMEZONE
  
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #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 type of statvfs(2) argument */
 #undef WX_STATFS_T


@@ -1031,12 +821,18 @@
 /* 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 fsync() is available */
+#define HAVE_FSYNC 1
+

 /* Define if you have ftime() */
 #define HAVE_FTIME
 
 /* Define if you have ftime() */
 #define HAVE_FTIME
 


@@ -1047,13 +843,20 @@
 #define HAVE_LOCALTIME
 
 /* Define if you have nanosleep() */
 #define HAVE_LOCALTIME
 
 /* 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


@@ -1061,6 +864,9 @@
 /* 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 pthread_attr_setstacksize */
+#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
+

 /* Define if you have sigaction() */
 #define HAVE_SIGACTION 1
 
 /* Define if you have sigaction() */
 #define HAVE_SIGACTION 1
 


@@ -1070,35 +876,79 @@
 /* Define if you have the putenv function.  */
 #define HAVE_PUTENV 1
 
 /* Define if you have the putenv function.  */
 #define HAVE_PUTENV 1
 

+/* Define if you have the readdir_r function.  */
+#undef HAVE_READDIR_R
+

 /* Define if you have the setenv function.  */
 /* Define if you have the setenv function.  */

+#   if __CRTL_VER >= 70000000
+#define HAVE_SETENV 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 _broken_ snprintf() declaration in the header,
+ * with 'char*' for the 3rd parameter instead of 'const char*' */
+#undef HAVE_BROKEN_SNPRINTF_DECL
+
+/* 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 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 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
 
 /* 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 usleep() */
 #define HAVE_USLEEP 1
 
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1


@@ -1151,14 +1001,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


@@ -1166,20 +1059,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


@@ -1191,13 +1076,25 @@
 #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

+#endif

 
 /* Define if you have the fnmatch() function */
 
 /* Define if you have the fnmatch() function */

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

 #undef HAVE_FNMATCH
 #undef HAVE_FNMATCH

+#endif

 
 /* Define if you have the <fnmatch.h> header file.  */
 
 /* Define if you have the <fnmatch.h> header file.  */

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

 #undef HAVE_FNMATCH_H
 #undef HAVE_FNMATCH_H

+#endif

 
 /* Define if you have the <iostream> header file.  */
 #undef HAVE_IOSTREAM
 
 /* Define if you have the <iostream> header file.  */
 #undef HAVE_IOSTREAM


@@ -1221,7 +1118,11 @@
 #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 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


@@ -1244,8 +1145,17 @@
 /* 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 fputws() and putwc() */
-#define HAVE_FPUTWC 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 HAVE_PUTWS 1
+
+/* 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 <string.h> */
 #define HAVE_STRCASECMP_IN_STRING_H 1


@@ -1256,6 +1166,14 @@
 /* Define this if you have wprintf() and related functions */
 #define HAVE_WPRINTF 1
 
 /* Define this if you have wprintf() and related functions */
 #define HAVE_WPRINTF 1
 

+
+/* Define this if you have swprintf() */
+#define HAVE_SWPRINTF 1
+
+/* Define if you have a _broken_ swprintf() declaration in the header,
+ * without a 'size_t max' parameter as second argument */
+#undef HAVE_BROKEN_SWPRINTF_DECL
+

 /* Define this if you have vswprintf() and related functions */
 #define HAVE_VSWPRINTF 1
 
 /* Define this if you have vswprintf() and related functions */
 #define HAVE_VSWPRINTF 1
 


@@ -1265,6 +1183,24 @@
 /* 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 gtk_icon_size_lookup is missing from the GTK+ headers */
+#undef NEED_GTK_ICON_SIZE_LOOKUP
+
+/* Define if you have Pango xft support */
+#undef HAVE_PANGO_XFT
+

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


@@ -1276,6 +1212,15 @@
       with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
       with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 

+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
+/* Define if the system headers declare the type boolean (which will conflict
+ * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
+#undef HAVE_BOOLEAN
+
+/* Define if the header pbt.h is missing.  */
+#undef NEED_PBT_H
+

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


@@ -1283,8 +1228,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


@@ -1296,10 +1239,6 @@
 /* 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
 

-/* Define this is you have X11/extensions/shape.h */
-#define HAVE_XSHAPE 1
-
-/* Define this if you have type SPBCDATA */
-#undef HAVE_SPBCDATA
+#undef HAVE_SYS_SELECT_H

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