X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48e5284db6d6f1dab46a81a4ae0d0438ea37bd6e..98cb8dcb0cf3b0e660f1f67e1c02451ab10257de:/src/common/appcmn.cpp diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index cae7033056..1e30f70f15 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -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 // ----------------------------------------------------------------------------