move to svn

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 94fa168605f5a91e95fbb58af8764008c0146d62..aa7372c8e757ac873bd96c8986576eb8b01ac721 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__
 
@@ -125,9 +128,6 @@
 #undef __WINDOWS__
 #endif
 
-#ifndef __WIN95__
-#undef __WIN95__
-#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
@@ -151,10 +151,10 @@
 #endif
 
 
-#define WXWIN_COMPATIBILITY_2_4 0
-
 #define WXWIN_COMPATIBILITY_2_6 0
 
+#define WXWIN_COMPATIBILITY_2_8 0
+
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 
@@ -203,7 +203,12 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
-#define wxUSE_STD_STRING  0
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  0
+#endif
 
 #define wxUSE_PRINTF_POS_PARAMS      0
 
@@ -245,12 +250,16 @@
 
 #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_TARSTREAM     0
+
 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0
@@ -285,14 +294,12 @@
 
 #define wxUSE_XRC       0
 
-#if wxUSE_XRC
-#define wxUSE_XML       0
-#else
-#  define wxUSE_XML       0
-#endif
+#define wxUSE_XML       wxUSE_XRC
 
 #define wxUSE_AUI       0
 
+#define wxUSE_STC 0
+
 
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
@@ -305,17 +312,20 @@
 
 #define wxUSE_TIPWINDOW    0
 
+#define wxUSE_ANIMATIONCTRL 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_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
@@ -325,6 +335,7 @@
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0
 #define wxUSE_SCROLLBAR     0
+#define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0
 #define wxUSE_SPINBTN       0
 #define wxUSE_SPINCTRL      0
@@ -460,11 +471,11 @@
 
 #define wxUSE_HELP        0
 
+
 #define wxUSE_MS_HTML_HELP 0
 
-#define wxUSE_WXHTML_HELP 0
 
-#define wxUSE_RESOURCES   0
+#define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_CONSTRAINTS 0
 
@@ -502,6 +513,8 @@
 
 #define wxUSE_LIBTIFF       0
 
+#define wxUSE_TGA           0
+
 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0
@@ -529,13 +542,13 @@
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
+#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else
@@ -547,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
@@ -720,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)
  */
@@ -738,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.
@@ -749,6 +768,12 @@
  */
 #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
 
@@ -789,6 +814,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
 
@@ -816,6 +844,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
 
@@ -857,6 +888,9 @@
 /* Define if strptime() is declared in headers */
 #undef HAVE_STRPTIME_DECL
 
+/* 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
 
@@ -879,12 +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
 
@@ -912,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
 
@@ -1035,6 +1075,9 @@
 /* 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
 
@@ -1047,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
 
@@ -1117,6 +1154,12 @@
 /* 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
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */
@@ -1132,9 +1175,9 @@
  */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
-/* Define if the system headers declare the type boolean (which will conflict
- * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
-#undef HAVE_BOOLEAN
+/* 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