Add a comment about covariant returns

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index c7e4bb9aea7e5abfcda7f8b8e7d629eb55d4775a..e081e7205f70d30d1407efe43b793fed3e9a058e 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__
 
@@ -161,15 +166,12 @@
 
 #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
@@ -202,6 +204,8 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
+#define wxUSE_STD_STRING  0
+
 
 #define wxUSE_LONGLONG      0
 
@@ -210,6 +214,8 @@
 
 #define wxUSE_FSVOLUME      0
 
+#define wxUSE_STDPATHS      0
+
 #define wxUSE_TEXTBUFFER    0
 
 #define wxUSE_TEXTFILE      0
@@ -240,7 +246,7 @@
 
 #define wxUSE_FS_INET       0
 
-#define wxUSE_ARCSTREAM     0
+#define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 
@@ -276,7 +282,7 @@
 
 #define wxUSE_DIRECTSHOW    0
 
-#define wxUSE_GSTREAMER     0
+#define wxUSE_GSTREAMER    0
 
 #define wxUSE_XRC       0
 
@@ -320,11 +326,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 +455,6 @@
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
-
 
 #define wxUSE_ODBC          0
 
@@ -972,6 +972,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__ */
 
 /* --------------------------------------------------------*