Fix problem with most of wxGTK headers not being installed.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 3094b511cf19168ddf4b7c03ee6a9ecbba912446..ca576118586bbe74d588c4683ccf2505ce5569d5 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
 


@@ -57,17 +53,23 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 

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

 /* 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 2.0 */
 #undef __WXGTK20__
 
 /* 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 2.0 */
 #undef __WXGTK20__
 

-/* 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 your version of GTK+ is greater than 2.10 */
+#undef __WXGTK210__
+
+/* Define this if your version of GTK+ is greater than 2.18 */
+#undef __WXGTK218__
+
+/* Define this if your version of GTK+ is >= 3.0 */
+#undef __WXGTK3__

 
 /* Define this if you want to use GPE features */
 #undef __WXGPE__
 
 /* Define this if you want to use GPE features */
 #undef __WXGPE__


@@ -95,6 +97,7 @@
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__

+#undef __QNX__

 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__
 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__


@@ -126,9 +129,6 @@
 #undef __WINDOWS__
 #endif
 
 #undef __WINDOWS__
 #endif
 

-#ifndef __WIN95__
-#undef __WIN95__
-#endif

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


@@ -152,14 +152,22 @@
 #endif
 
 
 #endif
 
 

-#define WXWIN_COMPATIBILITY_2_2 0
+#define WXWIN_COMPATIBILITY_2_6 0

 
 

-#define WXWIN_COMPATIBILITY_2_4 0
+#define WXWIN_COMPATIBILITY_2_8 0

 
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 
 
 
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 
 

+#define wxUSE_ON_FATAL_EXCEPTION 0
+
+#define wxUSE_STACKWALKER 0
+
+#define wxUSE_DEBUGREPORT 0
+
+
+

 #define wxUSE_DEBUG_CONTEXT 0
 
 #define wxUSE_MEMORY_TRACING 0
 #define wxUSE_DEBUG_CONTEXT 0
 
 #define wxUSE_MEMORY_TRACING 0


@@ -168,11 +176,6 @@
 
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 
 
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 

-#define wxUSE_ON_FATAL_EXCEPTION 0
-
-#define wxUSE_STACKWALKER 0
-
-#define wxUSE_DEBUGREPORT 0

 
 
 #ifndef wxUSE_UNICODE
 
 
 #ifndef wxUSE_UNICODE


@@ -186,8 +189,6 @@
 
 #define wxUSE_EXTENDED_RTTI 0
 
 
 #define wxUSE_EXTENDED_RTTI 0
 

-#define wxUSE_STL 0
-

 #define wxUSE_LOG 0
 
 #define wxUSE_LOGWINDOW 0
 #define wxUSE_LOG 0
 
 #define wxUSE_LOGWINDOW 0


@@ -202,13 +203,38 @@
 
 #define wxUSE_STREAMS       0
 
 
 #define wxUSE_STREAMS       0
 

-#define wxUSE_STD_IOSTREAM  0
+#define wxUSE_PRINTF_POS_PARAMS      0
+
+#define wxUSE_COMPILER_TLS 0
+
+
+#define wxUSE_STL 0
+
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_DEFAULT  0
+#else
+    #define wxUSE_STD_DEFAULT  0
+#endif
+
+#define wxUSE_STD_CONTAINERS 0
+
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
+
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
+
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH     0

 
 

-#define wxUSE_STD_STRING  0

 
 
 #define wxUSE_LONGLONG      0
 
 
 
 #define wxUSE_LONGLONG      0
 

+#define wxUSE_BASE64        0
+
+#define wxUSE_CONSOLE_EVENTLOOP 0
+

 #define wxUSE_FILE          0
 #define wxUSE_FFILE         0
 
 #define wxUSE_FILE          0
 #define wxUSE_FFILE         0
 


@@ -222,12 +248,16 @@
 
 #define wxUSE_INTL          0
 
 
 #define wxUSE_INTL          0
 

+#define wxUSE_XLOCALE       0
+

 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0
 
 #define wxUSE_STOPWATCH     0
 
 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0
 
 #define wxUSE_STOPWATCH     0
 

+#define wxUSE_FSWATCHER     0
+

 #define wxUSE_CONFIG        0
 
 #define wxUSE_CONFIG_NATIVE   0
 #define wxUSE_CONFIG        0
 
 #define wxUSE_CONFIG_NATIVE   0


@@ -240,22 +270,30 @@
 
 #define wxUSE_SOCKETS       0
 
 
 #define wxUSE_SOCKETS       0
 

+#define wxUSE_IPV6          0
+

 #define wxUSE_FILESYSTEM    0
 
 #define wxUSE_FS_ZIP        0
 
 #define wxUSE_FILESYSTEM    0
 
 #define wxUSE_FS_ZIP        0
 

+#define wxUSE_FS_ARCHIVE    0
+

 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 
 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 

+#define wxUSE_TARSTREAM     0
+

 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0
 
 #define wxUSE_JOYSTICK            0
 
 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0
 
 #define wxUSE_JOYSTICK            0
 

+#define wxUSE_FONTENUM 0
+

 #define wxUSE_FONTMAP 0
 
 #define wxUSE_MIMETYPE 0
 #define wxUSE_FONTMAP 0
 
 #define wxUSE_MIMETYPE 0


@@ -270,6 +308,10 @@
 
 #define wxUSE_URL_NATIVE 0
 
 
 #define wxUSE_URL_NATIVE 0
 

+#define wxUSE_VARIANT 0
+
+#define wxUSE_ANY 0
+

 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 0
 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 0


@@ -278,47 +320,105 @@
 
 #define wxUSE_MEDIACTRL     0
 
 
 #define wxUSE_MEDIACTRL     0
 

-#define wxUSE_GSTREAMER    0
-

 #define wxUSE_XRC       0
 
 #define wxUSE_XRC       0
 

-#if wxUSE_XRC
-#define wxUSE_XML       0
+#define wxUSE_XML       wxUSE_XRC
+
+#define wxUSE_AUI       0
+
+#define wxUSE_RIBBON    0
+
+#define wxUSE_PROPGRID  0
+
+#define wxUSE_STC 0
+
+#define wxUSE_WEBVIEW 0
+
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 0
+#else
+#define wxUSE_WEBVIEW_IE 0
+#endif
+
+#if defined(__WXGTK__) || defined(__WXOSX__)
+#define wxUSE_WEBVIEW_WEBKIT 0
+#else
+#define wxUSE_WEBVIEW_WEBKIT 0
+#endif
+
+
+#ifdef _MSC_VER
+#   if _MSC_VER >= 1310
+
+
+#define wxUSE_GRAPHICS_CONTEXT 0
+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif

 #else
 #else

-#  define wxUSE_XML       0
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0

 #endif
 
 #endif
 

+#define wxUSE_CAIRO 0
+
+

 
 #define wxUSE_CONTROLS     0
 
 
 #define wxUSE_CONTROLS     0
 

+#define wxUSE_MARKUP       0
+

 #define wxUSE_POPUPWIN     0
 
 #define wxUSE_TIPWINDOW    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_ANIMATIONCTRL 0
+#define wxUSE_BANNERWINDOW  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_COMMANDLINKBUTTON 0
+#define wxUSE_DATAVIEWCTRL  0
+#define wxUSE_DATEPICKCTRL  0
+#define wxUSE_DIRPICKERCTRL 0
+#define wxUSE_EDITABLELISTBOX 0
+#define wxUSE_FILECTRL      0
+#define wxUSE_FILEPICKERCTRL 0
+#define wxUSE_FONTPICKERCTRL 0
+#define wxUSE_GAUGE         0
+#define wxUSE_HEADERCTRL    0
+#define wxUSE_HYPERLINKCTRL 0
+#define wxUSE_LISTBOX       0
+#define wxUSE_LISTCTRL      0
+#define wxUSE_RADIOBOX      0
+#define wxUSE_RADIOBTN      0
+#define wxUSE_RICHMSGDLG    0
+#define wxUSE_SCROLLBAR     0
+#define wxUSE_SEARCHCTRL    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_TIMEPICKCTRL  0
+#define wxUSE_TOGGLEBTN     0
+#define wxUSE_TREECTRL      0
+#define wxUSE_TREELISTCTRL  0

 
 #define wxUSE_STATUSBAR    0
 
 
 #define wxUSE_STATUSBAR    0
 


@@ -333,15 +433,31 @@
 
 #define wxUSE_CHOICEBOOK 0
 
 
 #define wxUSE_CHOICEBOOK 0
 

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

 
 #define wxUSE_GRID         0
 
 #define wxUSE_MINIFRAME 0
 
 
 #define wxUSE_GRID         0
 
 #define wxUSE_MINIFRAME 0
 

+#define wxUSE_COMBOCTRL 0
+
+#define wxUSE_ODCOMBOBOX 0
+
+#define wxUSE_BITMAPCOMBOBOX 0
+
+#define wxUSE_REARRANGECTRL 0
+

 
 #define wxUSE_ACCEL 0
 
 
 #define wxUSE_ACCEL 0
 

+#define wxUSE_ARTPROVIDER_STD 0
+
+#define wxUSE_ARTPROVIDER_TANGO 0
+

 #define wxUSE_HOTKEY 0
 
 #define wxUSE_CARET         0
 #define wxUSE_HOTKEY 0
 
 #define wxUSE_CARET         0


@@ -352,8 +468,14 @@
 
 #define wxUSE_IMAGLIST      0
 
 
 #define wxUSE_IMAGLIST      0
 

+#define wxUSE_INFOBAR       0
+

 #define wxUSE_MENUS         0
 
 #define wxUSE_MENUS         0
 

+#define wxUSE_NOTIFICATION_MESSAGE 0
+
+#define wxUSE_RICHTOOLTIP 0
+

 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0


@@ -362,6 +484,12 @@
 
 #define wxUSE_VALIDATORS 0
 
 
 #define wxUSE_VALIDATORS 0
 

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

 
 #define wxUSE_COMMON_DIALOGS 0
 
 
 #define wxUSE_COMMON_DIALOGS 0
 


@@ -394,6 +522,10 @@
 
 #define wxUSE_WIZARDDLG 0
 
 
 #define wxUSE_WIZARDDLG 0
 

+#define wxUSE_ABOUTDLG 0
+
+#define wxUSE_FILE_HISTORY 0
+

 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0


@@ -412,6 +544,8 @@
 
 #define wxUSE_GLCANVAS       0
 
 
 #define wxUSE_GLCANVAS       0
 

+#define wxUSE_RICHTEXT       0
+

 
 #define wxUSE_CLIPBOARD     0
 
 
 #define wxUSE_CLIPBOARD     0
 


@@ -430,13 +564,12 @@
 
 #define wxUSE_HELP        0
 
 
 #define wxUSE_HELP        0
 

+

 #define wxUSE_MS_HTML_HELP 0
 
 
 #define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_MS_HTML_HELP 0
 
 
 #define wxUSE_WXHTML_HELP 0
 

-#define wxUSE_RESOURCES   0
-

 #define wxUSE_CONSTRAINTS 0
 
 
 #define wxUSE_CONSTRAINTS 0
 
 


@@ -446,22 +579,16 @@
 #define wxUSE_MOUSEWHEEL        0
 
 
 #define wxUSE_MOUSEWHEEL        0
 
 

+#define wxUSE_UIACTIONSIMULATOR 0
+

 
 #define wxUSE_POSTSCRIPT  0
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 
 
 #define wxUSE_POSTSCRIPT  0
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 

+#define wxUSE_SVG 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_DC_TRANSFORM_MATRIX 0

 
 
 
 
 
 


@@ -473,6 +600,8 @@
 
 #define wxUSE_LIBTIFF       0
 
 
 #define wxUSE_LIBTIFF       0
 

+#define wxUSE_TGA           0
+

 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0
 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0


@@ -487,52 +616,85 @@
 
 #define wxUSE_PALETTE       0
 
 
 #define wxUSE_PALETTE       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
-#endif

 
 

-#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
+#define wxUSE_ALL_THEMES    0

 
 

-#define wxUSE_UNICODE_MSLU 0
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0

 
 

-#define wxUSE_DC_CACHEING 0

 
 

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

 
 /*
 
 /*

- * Supports bool type
+ * Unix-specific options

  */
  */

-#undef HAVE_BOOL
+#define wxUSE_SELECT_DISPATCHER 0
+#define wxUSE_EPOLL_DISPATCHER 0

 
 

-/*
- * Define if your compiler supports the explicit keyword
- */
-#undef HAVE_EXPLICIT
+#define wxUSE_UNICODE_UTF8 0
+#define wxUSE_UTF8_LOCALE_ONLY 0

 
 /*
 
 /*

- * Define if your compiler supports const_cast<>()
- */
-#undef HAVE_CONST_CAST
+   Use GStreamer for Unix.

 
 

-/*
- * Define if your compiler supports reinterpret_cast<>()
+   Default is 0 as this requires a lot of dependencies which might not be
+   available.
+
+   Recommended setting: 1 (wxMediaCtrl won't work by default without it).

  */
  */

-#undef HAVE_REINTERPRET_CAST
+#define wxUSE_GSTREAMER 0
+
+/* --- start MSW options --- */
+
+#ifndef wxUSE_UNICODE_MSLU
+    #define wxUSE_UNICODE_MSLU 0
+#endif
+
+#define wxUSE_MFC           0
+
+#define wxUSE_OLE           0
+
+#define wxUSE_OLE_AUTOMATION 0
+
+#define wxUSE_ACTIVEX 0
+
+#define wxUSE_DC_CACHEING 0
+
+#define wxUSE_WXDIB 0
+
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
+
+#define wxUSE_REGKEY 0
+
+#define wxUSE_RICHEDIT  0
+
+#define wxUSE_RICHEDIT2 0
+
+#define wxUSE_OWNER_DRAWN 0
+
+#define wxUSE_TASKBARICON_BALLOONS 0
+
+#define wxUSE_UXTHEME           0
+
+#define wxUSE_INKEDIT  0
+
+#define wxUSE_INICONF 0
+
+
+#define wxUSE_DATEPICKCTRL_GENERIC 0
+
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
+
+#define wxUSE_CRASHREPORT 0
+/* --- end MSW options --- */

 
 /*
 
 /*

- * Define if your compiler supports static_cast<>()
+ * Define if your compiler supports the explicit keyword

  */
  */

-#undef HAVE_STATIC_CAST
+#undef HAVE_EXPLICIT

 
 /*
  * Define if your compiler has C99 va_copy
 
 /*
  * Define if your compiler has C99 va_copy


@@ -544,6 +706,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
  */


@@ -569,12 +736,62 @@
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 

+/*
+ * Define if your compiler has std::unordered_map
+ */
+#undef HAVE_STD_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::unordered_set
+ */
+#undef HAVE_STD_UNORDERED_SET
+
+/*
+ * Define if your compiler has std::tr1::unordered_map
+ */
+#undef HAVE_TR1_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::tr1::unordered_set
+ */
+#undef HAVE_TR1_UNORDERED_SET
+
+/*
+ * Define if your compiler has <tr1/type_traits>
+ */
+#undef HAVE_TR1_TYPE_TRAITS
+
+/*
+ * Define if your compiler has <type_traits>
+ */
+#undef HAVE_TYPE_TRAITS
+
+/*
+ * Define if the compiler supports simple visibility declarations.
+ */
+#undef HAVE_VISIBILITY
+
+/*
+ * Define if the compiler supports GCC's atomic memory access builtins
+ */
+#undef HAVE_GCC_ATOMIC_BUILTINS
+
+/*
+ * Define if compiler's visibility support in libstdc++ is broken
+ */
+#undef HAVE_BROKEN_LIBSTDCXX_VISIBILITY
+

 /*
  * 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
 /*
  * The built-in regex supports advanced REs in additional to POSIX's basic
  * and extended. Your system regex probably won't support this, and in this
  * case WX_NO_REGEX_ADVANCED should be defined.
  */
 #undef WX_NO_REGEX_ADVANCED

+/*
+ * On GNU systems use re_search instead of regexec, since the latter does a
+ * strlen on the search text affecting the performance of some operations.
+ */
+#undef HAVE_RE_SEARCH

 /*
  * Use SDL for audio (Unix)
  */
 /*
  * Use SDL for audio (Unix)
  */


@@ -585,22 +802,26 @@
  */
 #define wxUSE_PLUGINS 0
 
  */
 #define wxUSE_PLUGINS 0
 

+/*
+ * Use GTK print for printing under GTK+ 2.0
+ */
+#define wxUSE_GTKPRINT 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 iODBC
+ * Use GNOME VFS for MIME types

  */
  */

-#define wxUSE_BUILTIN_IODBC 0
+#define wxUSE_LIBGNOMEVFS 0

 /*
 /*

- * Use freetype
+ * Use the Hildon framework

  */
  */

-#define wxUSE_FREETYPE 0
+#define wxUSE_LIBHILDON 0

 /*
 /*

- * Have glibc2
+ * Use the Hildon 2.0 framework

  */
  */

-#define wxHAVE_GLIBC2 0
+#define wxUSE_LIBHILDON2 0

 /*
  * Use libXpm
  */
 /*
  * Use libXpm
  */


@@ -610,56 +831,18 @@
  */
 #undef wxHAVE_PTHREAD_CLEANUP
 /*
  */
 #undef wxHAVE_PTHREAD_CLEANUP
 /*

- * Use consistent PostScript fonts for AFM and printing (!)
+ * Define if compiler has __thread keyword.

  */
  */

-#define wxUSE_NORMALIZED_PS_FONTS 0
-
-/* compatibility */
-#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
-
-/*
- * Use OpenGL
- */
-#define wxUSE_OPENGL 0
-
+#undef HAVE___THREAD_KEYWORD

 /*
 /*

- * Set to 1 to compile MS Windows XP theme engine support
+ * Define if large (64 bit file offsets) files are supported.

  */
  */

-#define wxUSE_UXTHEME 1
-
-/*
- *  Set to 1 to auto-adapt to MS Windows XP themes where possible
- * (notably, wxNotebook pages)
- */
-#define wxUSE_UXTHEME_AUTO 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 wxUSE_WCSRTOMBS 0
-
-/*
- * Use the new experimental implementation of wxString::Printf()?
- *
- * Warning: enabling this may cause internal compiler errors with gcc!
- */
-#define wxUSE_EXPERIMENTAL_PRINTF 0
+#undef HAVE_LARGEFILE_SUPPORT

 
 /*
 
 /*

- * Use wxGetResource & wxWriteResource (change .Xdefaults)
- */
-#define wxUSE_X_RESOURCES 0
-/*
- * Use OLE (MSW only)
+ * Use OpenGL

  */
  */

-#define wxUSE_OLE 0
-
-/* for compatibility */
-#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
+#define wxUSE_OPENGL 0

 
 /*
  * Use MS HTML Help via libmspack (Unix)
 
 /*
  * Use MS HTML Help via libmspack (Unix)


@@ -676,6 +859,11 @@
  */
 #define wxUSE_WEBKIT 0
 
  */
 #define wxUSE_WEBKIT 0
 

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

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


@@ -687,11 +875,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


@@ -727,15 +921,12 @@
 /* Define if fsync() is available */
 #undef HAVE_FSYNC
 
 /* Define if fsync() is available */
 #undef HAVE_FSYNC
 

+/* Define if round() is available */
+#undef HAVE_ROUND
+

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


@@ -745,53 +936,91 @@
 /* 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 sigaction() */
-#undef HAVE_SIGACTION
+/* Define if you have pthread_mutex_timedlock */
+#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK

 
 

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

 
 /* 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 snprintf() which supports positional arguments
+   (defined in the unix98 standard) */
+#undef HAVE_UNIX98_PRINTF
+

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

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

 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 
 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 

-/* Define if you have strptime() */
-#undef HAVE_STRPTIME
+/* 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 have timegm() function */
-#undef HAVE_TIMEGM
-

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

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

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

+/* Define if you have wcscasecmp() function  */
+#undef HAVE_WCSCASECMP
+
+/* Define if you have wcsncasecmp() function  */
+#undef HAVE_WCSNCASECMP
+

 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 

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

 
 

-/* The number of bytes in a char.  */
-#undef SIZEOF_CHAR
+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL

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


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

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

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


@@ -832,44 +1061,74 @@
 /* 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 mkstemp function.  */
 #undef HAVE_MKSTEMP
 
 /* Define if you have the mktemp function.  */
 #undef HAVE_MKTEMP
 
 /* Define if you have the mkstemp function.  */
 #undef HAVE_MKSTEMP
 

-/* Define if you have the nanosleep function.  */
-#undef HAVE_NANOSLEEP
-

 /* Define if you have the putenv function.  */
 #undef HAVE_PUTENV
 
 /* Define if you have the setenv function.  */
 #undef HAVE_SETENV
 
 /* Define if you have the putenv function.  */
 #undef HAVE_PUTENV
 
 /* 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. */
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_THR_SETCONCURRENCY
 
 /* Define if you have strtok_r function. */
 #undef HAVE_STRTOK_R
 
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_THR_SETCONCURRENCY
 

+/* Define if you have pthread_setconcurrency function */
+#undef HAVE_PTHREAD_SET_CONCURRENCY
+

 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 

-/* Define if you have the usleep function.  */
-#undef HAVE_USLEEP
+/* Define if you have the unsetenv function.  */
+#undef HAVE_UNSETENV

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


@@ -877,18 +1136,6 @@
 /* Define if you have the <X11/extensions/xf86vmode.h> header file.  */
 #undef HAVE_X11_EXTENSIONS_XF86VMODE_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 <iostream> header file.  */
-#undef HAVE_IOSTREAM
-
-/* Define if you have the <linux/joystick.h> header file.  */
-#undef HAVE_LINUX_JOYSTICK_H
-

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


@@ -904,8 +1151,8 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

-/* Define if you have the <wctype.h> header file.  */
-#undef HAVE_WCTYPE_H
+/* Define if you have <widec.h> (Solaris only) */
+#undef HAVE_WIDEC_H

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


@@ -919,24 +1166,12 @@
 /* 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 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 putws() */
 #undef HAVE_PUTWS
 


@@ -952,12 +1187,15 @@
 /* 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 vswprintf() and related functions */

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

+/* vswscanf() */
+#undef HAVE_VSWSCANF
+

 /* Define if fseeko and ftello are available.  */
 #undef HAVE_FSEEKO
 
 /* Define if fseeko and ftello are available.  */
 #undef HAVE_FSEEKO
 


@@ -973,12 +1211,33 @@
 /* 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
+
+/* Define if sysconf is available. */
+#undef HAVE_SYSCONF
+
+/* Define if getpwuid_r is available. */
+#undef HAVE_GETPWUID_R
+
+/* Define if getgrgid_r is available. */
+#undef HAVE_GETGRGID_R
+
+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+
+/* Define if you have inotify_xxx() functions. */
+#undef wxHAS_INOTIFY
+
+/* Define if you have kqueu_xxx() functions. */
+#undef wxHAS_KQUEUE
+

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


@@ -989,9 +1248,12 @@
    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
+/* When using an external jpeg library and the Windows headers already define
+ * boolean, define to the type used by the jpeg library for boolean.  */
+#undef wxHACK_BOOLEAN
+
+/* Define if the header pbt.h is missing.  */
+#undef NEED_PBT_H

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


@@ -1000,8 +1262,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


@@ -1013,6 +1273,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__ */