After adding check to wx/mgl/chkconf.h for UNIV flag, our regex needs this flag deliv...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 7cca609a4a2b089cd76d23fe3ef8d71a4931c9f9..b4d0aadddd0c8d87ac2ce7c0f14d9c271788f09b 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -65,6 +65,9 @@
 /* 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__
 
@@ -148,10 +151,10 @@
 #endif
 
 
-#define WXWIN_COMPATIBILITY_2_2 0
-
 #define WXWIN_COMPATIBILITY_2_4 0
 
+#define WXWIN_COMPATIBILITY_2_6 0
+
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 
@@ -202,6 +205,8 @@
 
 #define wxUSE_STD_STRING  0
 
+#define wxUSE_PRINTF_POS_PARAMS      0
+
 
 #define wxUSE_LONGLONG      0
 
@@ -284,6 +289,8 @@
 #  define wxUSE_XML       0
 #endif
 
+#define wxUSE_AUI       0
+
 
 #define wxUSE_CONTROLS     0
 
@@ -291,30 +298,36 @@
 
 #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_BUTTON        0
+#define wxUSE_BMPBUTTON     0
+#define wxUSE_CALENDARCTRL  0
+#define wxUSE_CHECKBOX      0
+#define wxUSE_CHECKLISTBOX  0
+#define wxUSE_CHOICE        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    0
 
@@ -329,12 +342,20 @@
 
 #define wxUSE_CHOICEBOOK 0
 
+#define wxUSE_TREEBOOK 0
+
+#define wxUSE_TOOLBOOK 0
+
 #define wxUSE_TAB_DIALOG    0
 
 #define wxUSE_GRID         0
 
 #define wxUSE_MINIFRAME 0
 
+#define wxUSE_COMBOCTRL 0
+
+#define wxUSE_ODCOMBOBOX 0
+
 
 #define wxUSE_ACCEL 0
 
@@ -408,6 +429,8 @@
 
 #define wxUSE_GLCANVAS       0
 
+#define wxUSE_RICHTEXT       0
+
 
 #define wxUSE_CLIPBOARD     0
 
@@ -489,6 +512,8 @@
  * the common values automatically */
 #if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
+#else
+#define wxUSE_OWNER_DRAWN 0
 #endif
 
 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
@@ -499,6 +524,8 @@
 #define wxUSE_RICHEDIT2 0
 #endif
 
+#define wxUSE_INKEDIT 0
+
 #define wxUSE_UNICODE_MSLU 0
 
 #define wxUSE_DC_CACHEING 0
@@ -571,6 +598,11 @@
  * 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)
  */
@@ -585,6 +617,14 @@
  * 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
  */
@@ -741,6 +781,9 @@
 /* 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
 
@@ -769,6 +812,10 @@
  * 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
 
@@ -851,15 +898,48 @@
 /* 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 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 localtime_r function.  */
+#undef HAVE_LOCALTIME_R
+
 /* Define if you have the mktemp function.  */
 #undef HAVE_MKTEMP
 
@@ -872,6 +952,9 @@
 /* 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
 
@@ -998,6 +1081,9 @@
 /* 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
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */
@@ -1008,8 +1094,9 @@
    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).
+/* Set to 0 to disable PostScript print/preview architecture code under Windows
+  (just use Windows printing).
+ */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 #endif /* __WIN32__ */
@@ -1019,8 +1106,6 @@
  *  by configure.
 */
 
-#include "wx/chkconf.h"
-
 /*
    define some constants identifying wxWindows version in more details than
    just the version number