update from James Bishop

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 0921b8c42950ef32effd889ddacca7406b40532b..aeda52fad2c9610d26e64b429d11fb45c43b6542 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,4 @@
-/* This define (__WX_SETUP_H__) is used both to insure setup.h is included
+/* This define (__WX_SETUP_H__) is used both to ensure setup.h is included

  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__


@@ -39,9 +39,15 @@
 /* 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.  */
+#undef HAVE_SSIZE_T
+

 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 

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

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


@@ -55,38 +61,54 @@
 /* Define this if your version of GTK+ is greater than 1.2.7 */
 #undef __WXGTK127__
 
 /* Define this if your version of GTK+ is greater than 1.2.7 */
 #undef __WXGTK127__
 

-/* Define this if your version of GTK+ is greater than 1.3 */
+/* Define this if your version of GTK+ is greater than 2.0 */

 #undef __WXGTK20__
 
 #undef __WXGTK20__
 

+/* Define this if your version of GTK+ is greater than 2.4 */
+#undef __WXGTK24__
+
+/* 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 to 1 for Unix[-like] system
  */
 #define wxUSE_UNIX 0
 
 #undef __UNIX__
 /*
  * Define to 1 for Unix[-like] system
  */
 #define wxUSE_UNIX 0
 
 #undef __UNIX__

-#undef __LINUX__
-#undef __SGI__
-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
+

 #undef __AIX__
 #undef __AIX__

-#undef __SUN__
-#undef __SOLARIS__
-#undef __SUNOS__
-#undef __ALPHA__
-#undef __IA64__
-#undef __OSF__

 #undef __BSD__
 #undef __BSD__

-#undef __FREEBSD__

 #undef __DARWIN__
 #undef __DARWIN__

+#undef __EMX__
+#undef __FREEBSD__
+#undef __HPUX__
+#undef __LINUX__

 #undef __NETBSD__
 #undef __NETBSD__

-#undef __VMS__
+#undef __OPENBSD__
+#undef __OSF__
+#undef __SGI__
+#undef __SOLARIS__
+#undef __SUN__
+#undef __SUNOS__
+#undef __SVR4__
+#undef __SYSV__

 #undef __ULTRIX__
 #undef __ULTRIX__

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

 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__

+#undef TARGET_CARBON

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


@@ -96,520 +118,500 @@
 #undef __WINDOWS__
 #endif
 
 #undef __WINDOWS__
 #endif
 

+#ifndef __WIN95__

 #undef __WIN95__
 #undef __WIN95__

+#endif

 #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
+/* OS/2 with EMX */
+#undef __OS2__
+
+/* --- start common options --- */
+
+
+#ifndef wxUSE_GUI
+    #define wxUSE_GUI            0

 #endif
 
 #endif
 

-/* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
-#define wxUSE_RICHEDIT 1
+
+#define WXWIN_COMPATIBILITY_2_2 0
+
+#define WXWIN_COMPATIBILITY_2_4 0
+
+#define wxDIALOG_UNIT_COMPATIBILITY   0
+
+
+
+#define wxUSE_DEBUG_CONTEXT 0
+
+#define wxUSE_MEMORY_TRACING 0
+
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
+
+#define wxUSE_DEBUG_NEW_ALWAYS 0
+
+#if defined(_MSC_VER) || \
+    (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
+    #define wxUSE_ON_FATAL_EXCEPTION 0

 #else
 #else

-#define wxUSE_RICHEDIT 0
+    #define wxUSE_ON_FATAL_EXCEPTION 0

 #endif
 
 #endif
 

-/*
- * Supports bool type
- */
-#undef HAVE_BOOL
+#define wxUSE_STACKWALKER 0
+
+
+#ifndef wxUSE_UNICODE
+    #define wxUSE_UNICODE 0
+#endif
+
+#define wxUSE_UNICODE_MSLU 0
+
+#define wxUSE_WCHAR_T 0
+
+
+#define wxUSE_EXCEPTIONS    0
+
+#define wxUSE_EXTENDED_RTTI 0
+
+#define wxUSE_STL 0
+
+#define wxUSE_LOG 0
+
+#define wxUSE_LOGWINDOW 0
+
+#define wxUSE_LOGGUI 0
+
+#define wxUSE_LOG_DIALOG 0
+
+#define wxUSE_CMDLINE_PARSER 0

 
 

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

 #define wxUSE_THREADS 0
 #define wxUSE_THREADS 0

-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0
-/*
- * Use libXpm
- */
-#define wxHAVE_LIB_XPM 0
-/*
- * Use OpenGL
- */
-#define wxUSE_OPENGL 0
-#define wxUSE_GLCANVAS 0

 
 

-/*
- * Use GUI
- */
-#define wxUSE_GUI 0
-/*
- * Don't use GUI (defined to 1 when compiling/using base only)
- */
-#define wxUSE_NOGUI 0
+#define wxUSE_STREAMS       0

 
 

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

 
 

-/*
- * Use wxSingleInstanceChecker class
- */
-#define wxUSE_SNGLINST_CHECKER 0

 
 

-/*
- * Use constraints mechanism
- */
-#define wxUSE_CONSTRAINTS 0
+#define wxUSE_LONGLONG      0

 
 

-/*
- * Use validators
- */
-#define wxUSE_VALIDATORS 0
+#define wxUSE_FILE          0
+#define wxUSE_FFILE         0

 
 

-/*
- * Use wxControl
- */
-#define wxUSE_CONTROLS 0
+#define wxUSE_FSVOLUME      0

 
 

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

 
 

-/*
-   Use wxTipWindow
- */
-#define wxUSE_TIPWINDOW 0
+#define wxUSE_TEXTFILE      0

 
 

-/*
- * Use accelerators
- */
-#define wxUSE_ACCEL 0
+#define wxUSE_INTL          0

 
 

-/*
- * Use wxCalendarCtrl
- */
-#define wxUSE_CALENDARCTRL 0
+#define wxUSE_DATETIME      0

 
 

-/*
- * Use wxFileDialog
- */
-#define wxUSE_FILEDLG 0
+#define wxUSE_TIMER         0

 
 

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

 
 

-/*
- * Use wxFontDialog
- */
-#define wxUSE_FONTDLG 0
+#define wxUSE_CONFIG        0
+
+#define wxUSE_CONFIG_NATIVE   0
+
+#define wxUSE_DIALUP_MANAGER   0
+
+#define wxUSE_DYNLIB_CLASS    0
+
+#define wxUSE_DYNAMIC_LOADER  0
+
+#define wxUSE_SOCKETS       0
+
+#define wxUSE_FILESYSTEM    0
+
+#define wxUSE_FS_ZIP        0
+
+#define wxUSE_FS_INET       0
+
+#define wxUSE_ARCHIVE_STREAMS     0
+
+#define wxUSE_ZIPSTREAM     0
+
+#define wxUSE_ZLIB          0
+
+#define wxUSE_APPLE_IEEE          0
+
+#define wxUSE_JOYSTICK            0
+
+#define wxUSE_FONTMAP 0

 
 

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

 #define wxUSE_MIMETYPE 0
 
 #define wxUSE_MIMETYPE 0
 

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

 #define wxUSE_SYSTEM_OPTIONS 0
 
 #define wxUSE_SYSTEM_OPTIONS 0
 

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

 
 

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

 
 

-/*
- * Use wxTextEntryDialog
- */
-#define wxUSE_TEXTDLG 0
+#define wxUSE_QUICKTIME     0

 
 

-/*
- * Use startup tips
- */
-#define wxUSE_STARTUP_TIPS 0
+#define wxUSE_DIRECTSHOW    0

 
 

-/*
- * Use progress dialog
- */
-#define wxUSE_PROGRESSDLG 0
+#define wxUSE_XRC       0

 
 

-/*
- * Use chooser dialog
- */
-#define wxUSE_CHOICEDLG 0
+#if wxUSE_XRC
+#define wxUSE_XML       0
+#else
+#  define wxUSE_XML       0
+#endif

 
 

-/*
- * Use colour picker dialog
- */
-#define wxUSE_COLOURDLG 0

 
 

-/*
- * Use directory chooser dialog
- */
+#define wxUSE_CONTROLS     0
+
+#define wxUSE_POPUPWIN     0
+
+#define wxUSE_TIPWINDOW    0
+
+#define wxUSE_BUTTON       0
+#define wxUSE_BMPBUTTON    0
+#define wxUSE_CALENDARCTRL 0
+#define wxUSE_CHECKBOX     0
+#define wxUSE_CHECKLISTBOX 0
+#define wxUSE_CHOICE       0
+#define wxUSE_COMBOBOX     0
+#define wxUSE_DATEPICKCTRL 0
+#define wxUSE_GAUGE        0
+#define wxUSE_LISTBOX      0
+#define wxUSE_LISTCTRL     0
+#define wxUSE_RADIOBOX     0
+#define wxUSE_RADIOBTN     0
+#define wxUSE_SCROLLBAR    0
+#define wxUSE_SLIDER       0
+#define wxUSE_SPINBTN      0
+#define wxUSE_SPINCTRL     0
+#define wxUSE_STATBOX      0
+#define wxUSE_STATLINE     0
+#define wxUSE_STATTEXT     0
+#define wxUSE_STATBMP      0
+#define wxUSE_TEXTCTRL     0
+#define wxUSE_TOGGLEBTN    0
+#define wxUSE_TREECTRL     0
+
+#define wxUSE_STATUSBAR    0
+
+#define wxUSE_NATIVE_STATUSBAR        0
+
+#define wxUSE_TOOLBAR 0
+#define wxUSE_TOOLBAR_NATIVE 0
+
+#define wxUSE_NOTEBOOK 0
+
+#define wxUSE_LISTBOOK 0
+
+#define wxUSE_CHOICEBOOK 0
+
+#define wxUSE_TAB_DIALOG    0
+
+#define wxUSE_GRID         0
+
+#define wxUSE_MINIFRAME 0
+
+
+#define wxUSE_ACCEL 0
+
+#define wxUSE_HOTKEY 0
+
+#define wxUSE_CARET         0
+
+#define wxUSE_DISPLAY       0
+
+#define wxUSE_GEOMETRY            0
+
+#define wxUSE_IMAGLIST      0
+
+#define wxUSE_MENUS         0
+
+#define wxUSE_SASH          0
+
+#define wxUSE_SPLITTER      0
+
+#define wxUSE_TOOLTIPS      0
+
+#define wxUSE_VALIDATORS 0
+
+
+#define wxUSE_COMMON_DIALOGS 0
+
+#define wxUSE_BUSYINFO      0
+
+#define wxUSE_CHOICEDLG     0
+
+#define wxUSE_COLOURDLG     0
+

 #define wxUSE_DIRDLG 0
 
 #define wxUSE_DIRDLG 0
 

-/*
- * Use wxDragImage class
- */
+
+#define wxUSE_FILEDLG       0
+
+#define wxUSE_FINDREPLDLG       0
+
+#define wxUSE_FONTDLG       0
+
+#define wxUSE_MSGDLG        0
+
+#define wxUSE_PROGRESSDLG 0
+
+#define wxUSE_STARTUP_TIPS 0
+
+#define wxUSE_TEXTDLG 0
+
+#define wxUSE_NUMBERDLG 0
+
+#define wxUSE_SPLASH 0
+
+#define wxUSE_WIZARDDLG 0
+
+
+#define wxUSE_METAFILE              0
+#define wxUSE_ENH_METAFILE          0
+#define wxUSE_WIN_METAFILES_ALWAYS  0
+
+
+#define wxUSE_MDI 0
+
+#define wxUSE_DOC_VIEW_ARCHITECTURE 0
+
+#define wxUSE_MDI_ARCHITECTURE    0
+
+#define wxUSE_PRINTING_ARCHITECTURE  0
+
+#define wxUSE_HTML          0
+
+#define wxUSE_GLCANVAS       0
+
+
+#define wxUSE_CLIPBOARD     0
+
+#define wxUSE_DATAOBJ       0
+
+#define wxUSE_DRAG_AND_DROP 0
+
+#define wxUSE_ACCESSIBILITY 0
+
+
+#define wxUSE_SNGLINST_CHECKER  0
+

 #define wxUSE_DRAGIMAGE 0
 
 #define wxUSE_DRAGIMAGE 0
 

-/*
- * Use property sheet classes
- */
-#define wxUSE_PROPSHEET 0
+#define wxUSE_IPC         0
+
+#define wxUSE_HELP        0
+
+#define wxUSE_MS_HTML_HELP 0
+
+
+#define wxUSE_WXHTML_HELP 0
+
+#define wxUSE_RESOURCES   0
+
+#define wxUSE_CONSTRAINTS 0
+
+
+#define wxUSE_SPLINES     0
+
+
+#define wxUSE_MOUSEWHEEL        0
+
+
+
+#define wxUSE_POSTSCRIPT  0
+
+#define wxUSE_AFM_FOR_POSTSCRIPT 0
+
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
+
+
+#define wxUSE_ODBC          0
+
+#define wxODBC_FWD_ONLY_CURSORS         0
+
+#define wxODBC_BACKWARD_COMPATABILITY 0
+
+
+#define REMOVE_UNUSED_ARG   0
+
+#define wxUSE_IOSTREAMH     0
+
+
+
+#define wxUSE_IMAGE         0
+
+#define wxUSE_LIBPNG        0
+
+#define wxUSE_LIBJPEG       0
+
+#define wxUSE_LIBTIFF       0
+
+#define wxUSE_GIF           0

 
 

-/*
- * Use wxWizard
- */
-#define wxUSE_WIZARDDLG 0
+#define wxUSE_PNM           0

 
 

-/*
- * Use splash screen
- */
-#define wxUSE_SPLASH 0
+#define wxUSE_PCX           0

 
 

-/*
- * Joystick support (Linux/GTK only)
- */
-#define wxUSE_JOYSTICK 0
+#define wxUSE_IFF           0

 
 

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

 
 

-/*
- * Use wxTextCtrl
- */
-#define wxUSE_TEXTCTRL 0
+#define wxUSE_ICO_CUR       0

 
 

-/*
- * Use wxToollBar
- */
-#define wxUSE_TOOLBAR 0
+#define wxUSE_PALETTE       0

 
 

-/*
- * 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 0
+/* --- end common options --- */

 
 

-/*
- * Use generic wxToolBar instead of/together with the native one?
- */
-#define wxUSE_TOOLBAR_SIMPLE 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

 
 

-#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-  #if wxUSE_TOOLBAR
-    #define wxUSE_BUTTONBAR 1
-  #endif
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#define wxUSE_RICHEDIT 1
+#else
+#define wxUSE_RICHEDIT 0

 #endif
 
 /*
 #endif
 
 /*

- * Use wxTreeLayout class
+ * Supports bool type

  */
  */

-#define wxUSE_TREELAYOUT 0
+#undef HAVE_BOOL

 
 /*
 
 /*

- * Use this control
+ * Define if your compiler supports the explicit keyword

  */
  */

-#define wxUSE_TREECTRL 0
+#undef HAVE_EXPLICIT

 
 /*
 
 /*

- * Use wxLongLong (a.k.a. int64) class
+ * Define if your compiler supports const_cast<>()

  */
  */

-#define wxUSE_LONGLONG 0
+#undef HAVE_CONST_CAST

 
 /*
 
 /*

- * Use geometry classes
+ * Define if your compiler supports reinterpret_cast<>()

  */
  */

-#define wxUSE_GEOMETRY 0
+#undef HAVE_REINTERPRET_CAST

 
 /*
 
 /*

- * Use wxCmdLineParser class
- */
-#define wxUSE_CMDLINE_PARSER 0
-/*
- * Use wxDateTime
- */
-#define wxUSE_DATETIME 0
-/*
- * Use wxFile class
- */
-#define wxUSE_FILE 0
-/*
- * Use wxFFile class
- */
-#define wxUSE_FFILE 0
-/*
- * Use wxTextBuffer class
- */
-#define wxUSE_TEXTBUFFER 0
-/*
- * Use wxTextFile class
+ * Define if your compiler supports static_cast<>()

  */
  */

-#define wxUSE_TEXTFILE 0
+#undef HAVE_STATIC_CAST

 
 /*
 
 /*

- * Use log classes and logging functions
- */
-#define wxUSE_LOG 0
-/*
- * Use log window
- */
-#define wxUSE_LOGWINDOW 0
-/*
- * Use standard GUI logger
+ * Define if your compiler has C99 va_copy

  */
  */

-#define wxUSE_LOGGUI 0
+#undef HAVE_VA_COPY
+

 /*
 /*

- * Use old log dialog instead of new wxLogGui
+ * Define if va_list type is an array

  */
  */

-#define wxUSE_LOG_DIALOG 0
+#undef VA_LIST_IS_ARRAY
+

 /*
 /*

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

  */
  */

-#define wxUSE_STOPWATCH 0
+#undef HAVE_STD_WSTRING

 /*
 /*

- * Use time and date classes
+ * Define if your compiler has compliant std::string::compare

  */
  */

-#define wxUSE_TIMEDATE 0
+#undef HAVE_STD_STRING_COMPARE

 /*
 /*

- * Use wave class
+ * Define if your compiler has <hash_map>

  */
  */

-#define wxUSE_WAVE 0
+#undef HAVE_HASH_MAP

 /*
 /*

- * Use config system
+ * Define if your compiler has <ext/hash_map>

  */
  */

-#define wxUSE_CONFIG 0
+#undef HAVE_EXT_HASH_MAP

 /*
 /*

- * Use font mapping/conversion classes
+ * Define if your compiler has std::hash_map/hash_set

  */
  */

-#define wxUSE_FONTMAP 0
+#undef HAVE_STD_HASH_MAP

 /*
 /*

- * Use intl system
+ * Define if your compiler has __gnu_cxx::hash_map/hash_set

  */
  */

-#define wxUSE_INTL 0
+#undef HAVE_GNU_CXX_HASH_MAP
+

 /*
 /*

- * Use streams
+ * 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_STREAMS 0
+#undef WX_NO_REGEX_ADVANCED

 /*
 /*

- * Use class serialization
+ * Use SDL for audio (Unix)

  */
  */

-#define wxUSE_SERIAL 0
+#define wxUSE_LIBSDL 0

 /*
 /*

- * Use sockets
+ * Use GNOME print for printing under GTK+ 2.0

  */
  */

-#define wxUSE_SOCKETS 0
+#define wxUSE_LIBGNOMEPRINT 0

 /*
 /*

- * Use dialup manager
+ * Use iODBC

  */
  */

-#define wxUSE_DIALUP_MANAGER 0
+#define wxUSE_BUILTIN_IODBC 0

 /*
 /*

- * Use standard C++ streams if 1. If 0, use wxWin
- * streams implementation.
+ * Use freetype

  */
  */

-#define wxUSE_STD_IOSTREAM  0
+#define wxUSE_FREETYPE 0

 /*
 /*

- * wxLibrary class
+ * Have glibc2

  */
  */

-#define wxUSE_DYNLIB_CLASS 0
-
+#define wxHAVE_GLIBC2 0

 /*
 /*

- * Use wxTimer
+ * Use libXpm

  */
  */

-#define wxUSE_TIMER 0
-
+#define wxHAVE_LIB_XPM 0

 /*
 /*

- * Use font metric files in GetTextExtent for wxPostScriptDC

  * Use consistent PostScript fonts for AFM and printing (!)
  */
  * Use consistent PostScript fonts for AFM and printing (!)
  */

-#define wxUSE_AFM_FOR_POSTSCRIPT 0

 #define wxUSE_NORMALIZED_PS_FONTS 0
 
 /* compatibility */
 #define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
 
 /*
 #define wxUSE_NORMALIZED_PS_FONTS 0
 
 /* compatibility */
 #define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
 
 /*

- * Use PostScript device context
- */
-#define wxUSE_POSTSCRIPT 0
-
-/*
- * Compile wxString with some Unicode (wide character) support?
+ * Use OpenGL

  */
  */

-#define wxUSE_WCHAR_T 0
+#define wxUSE_OPENGL 0

 
 /*
 
 /*

- * Compile wxWindows in Unicode mode (Win32 only for now)?
+ * Set to 1 to compile MS Windows XP theme engine support

  */
  */

-#define wxUSE_UNICODE 0
+#define wxUSE_UXTHEME 1

 
 /*
 
 /*

- * Use MS Layer for Unicode on Win9X (Win32 only)?
+ *  Set to 1 to auto-adapt to MS Windows XP themes where possible
+ * (notably, wxNotebook pages)

  */
  */

-#define wxUSE_UNICODE_MSLU 0
+#define wxUSE_UXTHEME_AUTO 1

 
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
 
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.


@@ -627,204 +629,33 @@
  */
 #define wxUSE_EXPERIMENTAL_PRINTF 0
 
  */
 #define wxUSE_EXPERIMENTAL_PRINTF 0
 

-/*
- * Use Interprocess communication
- */
-#define wxUSE_IPC 0

 /*
  * Use wxGetResource & wxWriteResource (change .Xdefaults)
  */
 #define wxUSE_X_RESOURCES 0
 /*
  * Use wxGetResource & wxWriteResource (change .Xdefaults)
  */
 #define wxUSE_X_RESOURCES 0

-/*
- * Use clipboard
- */
-#define wxUSE_CLIPBOARD 0
-/*
- * Use wxDataObject
- */
-#define wxUSE_DATAOBJ 0
-/*
- * Use tooltips
- */
-#define wxUSE_TOOLTIPS 0
-/*
- * Use dnd
- */
-#define wxUSE_DRAG_AND_DROP 0

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

-/*
- * Use spline
- */
-#define wxUSE_SPLINES 0
-/*
- * Use wxLibrary class
- */
-#define wxUSE_DYNLIB_CLASS 0
-
-/*
- * Use the mdi architecture
- */
-#define wxUSE_MDI_ARCHITECTURE 0
-/*
- * Use the document/view architecture
- */
-#define wxUSE_DOC_VIEW_ARCHITECTURE 0
-/*
- * Use the print/preview architecture
- */
-#define wxUSE_PRINTING_ARCHITECTURE 0
-
-/*
- * Use Prolog IO
- */
-#define wxUSE_PROLOGIO 0
-/*
- * Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
- */
-#define wxUSE_RESOURCES 0

 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /*
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
 
 /*

- * Use wxWindows help facility
- */
-#define wxUSE_HELP 0
-/*
- * Use built-in HTML-based help controller
- */
-#define wxUSE_WXHTML_HELP 0
-/*
- * Use MS HTML Help controller (win32)
+ * Use MS HTML Help via libmspack (Unix)

  */
  */

-#define wxUSE_MS_HTML_HELP 0
+#define wxUSE_LIBMSPACK 0

 
 

-/*
- * Use iostream.h rather than iostream
- */
-#define wxUSE_IOSTREAMH 0
-/*
- * Use Apple Ieee-double converter
- */
-#define wxUSE_APPLE_IEEE 0
-/*
- * Compatibility with 2.0 API.
- */
-#define WXWIN_COMPATIBILITY_2 0
-/*
- * Compatibility with 2.2 API
- */
-#define WXWIN_COMPATIBILITY_2_2 0
-/*
- * Enables debugging: memory tracing, assert, etc., contains debug level
- */
-#define WXDEBUG 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.
- */
-#define wxUSE_MEMORY_TRACING 0
-/*
- * Enable debugging version of global memory operators new and delete
- * Disable it, If this causes problems (e.g. link errors)
- */
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-/*
- * VZ: What does this one do? (FIXME)
- */
-#define wxUSE_DEBUG_CONTEXT 0
-/*
- * 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.
- */
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0

 /*
  * Matthews garbage collection (used for MrEd?)
  */
 #define WXGARBAGE_COLLECTION_ON 0
 /*
  * Matthews garbage collection (used for MrEd?)
  */
 #define WXGARBAGE_COLLECTION_ON 0

-/*
- * Use splines
- */
-#define wxUSE_SPLINES 0
-/*
- * wxUSE_DYNAMIC_CLASSES is TRUE for the Xt port
- */
-#define wxUSE_DYNAMIC_CLASSES 1
-
-/*
- * Support for metafiles
- */
-#define wxUSE_METAFILE 0
-#define wxUSE_ENH_METAFILE 0
-
-/*
- * wxMiniFrame
- */
-#define wxUSE_MINIFRAME 0
-
-/*
- * wxHTML
- */
-#define wxUSE_HTML 0
-
-/*
- * (virtual) filesystems code
- */
-#define wxUSE_FILESYSTEM 0
-#define wxUSE_FS_INET 0
-#define wxUSE_FS_ZIP 0
-
-/*
- * A class that shows info window when app is busy
- * (works exactly like wxBusyCursor)
- */
-#define wxUSE_BUSYINFO 0
-
-/*
- * Zip stream for accessing files stored inside .zip archives
- */
-#define wxUSE_ZIPSTREAM 0
-
-/*
- * wxPalette class
- */
-#define wxUSE_PALETTE 0
-
-/*
- * wxImage support
- */
-#define wxUSE_IMAGE 0
-
-/*
- * GIF image format support
- */
-#define wxUSE_GIF 0
-
-/*
- * PCX image format support
- */
-#define wxUSE_PCX 0
-
-/*
- * PNM image format support
- */
-#define wxUSE_PNM 0

 
 /*
 
 /*

- * XPM image format support
+ * wxWebKitCtrl

  */
  */

-#define wxUSE_XPM 0
+#define wxUSE_WEBKIT 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.


@@ -842,6 +673,12 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 

+/* The type of 5th argument to getsockopt() - usually size_t or int */
+#undef SOCKOPTLEN_T
+
+/* The type of statvfs(2) argument */
+#undef WX_STATFS_T
+

 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 
 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 


@@ -852,12 +689,15 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 

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

 
 /* 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() */
 #undef HAVE_DLOPEN
 
 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 


@@ -867,6 +707,9 @@
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 

+/* Define if you have support for large (64 bit size) files */
+#undef HAVE_LARGEFILE_SUPPORT
+

 /* Define if you have localtime() */
 #undef HAVE_LOCALTIME
 
 /* Define if you have localtime() */
 #undef HAVE_LOCALTIME
 


@@ -915,6 +758,9 @@
 /* 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
+

 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 


@@ -933,8 +779,8 @@
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 

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

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


@@ -945,6 +791,9 @@
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 

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

 /* Define if size_t on your machine is the same type as unsigned int. */
 #undef wxSIZE_T_IS_UINT
 
 /* Define if size_t on your machine is the same type as unsigned int. */
 #undef wxSIZE_T_IS_UINT
 


@@ -1002,12 +851,15 @@
 /* Define if you have the usleep function.  */
 #undef HAVE_USLEEP
 
 /* Define if you have the usleep function.  */
 #undef HAVE_USLEEP
 

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

 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 

+/* Define if you have the <X11/extensions/xf86vmode.h> header file.  */
+#undef HAVE_X11_EXTENSIONS_XF86VMODE_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 <fnmatch.h> header file.  */
 #undef HAVE_FNMATCH_H
 


@@ -1020,9 +872,6 @@
 /* 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.  */
-#undef HAVE_STRINGS_H
-

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


@@ -1038,11 +887,11 @@
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCTYPE_H
 
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCTYPE_H
 

-/* Define if you have the <iconv.h> header file.  */
-#undef HAVE_ICONV_H
+/* Define if you have the <iconv.h> header file and iconv() symbol.  */
+#undef HAVE_ICONV

 
 

-/* Test for GLIBC 2.2 iconv() */
-#undef WX_ICONV_TAKES_CHAR
+/* Define as "const" if the declaration of iconv() needs const.  */
+#undef ICONV_CONST

 
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
 
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H


@@ -1050,12 +899,74 @@
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 

+/* 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 a CD-ROM interface known to mmedia.  */
+#undef HAVE_KNOWN_CDROM_INTERFACE
+

 /* Define if you have wcsrtombs() function */
 #undef HAVE_WCSRTOMBS
 
 /* Define if you have wcsrtombs() function */
 #undef HAVE_WCSRTOMBS
 

+/* Define this if you have wputc() */
+#undef HAVE_WPUTC
+
+/* Define this if you have wputchar() */
+#undef HAVE_WPUTCHAR
+
+/* Define this if you have putws() */
+#undef HAVE_PUTWS
+
+/* Define this if you have fputws() */
+#undef HAVE_FPUTWS
+
+/* Define this if you have strcasecmp() function in <string.h> */
+#undef HAVE_STRCASECMP_IN_STRING_H
+
+/* 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 */
+#undef HAVE_WPRINTF
+
+/* Define this if you have wprintf() and related functions */
+#undef HAVE_VSWPRINTF
+
+/* Define this if you have _vsnwprintf */
+#undef HAVE__VSNWPRINTF
+
+/* Define if fseeko and ftello are available.  */
+#undef HAVE_FSEEKO
+

 /* 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 this if you have X11/extensions/shape.h */
+#undef HAVE_XSHAPE
+
+/* 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
+
+/* -------------------------------------------------------------------------
+   Win32 adjustments section
+   ------------------------------------------------------------------------- */
+
+#ifdef __WIN32__
+
+/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibility
+   with wx/msw/setup.h */
+#define wxUSE_XPM_IN_MSW wxUSE_XPM
+
+#endif /* __WIN32__ */

 
 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly
 
 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly