Move "static" keyword out from wxDEPRECATED() macros to placate icc.

[wxWidgets.git] / include / wx / msw / seh.h

diff --git a/include/wx/msw/seh.h b/include/wx/msw/seh.h
index ae7c2f9d26d2ba7c18679425b18f419da38d5b08..7fcfb7a7196a64f8f03136980418284e6385257e 100644 (file)
--- a/include/wx/msw/seh.h
+++ b/include/wx/msw/seh.h
@@ -1,40 +1,74 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/seh.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/msw/seh.h

-// Purpose:     helpers for the structured exception handling (SEH) under Win32
+// Purpose:     declarations for SEH (structured exceptions handling) support

 // Author:      Vadim Zeitlin
 // Author:      Vadim Zeitlin

-// Modified by:
-// Created:     13.07.2003
+// Created:     2006-04-26

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_SEH_H_
 #define _WX_MSW_SEH_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MSW_SEH_H_
 #define _WX_MSW_SEH_H_
 

-#include "wx/defs.h"
-

 #if wxUSE_ON_FATAL_EXCEPTION
 
 #if wxUSE_ON_FATAL_EXCEPTION
 

-// ----------------------------------------------------------------------------
-// wxSEHReport: this class is used as a namespace for the SEH-related functions
-// ----------------------------------------------------------------------------
-
-struct WXDLLIMPEXP_BASE wxSEHReport
-{
-    // set the name of the file to which the report is written, it is
-    // constructed from the .exe name by default
-    static void SetFileName(const wxChar *filename);
+    // the exception handler which should be called from the exception filter
+    //
+    // it calsl wxApp::OnFatalException() if possible
+    extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);

 
 

-    // return the current file name
-    static const wxChar *GetFileName();
+    // helper macro for wxSEH_HANDLE
+#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
+    #define wxSEH_DUMMY_RETURN(rc) return rc;
+#else
+    #define wxSEH_DUMMY_RETURN(rc)
+#endif

 
 

-    // write the exception report to the file, return true if it could be done
-    // or false otherwise
-    static bool Generate();
-};
+    // macros which allow to avoid many #if wxUSE_ON_FATAL_EXCEPTION in the code
+    // which uses them
+    #define wxSEH_TRY __try
+    #define wxSEH_IGNORE __except ( EXCEPTION_EXECUTE_HANDLER ) { }
+    #define wxSEH_HANDLE(rc)                                                  \
+        __except ( wxGlobalSEHandler(GetExceptionInformation()) )             \
+        {                                                                     \
+            /* use the same exit code as abort() */                           \
+            ::ExitProcess(3);                                                 \
+                                                                              \
+            wxSEH_DUMMY_RETURN(rc)                                            \
+        }

 
 

+#else // wxUSE_ON_FATAL_EXCEPTION
+    #define wxSEH_TRY
+    #define wxSEH_IGNORE
+    #define wxSEH_HANDLE(rc)

 #endif // wxUSE_ON_FATAL_EXCEPTION
 
 #endif // wxUSE_ON_FATAL_EXCEPTION
 

-#endif // _WX_MSW_SEH_H_
+#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__)
+    #include <eh.h>
+
+    // C++ exception to structured exceptions translator: we need it in order
+    // to prevent VC++ from "helpfully" translating structured exceptions (such
+    // as division by 0 or access violation) to C++ pseudo-exceptions
+    extern void wxSETranslator(unsigned int code, EXCEPTION_POINTERS *ep);

 
 

+    // 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__ < 1600
+        #pragma warning(disable: 4535)
+    #endif
+
+    // note that the SE translator must be called wxSETranslator!
+    #define DisableAutomaticSETranslator() _set_se_translator(wxSETranslator)
+#else // !__VISUALC__
+    // the other compilers do nothing as stupid by default so nothing to do for
+    // them
+    #define DisableAutomaticSETranslator()
+#endif // __VISUALC__/!__VISUALC__
+
+#endif // _WX_MSW_SEH_H_