update for bakefile 0.2.6

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 8684cfd92d83f2a1a6c82c1bed0efd86adce44d5..d9e18f346d71d4e565ddd1e6d2912b30bb45cf0c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -62,9 +62,6 @@
 /* Define this if your version of GTK+ is greater than 2.0 */
 #undef __WXGTK20__
 
-/* 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__
 
@@ -201,15 +198,17 @@
 
 #define wxUSE_STREAMS       0
 
-#define wxUSE_STD_IOSTREAM  0
-
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0
 #else
-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0
 #endif
 
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
+
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
+
 #define wxUSE_PRINTF_POS_PARAMS      0
 
 
@@ -232,6 +231,8 @@
 
 #define wxUSE_INTL          0
 
+#define wxUSE_XLOCALE       0
+
 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0
@@ -250,6 +251,8 @@
 
 #define wxUSE_SOCKETS       0
 
+#define wxUSE_IPV6          0
+
 #define wxUSE_FILESYSTEM    0
 
 #define wxUSE_FS_ZIP        0
@@ -304,6 +307,8 @@
 
 #define wxUSE_AUI       0
 
+#define wxUSE_PROPGRID  0
+
 #define wxUSE_STC 0
 
 
@@ -336,6 +341,7 @@
 #define wxUSE_FILEPICKERCTRL 0
 #define wxUSE_FONTPICKERCTRL 0
 #define wxUSE_GAUGE         0
+#define wxUSE_HEADERCTRL    0
 #define wxUSE_HYPERLINKCTRL 0
 #define wxUSE_LISTBOX       0
 #define wxUSE_LISTCTRL      0
@@ -371,8 +377,6 @@
 
 #define wxUSE_TOOLBOOK 0
 
-#define wxUSE_TAB_DIALOG    0
-
 #define wxUSE_TASKBARICON 0
 
 #define wxUSE_GRID         0
@@ -385,6 +389,8 @@
 
 #define wxUSE_BITMAPCOMBOBOX 0
 
+#define wxUSE_REARRANGECTRL 0
+
 
 #define wxUSE_ACCEL 0
 
@@ -400,6 +406,8 @@
 
 #define wxUSE_MENUS         0
 
+#define wxUSE_NOTIFICATION_MESSAGE 0
+
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
@@ -408,6 +416,12 @@
 
 #define wxUSE_VALIDATORS 0
 
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
+
 
 #define wxUSE_COMMON_DIALOGS 0
 
@@ -503,13 +517,6 @@
 #define wxUSE_SVG 0
 
 
-#define wxUSE_ODBC          0
-
-#define wxODBC_FWD_ONLY_CURSORS         0
-
-#define wxODBC_BACKWARD_COMPATABILITY 0
-
-
 #define REMOVE_UNUSED_ARG   0
 
 #define wxUSE_IOSTREAMH     0
@@ -588,6 +595,8 @@
 
 #define wxUSE_OWNER_DRAWN 0
 
+#define wxUSE_TASKBARICON_BALLOONS 0
+
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0
@@ -599,38 +608,13 @@
 
 
 #define wxUSE_CRASHREPORT 0
-
-
-
-#define wxUSE_BITMAP_MESSAGE         0
-
 /* --- end MSW options --- */
 
-/*
- * Supports bool type
- */
-#undef HAVE_BOOL
-
 /*
  * Define if your compiler supports the explicit keyword
  */
 #undef HAVE_EXPLICIT
 
-/*
- * Define if your compiler supports const_cast<>()
- */
-#undef HAVE_CONST_CAST
-
-/*
- * Define if your compiler supports reinterpret_cast<>()
- */
-#undef HAVE_REINTERPRET_CAST
-
-/*
- * Define if your compiler supports static_cast<>()
- */
-#undef HAVE_STATIC_CAST
-
 /*
  * Define if your compiler has C99 va_copy
  */
@@ -671,6 +655,26 @@
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
+/*
+ * Define if your compiler has std::unordered_map
+ */
+#undef HAVE_STD_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::unordered_set
+ */
+#undef HAVE_STD_UNORDERED_SET
+
+/*
+ * Define if your compiler has std::tr1::unordered_map
+ */
+#undef HAVE_TR1_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::tr1::unordered_set
+ */
+#undef HAVE_TR1_UNORDERED_SET
+
 /*
  * Define if the compiler supports simple visibility declarations.
  */
@@ -723,10 +727,6 @@
  * Use the Hildon framework
  */
 #define wxUSE_LIBHILDON 0
-/*
- * Use iODBC
- */
-#define wxUSE_BUILTIN_IODBC 0
 /*
  * Have glibc2
  */
@@ -739,6 +739,10 @@
  * Define if you have pthread_cleanup_push/pop()
  */
 #undef wxHAVE_PTHREAD_CLEANUP
+/*
+ * Define if compiler has __thread keyword.
+ */
+#undef HAVE___THREAD_KEYWORD
 
 /* compatibility */
 /*
@@ -875,12 +879,6 @@
 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 
-/* Define if you have strptime() */
-#undef HAVE_STRPTIME
-
-/* Define if strptime() is declared in headers */
-#undef HAVE_STRPTIME_DECL
-
 /* Define if you have strtoull() and strtoll() */
 #undef HAVE_STRTOULL
 
@@ -897,15 +895,33 @@
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_VSNPRINTF_DECL
 
+/* Define if you have vsscanf() */
+#undef HAVE_VSSCANF
+
+/* Define if you have vsscanf() declaration in the header */
+#undef HAVE_VSSCANF_DECL
+
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
+/* Define if you have wcscasecmp() function  */
+#undef HAVE_WCSCASECMP
+
+/* Define if you have wcsncasecmp() function  */
+#undef HAVE_WCSNCASECMP
+
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
 /* Define if you have wcsdup function  */
 #undef HAVE_WCSDUP
 
+/* Define if you have strnlen() function */
+#undef HAVE_STRNLEN
+
+/* Define if you have wcsnlen() function */
+#undef HAVE_WCSNLEN
+
 /* Define if you have wcstoull() and wcstoll() */
 #undef HAVE_WCSTOULL
 
@@ -1077,6 +1093,9 @@
 /* Define this if you have _vsnwprintf */
 #undef HAVE__VSNWPRINTF
 
+/* vswscanf() */
+#undef HAVE_VSWSCANF
+
 /* Define if fseeko and ftello are available.  */
 #undef HAVE_FSEEKO
 
@@ -1092,9 +1111,6 @@
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
-/* Define if gtk_icon_size_lookup is missing from the GTK+ headers */
-#undef NEED_GTK_ICON_SIZE_LOOKUP
-
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
@@ -1104,6 +1120,18 @@
 /* Define if fdopen is available.  */
 #undef HAVE_FDOPEN
 
+/* Define if sysconf is available. */
+#undef HAVE_SYSCONF
+
+/* Define if getpwuid_r is available. */
+#undef HAVE_GETPWUID_R
+
+/* Define if getgrgid_r is available. */
+#undef HAVE_GETGRGID_R
+
+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */