From 5aad18a52bd34084e11c13753204c03aa3ff1686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 22 Dec 2005 23:11:36 +0000 Subject: [PATCH] reverted previous accidental commit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/appcmn.cpp | 36 ------------------------------------ 1 file changed, 36 deletions(-) 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 // ----------------------------------------------------------------------------