improved wxMac event loop implementation and refactored the code to share it with wxMSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-01-12 23:06:26 +00:00
parent 4d90072c22
commit c8026dea6c
14 changed files with 2300 additions and 2027 deletions

View File

@@ -178,7 +178,7 @@ bool wxEventLoop::PreProcessMessage(WXMSG *msg)
if ( wnd->MSWProcessMessage((WXMSG *)msg) )
return true;
}
// Stop at first top level window (as per comment above).
// If we don't do this, pressing ESC on a modal dialog shown as child of a modal
// dialog with wxID_CANCEL will cause the parent dialog to be closed, for example
@@ -194,106 +194,19 @@ bool wxEventLoop::PreProcessMessage(WXMSG *msg)
// wxEventLoop running and exiting
// ----------------------------------------------------------------------------
int wxEventLoop::Run()
// ----------------------------------------------------------------------------
// wxEventLoopManual customization
// ----------------------------------------------------------------------------
void wxEventLoop::OnNextIteration()
{
// event loops are not recursive, you need to create another loop!
wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
// ProcessIdle() and Dispatch() below may throw so the code here should
// be exception-safe, hence we must use local objects for all actions we
// should undo
wxEventLoopActivator activate(this);
// we must ensure that OnExit() is called even if an exception is thrown
// from inside Dispatch() but we must call it from Exit() in normal
// situations because it is supposed to be called synchronously,
// wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
// something similar here)
#if wxUSE_EXCEPTIONS
for ( ;; )
{
try
{
#endif // wxUSE_EXCEPTIONS
// this is the event loop itself
for ( ;; )
{
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
// generate and process idle events for as long as we don't
// have anything else to do
while ( !Pending() && (wxTheApp && wxTheApp->ProcessIdle()) )
;
// 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_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;
}
}
#if wxUSE_EXCEPTIONS
// 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_exitcode;
#if wxUSE_THREADS
wxMutexGuiLeaveOrEnter();
#endif // wxUSE_THREADS
}
void wxEventLoop::Exit(int rc)
void wxEventLoop::WakeUp()
{
wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
m_exitcode = rc;
m_shouldExit = true;
OnExit();
// all we have to do to exit from the loop is to (maybe) wake it up so that
// it can notice that Exit() had been called
//
// in particular, we do *not* use PostQuitMessage() here because we're not
// sure that WM_QUIT is going to be processed by the correct event loop: it
// is possible that another one is started before this one has a chance to
// process WM_QUIT
::PostMessage(NULL, WM_NULL, 0, 0);
}