Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call wxApp::OnExceptionInMainLoop() when an exception occurs (refactored the change 1.16->1.17)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-03-30 20:52:19 +00:00
parent 6046e57acc
commit d284c07534
1 changed files with 57 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
src/msw/evtloop.cpp
View File

@@ -41,11 +41,6 @@
#include "wx/msw/private.h"
// For MB_TASKMODAL
#ifdef __WXWINCE__
#include "wx/msw/wince/missing.h"
#endif
#if wxUSE_THREADS
#include "wx/thread.h"
@@ -78,13 +73,6 @@ public:
int GetExitCode() const { return m_exitcode; }
bool ShouldExit() const { return m_shouldExit; }
enum wxCatchAllResponse {
catch_continue,
catch_exit,
catch_rethrow
};
wxCatchAllResponse OnCatchAll();
private:
// preprocess a message, return TRUE if processed (i.e. no further
// dispatching required)
@@ -222,26 +210,7 @@ bool wxEventLoopImpl::PreProcessMessage(MSG *msg)
bool wxEventLoopImpl::SendIdleMessage()
{
return wxTheApp->ProcessIdle();
}
// ----------------------------------------------------------------------------
// wxEventLoopImpl exception handling
// ----------------------------------------------------------------------------
wxEventLoopImpl::wxCatchAllResponse wxEventLoopImpl::OnCatchAll()
{
switch (::MessageBox(NULL,
_T("An unhandled exception occurred. 'Abort' will terminate the program,\r\n\
'Retry' will close the current dialog, 'Ignore' will try to continue."),
_T("Unhandled exception"),
MB_ABORTRETRYIGNORE|MB_ICONERROR|MB_TASKMODAL))
{
case IDABORT: return catch_rethrow;
case IDRETRY: return catch_exit;
case IDIGNORE: return catch_continue;
}
return catch_rethrow;
return wxTheApp && wxTheApp->ProcessIdle();
}
// ============================================================================
@@ -281,65 +250,70 @@ int wxEventLoop::Run()
// wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
// something similar here)
#if wxUSE_EXCEPTIONS
bool retryAfterException = false;
do {
retryAfterException=false;
#endif
wxTRY
for ( ;; )
{
for ( ;; )
try
{
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
#endif // wxUSE_EXCEPTIONS
// generate and process idle events for as long as we don't have
// anything else to do
while ( !Pending() && m_impl->SendIdleMessage() )
;
// if the "should exit" flag is set, the loop should terminate but
// not before processing any remaining messages so while Pending()
// returns true, do process them
if ( m_impl->ShouldExit() )
// this is the event loop itself
for ( ;; )
{
while ( Pending() )
Dispatch();
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
break;
// generate and process idle events for as long as we don't
// have anything else to do
while ( !Pending() && m_impl->SendIdleMessage() )
;
// if the "should exit" flag is set, the loop should terminate
// but not before processing any remaining messages so while
// Pending() returns true, do process them
if ( m_impl->ShouldExit() )
{
while ( Pending() )
Dispatch();
break;
}
// a message came or no more idle processing to do, sit in
// Dispatch() waiting for the next message
if ( !Dispatch() )
{
// we got WM_QUIT
break;
}
}
// a message came or no more idle processing to do, sit in
// Dispatch() waiting for the next message
if ( !Dispatch() )
{
// we got WM_QUIT
break;
}
}
}
wxCATCH_ALL(
switch (m_impl->OnCatchAll()) {
case wxEventLoopImpl::catch_continue:
retryAfterException=true;
break;
case wxEventLoopImpl::catch_exit:
OnExit();
break;
case wxEventLoopImpl::catch_rethrow:
OnExit();
// should be replaced with wx macro, but
// there is none yet. OTOH, wxCATCH_ALL isn't
// expanded unless wxUSE_EXCEPTIONS, so its
// safe to use throw here.
throw;
default:
break;
}
)
#if wxUSE_EXCEPTIONS
} while (retryAfterException);
#endif
// exit the outer loop as well
break;
}
catch ( ... )
{
try
{
if ( !wxTheApp || !wxTheApp->OnExceptionInMainLoop() )
{
OnExit();
break;
}
//else: continue running the event loop
}
catch ( ... )
{
// OnException() throwed, possibly rethrowing the same
// exception again: very good, but we still need OnExit() to
// be called
OnExit();
throw;
}
}
}
#endif // wxUSE_EXCEPTIONS
return m_impl->GetExitCode();
}