more socket cleanup to allow using wxSocket from both wxBase and wxCore (replaces...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index ecb50f9dfaa18d287256f21b4af8cbbdc5e30008..1443a641c4ce3312536db5ead3fd020d780c007f 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.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__
 
 /* Define this if your version of GTK+ is greater than 2.6 */
 #undef __WXGTK26__
 


@@ -250,6 +247,8 @@
 
 #define wxUSE_SOCKETS       0
 
 
 #define wxUSE_SOCKETS       0
 

+#define wxUSE_IPV6          0
+

 #define wxUSE_FILESYSTEM    0
 
 #define wxUSE_FS_ZIP        0
 #define wxUSE_FILESYSTEM    0
 
 #define wxUSE_FS_ZIP        0


@@ -400,6 +399,8 @@
 
 #define wxUSE_MENUS         0
 
 
 #define wxUSE_MENUS         0
 

+#define wxUSE_NOTIFICATION_MESSAGE 0
+

 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0


@@ -581,6 +582,8 @@
 
 #define wxUSE_OWNER_DRAWN 0
 
 
 #define wxUSE_OWNER_DRAWN 0
 

+#define wxUSE_TASKBARICON_BALLOONS 0
+

 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0
 #define wxUSE_UXTHEME           0
 
 #define wxUSE_INKEDIT  0


@@ -592,11 +595,6 @@
 
 
 #define wxUSE_CRASHREPORT 0
 
 
 #define wxUSE_CRASHREPORT 0

-
-
-
-#define wxUSE_BITMAP_MESSAGE         0
-

 /* --- end MSW options --- */
 
 /*
 /* --- end MSW options --- */
 
 /*


@@ -1081,9 +1079,6 @@
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
 /* 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
 
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT