X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e96098220da76e5e8c02c9960d1e25234f96e3b..da8b1d4b3b535aba94d04494f5b6e2b3e47901ee:/include/wx/msw/seh.h

diff --git a/include/wx/msw/seh.h b/include/wx/msw/seh.h
index caab1a4370..7fcfb7a719 100644
--- a/include/wx/msw/seh.h
+++ b/include/wx/msw/seh.h
@@ -47,7 +47,7 @@
     #define wxSEH_HANDLE(rc)
 #endif // wxUSE_ON_FATAL_EXCEPTION
 
-#if defined(__VISUALC__) && !defined(__WXWINCE__)
+#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__)
     #include <eh.h>
 
     // C++ exception to structured exceptions translator: we need it in order
@@ -55,11 +55,11 @@
     // as division by 0 or access violation) to C++ pseudo-exceptions
     extern void wxSETranslator(unsigned int code, EXCEPTION_POINTERS *ep);
 
-    // up to VC 7.1 this warning ("calling _set_se_translator() requires /EHa")
+    // up to VC 9 this warning ("calling _set_se_translator() requires /EHa")
     // is harmless and it's easier to suppress it than use different makefiles
     // for VC5 and 6 (which don't support /EHa at all) and VC7 (which does
     // accept it but it seems to change nothing for it anyhow)
-    #if __VISUALC__ <= 1310
+    #if __VISUALC__ < 1600
         #pragma warning(disable: 4535)
     #endif