wxUSE_UNICODE_MSLU is MSW-specific so shouldn't be in setup_inc.h: removed and regene...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index c7e4bb9aea7e5abfcda7f8b8e7d629eb55d4775a..42403a4814911032cd1287db35893467d96cab6f 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__
 
@@ -139,7 +144,6 @@
 
 /* --- start common options --- */
 
-
 #ifndef wxUSE_GUI
     #define wxUSE_GUI            0
 #endif
@@ -161,22 +165,17 @@
 
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 
-#if defined(_MSC_VER) || \
-    (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#else
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+#define wxUSE_ON_FATAL_EXCEPTION 0
 
 #define wxUSE_STACKWALKER 0
 
+#define wxUSE_DEBUGREPORT 0
+
 
 #ifndef wxUSE_UNICODE
     #define wxUSE_UNICODE 0
 #endif
 
-#define wxUSE_UNICODE_MSLU 0
-
 #define wxUSE_WCHAR_T 0
 
 
@@ -202,6 +201,8 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
+#define wxUSE_STD_STRING  0
+
 
 #define wxUSE_LONGLONG      0
 
@@ -210,6 +211,8 @@
 
 #define wxUSE_FSVOLUME      0
 
+#define wxUSE_STDPATHS      0
+
 #define wxUSE_TEXTBUFFER    0
 
 #define wxUSE_TEXTFILE      0
@@ -240,7 +243,7 @@
 
 #define wxUSE_FS_INET       0
 
-#define wxUSE_ARCSTREAM     0
+#define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 
@@ -272,11 +275,7 @@
 
 #define wxUSE_MEDIACTRL     0
 
-#define wxUSE_QUICKTIME     0
-
-#define wxUSE_DIRECTSHOW    0
-
-#define wxUSE_GSTREAMER     0
+#define wxUSE_GSTREAMER    0
 
 #define wxUSE_XRC       0
 
@@ -320,11 +319,7 @@
 
 #define wxUSE_STATUSBAR    0
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
 #define wxUSE_NATIVE_STATUSBAR        0
-#else
-#define wxUSE_NATIVE_STATUSBAR        0
-#endif
 
 #define wxUSE_TOOLBAR 0
 #define wxUSE_TOOLBAR_NATIVE 0
@@ -453,8 +448,6 @@
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
-
 
 #define wxUSE_ODBC          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
 
@@ -972,6 +978,10 @@
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
+// Set to 0 to disable PostScript print/preview architecture code under Windows
+// (just use Windows printing).
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*