handle C++ exception in EVT_{TIMER,IDLE} handlers (#9768)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 54e9204d59350f56ec549e1d3761a1aef6bc72e3..c9e6fbcec4d1c2ae7ed1f9445d6092306f10651d 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -393,7 +393,7 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
             win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) )
     {
         event.SetEventObject(win);
-        win->GetEventHandler()->ProcessEvent(event);
+        win->HandleWindowEvent(event);
 
         if (event.MoreRequested())
             needMore = true;

diff --git a/src/common/timerimpl.cpp b/src/common/timerimpl.cpp
index 4ab6fa8e23950216290c6ae1075ba22be5064a21..c2ac8e8712865e56c09eaf220652e61f02642c85 100644 (file)
--- a/src/common/timerimpl.cpp
+++ b/src/common/timerimpl.cpp
@@ -49,7 +49,7 @@ void wxTimerImpl::SetOwner(wxEvtHandler *owner, int timerid)
 void wxTimerImpl::SendEvent()
 {
     wxTimerEvent event(*m_timer);
-    (void)m_owner->ProcessEvent(event);
+    (void)m_owner->SafelyProcessEvent(event);
 }
 
 bool wxTimerImpl::Start(int milliseconds, bool oneShot)