use @subpage where possible instead of @ref

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index ecb50f9dfaa18d287256f21b4af8cbbdc5e30008..c7a3321653f12268cdc661acdfdaacec3d72eb05 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__
 
@@ -199,17 +196,21 @@
 
 #define wxUSE_THREADS 0
 
-#define wxUSE_STREAMS       0
+#define wxUSE_WEAKREF 0
 
-#define wxUSE_STD_IOSTREAM  0
+#define wxUSE_STREAMS       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 +233,8 @@
 
 #define wxUSE_INTL          0
 
+#define wxUSE_XLOCALE       0
+
 #define wxUSE_DATETIME      0
 
 #define wxUSE_TIMER         0
@@ -250,6 +253,8 @@
 
 #define wxUSE_SOCKETS       0
 
+#define wxUSE_IPV6          0
+
 #define wxUSE_FILESYSTEM    0
 
 #define wxUSE_FS_ZIP        0
@@ -400,6 +405,8 @@
 
 #define wxUSE_MENUS         0
 
+#define wxUSE_NOTIFICATION_MESSAGE 0
+
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
@@ -408,6 +415,12 @@
 
 #define wxUSE_VALIDATORS 0
 
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
+
 
 #define wxUSE_COMMON_DIALOGS 0
 
@@ -581,6 +594,8 @@
 
 #define wxUSE_OWNER_DRAWN 0
 
+#define wxUSE_TASKBARICON_BALLOONS 0
+
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0
@@ -592,11 +607,6 @@
 
 
 #define wxUSE_CRASHREPORT 0
-
-
-
-#define wxUSE_BITMAP_MESSAGE         0
-
 /* --- end MSW options --- */
 
 /*
@@ -1066,6 +1076,9 @@
 /* Define this if you have _vsnwprintf */
 #undef HAVE__VSNWPRINTF
 
+/* vswscanf() */
+#undef HAVE_VSWSCANF
+
 /* Define if fseeko and ftello are available.  */
 #undef HAVE_FSEEKO
 
@@ -1081,9 +1094,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
 
@@ -1102,6 +1112,9 @@
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */