fix WX_ARG_WITH behaviour when it's used before wxUSE_ALL_FEATURES is defined, as...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index f21c9053983f33d22b747d8b3d94659251f8a4d0..e77e00e3432971bb37abb28b49ab7375643329ef 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -68,6 +68,9 @@
 /* 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 you want to use GPE features */
 #undef __WXGPE__
 
@@ -148,8 +151,6 @@
 #endif
 
 
-#define WXWIN_COMPATIBILITY_2_4 0
-
 #define WXWIN_COMPATIBILITY_2_6 0
 
 #define WXWIN_COMPATIBILITY_2_8 0
@@ -214,6 +215,10 @@
 
 #define wxUSE_LONGLONG      0
 
+#define wxUSE_BASE64        0
+
+#define wxUSE_CONSOLE_EVENTLOOP 0
+
 #define wxUSE_FILE          0
 #define wxUSE_FFILE         0
 
@@ -297,6 +302,8 @@
 
 #define wxUSE_AUI       0
 
+#define wxUSE_STC 0
+
 
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
@@ -322,6 +329,7 @@
 #define wxUSE_DATAVIEWCTRL  0
 #define wxUSE_DATEPICKCTRL  0
 #define wxUSE_DIRPICKERCTRL 0
+#define wxUSE_EDITABLELISTBOX 0
 #define wxUSE_FILEPICKERCTRL 0
 #define wxUSE_FONTPICKERCTRL 0
 #define wxUSE_GAUGE         0
@@ -473,8 +481,6 @@
 
 #define wxUSE_WXHTML_HELP 0
 
-#define wxUSE_RESOURCES   0
-
 #define wxUSE_CONSTRAINTS 0
 
 
@@ -489,6 +495,8 @@
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 
+#define wxUSE_SVG 0
+
 
 #define wxUSE_ODBC          0
 
@@ -538,6 +546,12 @@
 
 /* --- end common options --- */
 
+/*
+ * Unix-specific options
+ */
+#define wxUSE_SELECT_DISPATCHER 0
+#define wxUSE_EPOLL_DISPATCHER 0
+
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
 #if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
@@ -558,6 +572,10 @@
 
 #define wxUSE_UNICODE_MSLU 0
 
+#define wxUSE_UNICODE_UTF8 0
+
+#define wxUSE_UTF8_LOCALE_ONLY 0
+
 #define wxUSE_DC_CACHEING 0
 
 #define wxUSE_GADGETS 0
@@ -627,6 +645,11 @@
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
+/*
+ * Define if the compiler supports simple visibility declarations.
+ */
+#undef HAVE_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
@@ -731,9 +754,6 @@
 #define wxUSE_OLE_AUTOMATION 0
 #define wxUSE_ACTIVEX 0
 
-/* for compatibility */
-#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
-
 /*
  * Use MS HTML Help via libmspack (Unix)
  */
@@ -749,6 +769,11 @@
  */
 #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.
@@ -806,6 +831,9 @@
 /* Define if fsync() is available */
 #undef HAVE_FSYNC
 
+/* Define if round() is available */
+#undef HAVE_ROUND
+
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 
@@ -833,6 +861,9 @@
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
+/* Define if you have pthread_mutex_timedlock */
+#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+
 /* Define if you have pthread_attr_setstacksize */
 #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
 
@@ -899,15 +930,15 @@
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
+/* Define if you have wcsdup function  */
+#undef HAVE_WCSDUP
+
 /* Define if you have wcstoull() and wcstoll() */
 #undef HAVE_WCSTOULL
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
-/* The number of bytes in a char.  */
-#undef SIZEOF_CHAR
-
 /* The number of bytes in a wchar_t.  */
 #undef SIZEOF_WCHAR_T
 
@@ -935,6 +966,9 @@
 /* Define if size_t on your machine is the same type as unsigned long. */
 #undef wxSIZE_T_IS_ULONG
 
+/* Define if wchar_t is distinct type in your compiler. */
+#undef wxWCHAR_T_IS_REAL_TYPE
+
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
@@ -1073,15 +1107,9 @@
 /* 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
 
@@ -1143,6 +1171,9 @@
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 
+/* Define if you have the <sys/epoll.h> header file.  */
+#undef HAVE_SYS_EPOLL_H
+
 /* Define if fdopen is available.  */
 #undef HAVE_FDOPEN