Added GetBitmap, GetIcon to wx.ImageList.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index baf634693e4792e08051f4cab037138bbc21be4d..67270d612e87ed82248022e7e46f6a609e49bbc5 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -161,12 +161,9 @@
 
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 
 
 #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

 
 
 #ifndef wxUSE_UNICODE
 
 
 #ifndef wxUSE_UNICODE


@@ -238,6 +235,8 @@
 
 #define wxUSE_FS_INET       0
 
 
 #define wxUSE_FS_INET       0
 

+#define wxUSE_ARCHIVE_STREAMS     0
+

 #define wxUSE_ZIPSTREAM     0
 
 #define wxUSE_ZLIB          0
 #define wxUSE_ZIPSTREAM     0
 
 #define wxUSE_ZLIB          0


@@ -272,6 +271,8 @@
 
 #define wxUSE_DIRECTSHOW    0
 
 
 #define wxUSE_DIRECTSHOW    0
 

+#define wxUSE_GSTREAMER    0
+

 #define wxUSE_XRC       0
 
 #if wxUSE_XRC
 #define wxUSE_XRC       0
 
 #if wxUSE_XRC


@@ -314,11 +315,7 @@
 
 #define wxUSE_STATUSBAR    0
 
 
 #define wxUSE_STATUSBAR    0
 

-#if defined(__WXMSW__) || defined(__WXMAC__)

 #define wxUSE_NATIVE_STATUSBAR        0
 #define wxUSE_NATIVE_STATUSBAR        0

-#else
-#define wxUSE_NATIVE_STATUSBAR        0
-#endif

 
 #define wxUSE_TOOLBAR 0
 #define wxUSE_TOOLBAR_NATIVE 0
 
 #define wxUSE_TOOLBAR 0
 #define wxUSE_TOOLBAR_NATIVE 0


@@ -447,8 +444,6 @@
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 

-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
-

 
 #define wxUSE_ODBC          0
 
 
 #define wxUSE_ODBC          0
 


@@ -695,6 +690,9 @@
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 

+/* Define if you have __cxa_demangle() in <cxxabi.h> */
+#undef HAVE_CXA_DEMANGLE
+

 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 
 /* Define if you have dlopen() */
 #undef HAVE_DLOPEN
 


@@ -963,6 +961,10 @@
    with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
    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__ */
 
 /* --------------------------------------------------------*
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*