reverted previous accidental commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
48e5284db6
commit
5aad18a52b
@ -42,7 +42,6 @@
|
||||
#include "wx/thread.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/ptr_scpd.h"
|
||||
#include "wx/evtloop.h"
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
#include "wx/msw/private.h" // includes windows.h for LOGFONT
|
||||
@ -62,9 +61,7 @@ WX_CHECK_BUILD_OPTIONS("wxCore")
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// this defines wxEventLoopPtr
|
||||
#if wxUSE_EVTLOOP_IN_APP
|
||||
wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
|
||||
#endif
|
||||
|
||||
// ============================================================================
|
||||
// wxAppBase implementation
|
||||
@ -466,39 +463,6 @@ void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
|
||||
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// exception handling
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_EXCEPTIONS
|
||||
|
||||
void wxAppBase::HandleEvent(wxEvtHandler *handler,
|
||||
wxEventFunction func,
|
||||
wxEvent& event) const
|
||||
{
|
||||
// by default, call wxApp::OnExceptionInMainLoop if an exception occurs
|
||||
try
|
||||
{
|
||||
handler->DoHandleEvent(func, event);
|
||||
}
|
||||
catch ( ... )
|
||||
{
|
||||
if ( !wxConstCast(this, wxAppBase)->OnExceptionInMainLoop() )
|
||||
{
|
||||
#if wxUSE_EVTLOOP_IN_APP
|
||||
wxEventLoop *loop = wxEventLoop::GetActive();
|
||||
if ( loop )
|
||||
loop->Exit(-1);
|
||||
#else
|
||||
wxConstCast(this, wxAppBase)->ExitMainLoop();
|
||||
#endif
|
||||
}
|
||||
//else: continue running the event loop
|
||||
}
|
||||
}
|
||||
|
||||
#endif // wxUSE_EXCEPTIONS
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxGUIAppTraitsBase
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user