AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove wxSETranslator() entirely from wxUSE_ON_FATAL_EXCEPTION==0 build (part of #9803)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-08-01 14:22:42 +00:00
parent 76de2296f1
commit b97d1013cf
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/main.cpp
View File

@ -69,7 +69,15 @@ extern int wxEntryCleanupReal(int& argc, wxChar **argv);
#if wxUSE_BASE #if wxUSE_BASE
#if wxUSE_ON_FATAL_EXCEPTION && defined(__VISUALC__) && !defined(__WXWINCE__) // ----------------------------------------------------------------------------
// wrapper wxEntry catching all Win32 exceptions occurring in a wx program
// ----------------------------------------------------------------------------
// wrap real wxEntry in a try-except block to be able to call
// 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 // 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 // a "catch ( ... )" will *always* catch SEH exceptions in it even though
// it should have never been the case... to prevent such catches from // it should have never been the case... to prevent such catches from
@ -91,14 +99,6 @@ extern int wxEntryCleanupReal(int& argc, wxChar **argv);
#define DisableAutomaticSETranslator() #define DisableAutomaticSETranslator()
#endif // __VISUALC__/!__VISUALC__ #endif // __VISUALC__/!__VISUALC__
// ----------------------------------------------------------------------------
// wrapper wxEntry catching all Win32 exceptions occurring in a wx program
// ----------------------------------------------------------------------------
// wrap real wxEntry in a try-except block to be able to call
// OnFatalException() if necessary
#if wxUSE_ON_FATAL_EXCEPTION
// global pointer to exception information, only valid inside OnFatalException, // global pointer to exception information, only valid inside OnFatalException,
// used by wxStackWalker and wxCrashReport // used by wxStackWalker and wxCrashReport
extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL; extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;
@ -214,21 +214,8 @@ int wxEntry(int& argc, wxChar **argv)
#else // !wxUSE_ON_FATAL_EXCEPTION #else // !wxUSE_ON_FATAL_EXCEPTION
#if defined(__VISUALC__) && !defined(__WXWINCE__)
static void
wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
{
// see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
throw;
}
#endif // __VISUALC__
int wxEntry(int& argc, wxChar **argv) int wxEntry(int& argc, wxChar **argv)
{ {
DisableAutomaticSETranslator();
return wxEntryReal(argc, argv); return wxEntryReal(argc, argv);
} }