X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/39ea2103cdaadd61974b9746cac2315183ef6720..ccaf2891c9082773460c50c7eb7a910ea51e7003:/include/wx/msw/seh.h

diff --git a/include/wx/msw/seh.h b/include/wx/msw/seh.h
index b9d26b7b67..b2919ac288 100644
--- a/include/wx/msw/seh.h
+++ b/include/wx/msw/seh.h
@@ -19,7 +19,7 @@
     extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);
 
     // helper macro for wxSEH_HANDLE
-#if defined(__VISUALC__) && (__VISUALC__ <= 1200)
+#if defined(__BORLANDC__) || (defined(__VISUALC__) && (__VISUALC__ <= 1200))
     // some compilers don't understand that this code is unreachable and warn
     // about no value being returned from the function without it, so calm them
     // down
@@ -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 11 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
+    // 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__ < 1800
         #pragma warning(disable: 4535)
     #endif