disable warning about _set_se_translator() requiring /EHa for VC9 too (it was disable...

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

diff --git a/include/wx/msw/seh.h b/include/wx/msw/seh.h
index edcefb8fd35121bba4968d8306cf27835ef44472..7fcfb7a7196a64f8f03136980418284e6385257e 100644 (file)
--- a/include/wx/msw/seh.h
+++ b/include/wx/msw/seh.h
@@ -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
 

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index 5c11efd693bd949b9ae0a67147ec2182ed63171a..17b5c1c88ab8c595286668e3036b9593dce1d11b 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -77,28 +77,6 @@ extern int wxEntryCleanupReal(int& argc, wxChar **argv);
 // OnFatalException() if necessary
 #if wxUSE_ON_FATAL_EXCEPTION
 
-#if defined(__VISUALC__) && !defined(__WXWINCE__)
-    // VC++ (at least from 4.0 up to version 7.1) is incredibly broken in that
-    // a "catch ( ... )" will *always* catch SEH exceptions in it even though
-    // it should have never been the case... to prevent such catches from
-    // stealing the exceptions from our wxGlobalSEHandler which is only called
-    // if the exception is not handled elsewhere, we have to also call it from
-    // a special SEH translator function which is called by VC CRT when a Win32
-    // exception occurs
-
-    // this warns that /EHa (async exceptions) should be used when using
-    // _set_se_translator but, in fact, this doesn't seem to change anything
-    // with VC++ up to 8.0
-    #if _MSC_VER <= 1400
-        #pragma warning(disable:4535)
-    #endif
-
-    // note that the SE translator must be called wxSETranslator!
-    #define DisableAutomaticSETranslator() _set_se_translator(wxSETranslator)
-#else // !__VISUALC__
-    #define DisableAutomaticSETranslator()
-#endif // __VISUALC__/!__VISUALC__
-
 // global pointer to exception information, only valid inside OnFatalException,
 // used by wxStackWalker and wxCrashReport
 extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;