further wxABI_VERSION fixes

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index e081e7205f70d30d1407efe43b793fed3e9a058e..42403a4814911032cd1287db35893467d96cab6f 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -144,7 +144,6 @@
 
 /* --- start common options --- */
 
-
 #ifndef wxUSE_GUI
     #define wxUSE_GUI            0
 #endif
@@ -177,8 +176,6 @@
     #define wxUSE_UNICODE 0
 #endif
 
-#define wxUSE_UNICODE_MSLU 0
-
 #define wxUSE_WCHAR_T 0
 
 
@@ -278,10 +275,6 @@
 
 #define wxUSE_MEDIACTRL     0
 
-#define wxUSE_QUICKTIME     0
-
-#define wxUSE_DIRECTSHOW    0
-
 #define wxUSE_GSTREAMER    0
 
 #define wxUSE_XRC       0
@@ -501,10 +494,14 @@
 
 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
+#define wxUSE_RICHEDIT2 1
 #else
 #define wxUSE_RICHEDIT 0
+#define wxUSE_RICHEDIT2 0
 #endif
 
+#define wxUSE_UNICODE_MSLU 0
+
 /*
  * Supports bool type
  */
@@ -575,6 +572,12 @@
  * Use SDL for audio (Unix)
  */
 #define wxUSE_LIBSDL 0
+
+/*
+ * Compile sound backends as plugins
+ */
+#define wxUSE_PLUGINS 0
+
 /*
  * Use GNOME print for printing under GTK+ 2.0
  */
@@ -959,6 +962,9 @@
 /* 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