move to svn

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 65759d96c3f83276fabb0961eb9efc23898ec4ef..aa7372c8e757ac873bd96c8986576eb8b01ac721 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -298,6 +298,8 @@
 
 #define wxUSE_AUI       0
 
+#define wxUSE_STC 0
+
 
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
@@ -323,6 +325,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
@@ -474,8 +477,6 @@
 
 #define wxUSE_WXHTML_HELP 0
 
-#define wxUSE_RESOURCES   0
-
 #define wxUSE_CONSTRAINTS 0
 
 
@@ -559,6 +560,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
@@ -732,9 +737,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)
  */
@@ -750,6 +752,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.
@@ -906,15 +913,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
 
@@ -942,6 +949,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_SEPARATE_TYPE
+
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
@@ -1080,15 +1090,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
 
@@ -1150,6 +1154,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