Updating wording in description of Skip to be less ambiguous between the default...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 377dc3c1411a504fa8d22f7ccf72c17b776d19e9..9c9f72c60dcb52fc7e772a346b9f8d45945b3932 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -46,7 +46,9 @@
 #undef STDC_HEADERS
 
 /* Define this to get extra features from GNU libc. */
+#ifndef _GNU_SOURCE
 #undef _GNU_SOURCE
+#endif
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
@@ -110,6 +112,9 @@
 #undef __POWERPC__
 #undef TARGET_CARBON
 
+/* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
+#undef __Point__
+
 /* MS-DOS with DJGPP */
 #undef __DOS__
 
@@ -199,6 +204,8 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
+#define wxUSE_STD_STRING  0
+
 
 #define wxUSE_LONGLONG      0
 
@@ -494,8 +501,10 @@
 
 #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
 
 /*
@@ -568,6 +577,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
  */
@@ -952,6 +967,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