revert memory leak fix, it causes crash

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 8c1291e681b83acc77deae4e6541ad38a3f99aad..3fd5256d51d9d7ca651af2d534b3f2444aa859ea 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -3,10 +3,6 @@
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
 
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
 

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

 /* never undefine inline or const keywords for C++ compilation */
 #ifndef __cplusplus
 
 /* never undefine inline or const keywords for C++ compilation */
 #ifndef __cplusplus
 


@@ -46,7 +42,9 @@
 #undef STDC_HEADERS
 
 /* Define this to get extra features from GNU libc. */
 #undef STDC_HEADERS
 
 /* Define this to get extra features from GNU libc. */

+#ifndef _GNU_SOURCE

 #undef _GNU_SOURCE
 #undef _GNU_SOURCE

+#endif

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


@@ -67,12 +65,18 @@
 /* Define this if your version of GTK+ is greater than 2.4 */
 #undef __WXGTK24__
 
 /* Define this if your version of GTK+ is greater than 2.4 */
 #undef __WXGTK24__
 

+/* Define this if your version of GTK+ is greater than 2.6 */
+#undef __WXGTK26__
+

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

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


@@ -110,6 +114,9 @@
 #undef __POWERPC__
 #undef TARGET_CARBON
 
 #undef __POWERPC__
 #undef TARGET_CARBON
 

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


@@ -139,17 +146,16 @@
 
 /* --- start common options --- */
 
 
 /* --- start common options --- */
 

-

 #ifndef wxUSE_GUI
 #ifndef wxUSE_GUI

-    #define wxUSE_GUI            1
+    #define wxUSE_GUI            0

 #endif
 
 
 #endif
 
 

-#define WXWIN_COMPATIBILITY_2_2 0
+#define WXWIN_COMPATIBILITY_2_4 0

 
 

-#define WXWIN_COMPATIBILITY_2_4 1
+#define WXWIN_COMPATIBILITY_2_6 0

 
 

-#define wxDIALOG_UNIT_COMPATIBILITY   1
+#define wxDIALOG_UNIT_COMPATIBILITY   0

 
 
 
 
 
 


@@ -161,348 +167,400 @@
 
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 
 
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 

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

 
 
 #ifndef wxUSE_UNICODE
     #define wxUSE_UNICODE 0
 #endif
 
 
 
 #ifndef wxUSE_UNICODE
     #define wxUSE_UNICODE 0
 #endif
 

-#define wxUSE_UNICODE_MSLU 0
-
-#define wxUSE_WCHAR_T 1
+#define wxUSE_WCHAR_T 0

 
 
 
 

-#define wxUSE_EXCEPTIONS    1
+#define wxUSE_EXCEPTIONS    0

 
 #define wxUSE_EXTENDED_RTTI 0
 
 
 #define wxUSE_EXTENDED_RTTI 0
 

-#if defined(__BORLANDC__)
-#undef wxUSE_EXTENDED_RTTI
-#define wxUSE_EXTENDED_RTTI 1
-#endif
-

 #define wxUSE_STL 0
 
 #define wxUSE_STL 0
 

-#define wxUSE_LOG 1
+#define wxUSE_LOG 0

 
 

-#define wxUSE_LOGWINDOW 1
+#define wxUSE_LOGWINDOW 0

 
 

-#define wxUSE_LOGGUI 1
+#define wxUSE_LOGGUI 0

 
 

-#define wxUSE_LOG_DIALOG 1
+#define wxUSE_LOG_DIALOG 0

 
 

-#define wxUSE_CMDLINE_PARSER 1
+#define wxUSE_CMDLINE_PARSER 0

 
 

-#define wxUSE_THREADS 1
+#define wxUSE_THREADS 0

 
 

-#define wxUSE_STREAMS       1
+#define wxUSE_STREAMS       0

 
 #define wxUSE_STD_IOSTREAM  0
 
 
 #define wxUSE_STD_IOSTREAM  0
 

+#define wxUSE_STD_STRING  0
+
+#define wxUSE_PRINTF_POS_PARAMS      0
+
+
+#define wxUSE_LONGLONG      0
+
+#define wxUSE_FILE          0
+#define wxUSE_FFILE         0
+
+#define wxUSE_FSVOLUME      0
+
+#define wxUSE_STDPATHS      0

 
 

-#define wxUSE_LONGLONG      1
+#define wxUSE_TEXTBUFFER    0

 
 

-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
+#define wxUSE_TEXTFILE      0

 
 

-#define wxUSE_FSVOLUME      1
+#define wxUSE_INTL          0

 
 

-#define wxUSE_TEXTBUFFER    1
+#define wxUSE_DATETIME      0

 
 

-#define wxUSE_TEXTFILE      1
+#define wxUSE_TIMER         0

 
 

-#define wxUSE_INTL          1
+#define wxUSE_STOPWATCH     0

 
 

-#define wxUSE_DATETIME      1
+#define wxUSE_CONFIG        0

 
 

-#define wxUSE_TIMER         1
+#define wxUSE_CONFIG_NATIVE   0

 
 

-#define wxUSE_STOPWATCH     1
+#define wxUSE_DIALUP_MANAGER   0

 
 

-#define wxUSE_CONFIG        1
+#define wxUSE_DYNLIB_CLASS    0

 
 

-#define wxUSE_CONFIG_NATIVE   1
+#define wxUSE_DYNAMIC_LOADER  0

 
 

-#define wxUSE_DIALUP_MANAGER   1
+#define wxUSE_SOCKETS       0

 
 

-#define wxUSE_DYNLIB_CLASS    1
+#define wxUSE_FILESYSTEM    0

 
 

-#define wxUSE_DYNAMIC_LOADER  1
+#define wxUSE_FS_ZIP        0

 
 

-#define wxUSE_SOCKETS       1
+#define wxUSE_FS_ARCHIVE    0

 
 

-#define wxUSE_FILESYSTEM    1
+#define wxUSE_FS_INET       0

 
 

-#define wxUSE_FS_ZIP        1
+#define wxUSE_ARCHIVE_STREAMS     0

 
 

-#define wxUSE_FS_INET       1
+#define wxUSE_ZIPSTREAM     0

 
 

-#define wxUSE_ZIPSTREAM     1
+#define wxUSE_TARSTREAM     0

 
 

-#define wxUSE_ZLIB          1
+#define wxUSE_ZLIB          0

 
 

-#define wxUSE_APPLE_IEEE          1
+#define wxUSE_APPLE_IEEE          0

 
 

-#define wxUSE_JOYSTICK            1
+#define wxUSE_JOYSTICK            0

 
 

-#define wxUSE_FONTMAP 1
+#define wxUSE_FONTMAP 0

 
 

-#define wxUSE_MIMETYPE 1
+#define wxUSE_MIMETYPE 0

 
 

-#define wxUSE_PROTOCOL 1
+#define wxUSE_PROTOCOL 0

 
 

-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
+#define wxUSE_PROTOCOL_FILE 0
+#define wxUSE_PROTOCOL_FTP 0
+#define wxUSE_PROTOCOL_HTTP 0

 
 

-#define wxUSE_URL 1
+#define wxUSE_URL 0

 
 #define wxUSE_URL_NATIVE 0
 
 
 #define wxUSE_URL_NATIVE 0
 

-#define wxUSE_REGEX       1
+#define wxUSE_VARIANT 0

 
 

-#define wxUSE_SYSTEM_OPTIONS 1
+#define wxUSE_REGEX       0

 
 

-#define wxUSE_SOUND      1
+#define wxUSE_SYSTEM_OPTIONS 0

 
 

-#define wxUSE_MEDIACTRL     1
+#define wxUSE_SOUND      0

 
 

-#define wxUSE_QUICKTIME     0
+#define wxUSE_MEDIACTRL     0

 
 

-#define wxUSE_DIRECTSHOW    0
+#define wxUSE_GSTREAMER    0

 
 

-#define wxUSE_XRC       1
+#define wxUSE_XRC       0

 
 #if wxUSE_XRC
 
 #if wxUSE_XRC

-#  define wxUSE_XML       1
+#define wxUSE_XML       0

 #else
 #  define wxUSE_XML       0
 #endif
 
 #else
 #  define wxUSE_XML       0
 #endif
 

+#define wxUSE_AUI       0

 
 

-#define wxUSE_CONTROLS     1

 
 

-#define wxUSE_POPUPWIN     1
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+
+#define wxUSE_CONTROLS     0
+
+#define wxUSE_POPUPWIN     0

 
 

-#define wxUSE_TIPWINDOW    1
+#define wxUSE_TIPWINDOW    0

 
 

-#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_COMBOBOX     1
-#define wxUSE_DATEPICKCTRL 1
-#define wxUSE_GAUGE        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
-#define wxUSE_TOGGLEBTN    1
-#define wxUSE_TREECTRL     1
+#define wxUSE_ANIMATIONCTRL 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_COLLPANE      0
+#define wxUSE_COLOURPICKERCTRL 0
+#define wxUSE_COMBOBOX      0
+#define wxUSE_DATAVIEWCTRL  0
+#define wxUSE_DATEPICKCTRL  0
+#define wxUSE_DIRPICKERCTRL 0
+#define wxUSE_FILEPICKERCTRL 0
+#define wxUSE_FONTPICKERCTRL 0
+#define wxUSE_GAUGE         0
+#define wxUSE_HYPERLINKCTRL 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    1
+#define wxUSE_STATUSBAR    0

 
 

-#define wxUSE_NATIVE_STATUSBAR        1
+#define wxUSE_NATIVE_STATUSBAR        0

 
 

-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
+#define wxUSE_TOOLBAR 0
+#define wxUSE_TOOLBAR_NATIVE 0

 
 

-#define wxUSE_NOTEBOOK 1
+#define wxUSE_NOTEBOOK 0

 
 

-#define wxUSE_LISTBOOK 1
+#define wxUSE_LISTBOOK 0

 
 

-#define wxUSE_CHOICEBOOK 1
+#define wxUSE_CHOICEBOOK 0
+
+#define wxUSE_TREEBOOK 0
+
+#define wxUSE_TOOLBOOK 0

 
 #define wxUSE_TAB_DIALOG    0
 
 
 #define wxUSE_TAB_DIALOG    0
 

-#define wxUSE_GRID         1
+#define wxUSE_GRID         0
+
+#define wxUSE_MINIFRAME 0

 
 

+#define wxUSE_COMBOCTRL 0

 
 

-#define wxUSE_ACCEL 1
+#define wxUSE_ODCOMBOBOX 0

 
 

-#define wxUSE_HOTKEY 1
+#define wxUSE_BITMAPCOMBOBOX 0

 
 

-#define wxUSE_CARET         1
+
+#define wxUSE_ACCEL 0
+
+#define wxUSE_HOTKEY 0
+
+#define wxUSE_CARET         0

 
 #define wxUSE_DISPLAY       0
 
 
 #define wxUSE_DISPLAY       0
 

-#define wxUSE_GEOMETRY            1
+#define wxUSE_GEOMETRY            0
+
+#define wxUSE_IMAGLIST      0

 
 

-#define wxUSE_IMAGLIST      1
+#define wxUSE_MENUS         0

 
 

-#define wxUSE_MENUS         1
+#define wxUSE_SASH          0

 
 

-#define wxUSE_SASH          1
+#define wxUSE_SPLITTER      0

 
 

-#define wxUSE_SPLITTER      1
+#define wxUSE_TOOLTIPS      0

 
 

-#define wxUSE_TOOLTIPS      1
+#define wxUSE_VALIDATORS 0

 
 

-#define wxUSE_VALIDATORS 1

 
 

+#define wxUSE_COMMON_DIALOGS 0

 
 

-#define wxUSE_COMMON_DIALOGS 1
+#define wxUSE_BUSYINFO      0

 
 

-#define wxUSE_BUSYINFO      1
+#define wxUSE_CHOICEDLG     0

 
 

-#define wxUSE_CHOICEDLG     1
+#define wxUSE_COLOURDLG     0

 
 

-#define wxUSE_COLOURDLG     1
+#define wxUSE_DIRDLG 0

 
 

-#define wxUSE_DIRDLG 1

 
 

+#define wxUSE_FILEDLG       0

 
 

-#define wxUSE_FILEDLG       1
+#define wxUSE_FINDREPLDLG       0

 
 

-#define wxUSE_FINDREPLDLG       1
+#define wxUSE_FONTDLG       0

 
 

-#define wxUSE_FONTDLG       1
+#define wxUSE_MSGDLG        0

 
 

-#define wxUSE_MSGDLG        1
+#define wxUSE_PROGRESSDLG 0

 
 

-#define wxUSE_PROGRESSDLG 1
+#define wxUSE_STARTUP_TIPS 0

 
 

-#define wxUSE_STARTUP_TIPS 1
+#define wxUSE_TEXTDLG 0

 
 

-#define wxUSE_TEXTDLG 1
+#define wxUSE_NUMBERDLG 0

 
 

-#define wxUSE_NUMBERDLG 1
+#define wxUSE_SPLASH 0

 
 

-#define wxUSE_SPLASH 1
+#define wxUSE_WIZARDDLG 0

 
 

-#define wxUSE_WIZARDDLG 1
+#define wxUSE_ABOUTDLG 0

 
 
 
 

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

 #define wxUSE_WIN_METAFILES_ALWAYS  0
 
 
 #define wxUSE_WIN_METAFILES_ALWAYS  0
 
 

-#define wxUSE_MDI 1
+#define wxUSE_MDI 0

 
 

-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+#define wxUSE_DOC_VIEW_ARCHITECTURE 0

 
 

-#define wxUSE_MDI_ARCHITECTURE    1
+#define wxUSE_MDI_ARCHITECTURE    0

 
 

-#define wxUSE_PRINTING_ARCHITECTURE  1
+#define wxUSE_PRINTING_ARCHITECTURE  0

 
 

-#define wxUSE_HTML          1
+#define wxUSE_HTML          0

 
 #define wxUSE_GLCANVAS       0
 
 
 #define wxUSE_GLCANVAS       0
 

+#define wxUSE_RICHTEXT       0

 
 

-#define wxUSE_CLIPBOARD     1

 
 

-#define wxUSE_DATAOBJ       1
+#define wxUSE_CLIPBOARD     0

 
 

-#define wxUSE_DRAG_AND_DROP 1
+#define wxUSE_DATAOBJ       0
+
+#define wxUSE_DRAG_AND_DROP 0

 
 #define wxUSE_ACCESSIBILITY 0
 
 
 
 #define wxUSE_ACCESSIBILITY 0
 
 

-#define wxUSE_SNGLINST_CHECKER  1
+#define wxUSE_SNGLINST_CHECKER  0
+
+#define wxUSE_DRAGIMAGE 0

 
 

-#define wxUSE_DRAGIMAGE 1
+#define wxUSE_IPC         0

 
 

-#define wxUSE_IPC         1
+#define wxUSE_HELP        0

 
 

-#define wxUSE_HELP        1

 
 

-#define wxUSE_MS_HTML_HELP 1
+#define wxUSE_MS_HTML_HELP 0

 
 
 
 

-#define wxUSE_WXHTML_HELP 1
+#define wxUSE_WXHTML_HELP 0

 
 #define wxUSE_RESOURCES   0
 
 
 #define wxUSE_RESOURCES   0
 

-#define wxUSE_CONSTRAINTS 1
+#define wxUSE_CONSTRAINTS 0

 
 
 
 

-#define wxUSE_SPLINES     1
+#define wxUSE_SPLINES     0

 
 
 
 

-#define wxUSE_MOUSEWHEEL        1
+#define wxUSE_MOUSEWHEEL        0

 
 
 
 #define wxUSE_POSTSCRIPT  0
 
 
 
 
 #define wxUSE_POSTSCRIPT  0
 

-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+#define wxUSE_AFM_FOR_POSTSCRIPT 0

 
 
 #define wxUSE_ODBC          0
 
 
 
 #define wxUSE_ODBC          0
 

-#define wxODBC_FWD_ONLY_CURSORS         1
+#define wxODBC_FWD_ONLY_CURSORS         0

 
 #define wxODBC_BACKWARD_COMPATABILITY 0
 
 
 
 #define wxODBC_BACKWARD_COMPATABILITY 0
 
 

-#define REMOVE_UNUSED_ARG   1
+#define REMOVE_UNUSED_ARG   0

 
 

-#define wxUSE_IOSTREAMH     1
+#define wxUSE_IOSTREAMH     0

 
 
 
 
 
 

-#define wxUSE_IMAGE         1
+#define wxUSE_IMAGE         0

 
 

-#define wxUSE_LIBPNG        1
+#define wxUSE_LIBPNG        0

 
 

-#define wxUSE_LIBJPEG       1
+#define wxUSE_LIBJPEG       0

 
 

-#define wxUSE_LIBTIFF       1
+#define wxUSE_LIBTIFF       0

 
 

-#define wxUSE_GIF           1
+#define wxUSE_TGA           0

 
 

-#define wxUSE_PNM           1
+#define wxUSE_GIF           0

 
 

-#define wxUSE_PCX           1
+#define wxUSE_PNM           0
+
+#define wxUSE_PCX           0

 
 #define wxUSE_IFF           0
 
 
 #define wxUSE_IFF           0
 

-#define wxUSE_XPM           1
+#define wxUSE_XPM           0

 
 

-#define wxUSE_ICO_CUR       1
+#define wxUSE_ICO_CUR       0

 
 

-#define wxUSE_PALETTE       1
+#define wxUSE_PALETTE       0

 
 

-/* --- end common options --- */

 
 

-/* enable native status bar under Win32 */
-#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
-#define wxUSE_NATIVE_STATUSBAR 1
-#define wxUSE_OWNER_DRAWN 1
-#endif
+#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

 
 

-#if defined(__WXPM__)
+
+/* --- 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
 #define wxUSE_OWNER_DRAWN 1

+#else
+#define wxUSE_OWNER_DRAWN 0

 #endif
 
 #endif
 

-/* enable rich edit under Win32 */

 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1

+#define wxUSE_RICHEDIT2 1

 #else
 #define wxUSE_RICHEDIT 0
 #else
 #define wxUSE_RICHEDIT 0

+#define wxUSE_RICHEDIT2 0

 #endif
 
 #endif
 

+#define wxUSE_INKEDIT 0
+
+#define wxUSE_UNICODE_MSLU 0
+
+#define wxUSE_DC_CACHEING 0
+
+#define wxUSE_GADGETS 0
+

 /*
  * Supports bool type
  */
 /*
  * Supports bool type
  */


@@ -538,6 +596,11 @@
  */
 #undef VA_LIST_IS_ARRAY
 
  */
 #undef VA_LIST_IS_ARRAY
 

+/*
+ * Define if the compiler supports variadic macros
+ */
+#undef HAVE_VARIADIC_MACROS
+

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


@@ -570,17 +633,32 @@
  */
 #undef WX_NO_REGEX_ADVANCED
 /*
  */
 #undef WX_NO_REGEX_ADVANCED
 /*

- * Use XML support
+ * 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_XML 0
+#undef HAVE_RE_SEARCH

 /*
  * Use SDL for audio (Unix)
  */
 #define wxUSE_LIBSDL 0
 /*
  * Use SDL for audio (Unix)
  */
 #define wxUSE_LIBSDL 0

+
+/*
+ * Compile sound backends as plugins
+ */
+#define wxUSE_PLUGINS 0
+

 /*
  * Use GNOME print for printing under GTK+ 2.0
  */
 #define wxUSE_LIBGNOMEPRINT 0
 /*
  * Use GNOME print for printing under GTK+ 2.0
  */
 #define wxUSE_LIBGNOMEPRINT 0

+/*
+ * Use GNOME VFS for MIME types
+ */
+#define wxUSE_LIBGNOMEVFS 0
+/*
+ * Use the Hildon framework
+ */
+#define wxUSE_LIBHILDON 0

 /*
  * Use iODBC
  */
 /*
  * Use iODBC
  */


@@ -598,10 +676,12 @@
  */
 #define wxHAVE_LIB_XPM 0
 /*
  */
 #define wxHAVE_LIB_XPM 0
 /*

- * Use font metric files in GetTextExtent for wxPostScriptDC
+ * Define if you have pthread_cleanup_push/pop()
+ */
+#undef wxHAVE_PTHREAD_CLEANUP
+/*

  * 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 wxUSE_NORMALIZED_PS_FONTS 0
 
 /* compatibility */


@@ -612,11 +692,6 @@
  */
 #define wxUSE_OPENGL 0
 
  */
 #define wxUSE_OPENGL 0
 

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

 /*
  * Set to 1 to compile MS Windows XP theme engine support
  */
 /*
  * Set to 1 to compile MS Windows XP theme engine support
  */


@@ -649,9 +724,11 @@
  */
 #define wxUSE_X_RESOURCES 0
 /*
  */
 #define wxUSE_X_RESOURCES 0
 /*

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

  */
 #define wxUSE_OLE 0
  */
 #define wxUSE_OLE 0

+#define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_ACTIVEX 0

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


@@ -682,11 +759,17 @@
  */
 #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 */

-#undef SOCKLEN_T
+#undef WX_SOCKLEN_T

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


@@ -710,12 +793,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() */
 #undef HAVE_DLOPEN
 
 /* Define if you have gettimeofday() */
 #undef HAVE_GETTIMEOFDAY
 
 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 
 /* Define if you have gettimeofday() */
 #undef HAVE_GETTIMEOFDAY
 

+/* Define if fsync() is available */
+#undef HAVE_FSYNC
+

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


@@ -734,12 +823,18 @@
 /* Define if you have pthread_mutexattr_t and functions to work with it */
 #undef HAVE_PTHREAD_MUTEXATTR_T
 
 /* Define if you have pthread_mutexattr_t and functions to work with it */
 #undef HAVE_PTHREAD_MUTEXATTR_T
 

+/* Define if you have pthread_mutexattr_settype() declaration */
+#undef HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL
+

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

+/* Define if you have pthread_attr_setstacksize */
+#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
+

 /* Define if you have sigaction() */
 #undef HAVE_SIGACTION
 
 /* Define if you have sigaction() */
 #undef HAVE_SIGACTION
 


@@ -749,21 +844,41 @@
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 

+/* Define if you have snprintf() */
+#undef HAVE_SNPRINTF
+
+/* Define if you have snprintf() declaration in the header */
+#undef HAVE_SNPRINTF_DECL
+
+/* 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() */
 #undef HAVE_STRPTIME
 
 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 
 /* Define if you have strptime() */
 #undef HAVE_STRPTIME
 

+/* Define if strptime() is declared in headers */
+#undef HAVE_STRPTIME_DECL
+
+/* Define if you have strtoull() and strtoll() */
+#undef HAVE_STRTOULL
+

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

-/* Define if you can specify exit functions to a thread */
-#undef HAVE_THREAD_CLEANUP_FUNCTIONS
-

 /* Define if you have timegm() function */
 #undef HAVE_TIMEGM
 
 /* Define if you have timegm() function */
 #undef HAVE_TIMEGM
 


@@ -773,12 +888,19 @@
 /* Define if you have vsnprintf() declaration in the header */
 #undef HAVE_VSNPRINTF_DECL
 
 /* Define if you have vsnprintf() declaration in the header */
 #undef HAVE_VSNPRINTF_DECL
 

+/* 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() */
 #undef HAVE_USLEEP
 
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 

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

 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 


@@ -824,15 +946,48 @@
 /* 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. */
+#undef HAVE_GETADDRINFO
+
+/* 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 */
+#undef HAVE_GETHOSTBYNAME
+

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

+/* 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 */
+#undef HAVE_GETSERVBYNAME
+
+/* Define if you have the gmtime_r function.  */
+#undef HAVE_GMTIME_R
+

 /* Define if you have the inet_addr function.  */
 #undef HAVE_INET_ADDR
 
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 
 /* Define if you have the inet_addr function.  */
 #undef HAVE_INET_ADDR
 
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 

+/* Define if you have the localtime_r function.  */
+#undef HAVE_LOCALTIME_R
+

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


@@ -845,6 +1000,9 @@
 /* Define if you have the putenv function.  */
 #undef HAVE_PUTENV
 
 /* Define if you have the putenv function.  */
 #undef HAVE_PUTENV
 

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

 /* Define if you have the setenv function.  */
 #undef HAVE_SETENV
 
 /* Define if you have the setenv function.  */
 #undef HAVE_SETENV
 


@@ -944,7 +1102,14 @@
 /* Define this if you have wprintf() and related functions */
 #undef HAVE_WPRINTF
 
 /* Define this if you have wprintf() and related functions */
 #undef HAVE_WPRINTF
 

-/* Define this if you have wprintf() and related functions */
+/* Define this if you have swprintf() */
+#undef HAVE_SWPRINTF
+
+/* 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 */

 #undef HAVE_VSWPRINTF
 
 /* Define this if you have _vsnwprintf */
 #undef HAVE_VSWPRINTF
 
 /* Define this if you have _vsnwprintf */


@@ -965,9 +1130,18 @@
 /* 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_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
 
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 

+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if fdopen is available.  */
+#undef HAVE_FDOPEN
+

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


@@ -978,6 +1152,18 @@
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 

+/* Set to 0 to disable PostScript print/preview architecture code under Windows
+  (just use Windows printing).
+ */
+#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__ */
 
 /* --------------------------------------------------------*


@@ -985,8 +1171,6 @@
  *  by configure.
 */
 
  *  by configure.
 */
 

-#include "wx/chkconf.h"
-

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


@@ -998,6 +1182,5 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #undef wxHAS_WORKING_GTK_DC_BLIT
 
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #undef wxHAS_WORKING_GTK_DC_BLIT
 

-

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