added wxDisplay::GetClientArea() (currently implemented for single display and MSW...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index ffac7e30721b0f82d42d68164aa56035d532b09b..2716498bc0b992b7dbb6cf3b57a5e6d46253dcbb 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -331,10 +331,14 @@
 
 #define wxUSE_TREEBOOK 0
 
 
 #define wxUSE_TREEBOOK 0
 

+#define wxUSE_TOOLBOOK 0
+

 #define wxUSE_TAB_DIALOG    0
 
 #define wxUSE_GRID         0
 
 #define wxUSE_TAB_DIALOG    0
 
 #define wxUSE_GRID         0
 

+#define wxUSE_DATAVIEWCTRL   0
+

 #define wxUSE_MINIFRAME 0
 
 
 #define wxUSE_MINIFRAME 0
 
 


@@ -493,6 +497,8 @@
  * the common values automatically */
 #if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
  * 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__)
 #endif
 
 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)


@@ -503,6 +509,8 @@
 #define wxUSE_RICHEDIT2 0
 #endif
 
 #define wxUSE_RICHEDIT2 0
 #endif
 

+#define wxUSE_INKEDIT 0
+

 #define wxUSE_UNICODE_MSLU 0
 
 #define wxUSE_DC_CACHEING 0
 #define wxUSE_UNICODE_MSLU 0
 
 #define wxUSE_DC_CACHEING 0


@@ -575,6 +583,11 @@
  * case WX_NO_REGEX_ADVANCED should be defined.
  */
 #undef WX_NO_REGEX_ADVANCED
  * 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)
  */


@@ -589,6 +602,10 @@
  * 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 the Hildon framework
+ */
+#define wxUSE_LIBHILDON 0

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


@@ -858,15 +875,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
 


@@ -879,6 +929,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
 


@@ -1015,8 +1068,9 @@
    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).
+/* 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__ */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
 #endif /* __WIN32__ */


@@ -1026,8 +1080,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