disable wxUSE_EXCEPTIONS when compiling with VC++ but without /GX (a.k.a. /EHsc)...

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 61ada5424bcee5b69377be933808970997a20b80..1de81cba3d524208f532b0facf4c573fd90d1616 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -56,6 +56,12 @@
 #   define wxUSE_EXCEPTIONS 0
 #endif /* wxNO_EXCEPTIONS */
 
 #   define wxUSE_EXCEPTIONS 0
 #endif /* wxNO_EXCEPTIONS */
 

+/* we also must disable exceptions if compiler doesn't support them */
+#if defined(_MSC_VER) && !defined(_CPPUNWIND)
+#   undef wxUSE_EXCEPTIONS
+#   define wxUSE_EXCEPTIONS 0
+#endif /* VC++ without exceptions support */
+

 
 /*
    tests for non GUI features
 
 /*
    tests for non GUI features