set wxUSE_CRASHREPORT and wxUSE_STACKWALKER to 0 as well, and not only wxUSE_ON_FATAL...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index d49aba144125dad89f9ef26383ebe96e8a4ad719..a494508e6c327f576880feaddd1de606856d9f7c 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -120,12 +120,7 @@
 // Default is 1
 //
 // Recommended setting: 1 if your compiler supports it.
 // Default is 1
 //
 // Recommended setting: 1 if your compiler supports it.

-#if defined(_MSC_VER) || \
-    (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
-    #define wxUSE_ON_FATAL_EXCEPTION 1
-#else
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+#define wxUSE_ON_FATAL_EXCEPTION 1

 
 // Set this to 1 to be able to generate a human-readable (unlike
 // machine-readable minidumop created by wxCrashReport::Generate()) stack back
 
 // Set this to 1 to be able to generate a human-readable (unlike
 // machine-readable minidumop created by wxCrashReport::Generate()) stack back


@@ -1132,6 +1127,21 @@
 // Recommended setting: 1, set to 0 if your programs never crash
 #define wxUSE_CRASHREPORT 1
 
 // Recommended setting: 1, set to 0 if your programs never crash
 #define wxUSE_CRASHREPORT 1
 

+
+// all of the settings below require SEH support (__try/__catch) and can't work
+// without it
+#if !defined(_MSC_VER) && \
+    (!defined(__BORLANDC__) || __BORLANDC__ < 0x0550)
+    #undef wxUSE_ON_FATAL_EXCEPTION
+    #define wxUSE_ON_FATAL_EXCEPTION 0
+
+    #undef wxUSE_CRASHREPORT
+    #define wxUSE_CRASHREPORT 0
+
+    #undef wxUSE_STACKWALKER
+    #define wxUSE_STACKWALKER 0
+#endif // compiler doesn't support SEH
+

 // ----------------------------------------------------------------------------
 // obsolete settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // obsolete settings
 // ----------------------------------------------------------------------------