X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b11af9ed9d759a86275a4d28d59ba17b7f2c8d69..b97d1013cf34ee9e844fed490cca849c41bd4f8f:/src/dfb/app.cpp diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp index c78010f081..093bd63642 100644 --- a/src/dfb/app.cpp +++ b/src/dfb/app.cpp @@ -19,6 +19,7 @@ #include "wx/app.h" #include "wx/evtloop.h" +#include "wx/thread.h" #include "wx/dfb/private.h" #include "wx/private/fontmgr.h" @@ -28,10 +29,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxAppBase::OnIdle) -END_EVENT_TABLE() - wxApp::wxApp() { } @@ -156,7 +153,7 @@ void wxApp::WakeUpIdle() wxMutexGuiEnter(); #endif - wxEventLoop * const loop = wxEventLoop::GetActive(); + wxEventLoopBase * const loop = wxEventLoop::GetActive(); if ( loop ) loop->WakeUp(); @@ -188,9 +185,12 @@ bool wxApp::Yield(bool onlyIfNeeded) s_inYield = true; +#if wxUSE_LOG wxLog::Suspend(); +#endif // wxUSE_LOG - wxEventLoop * const loop = wxEventLoop::GetActive(); + wxEventLoop * const + loop = wx_static_cast(wxEventLoop *, wxEventLoop::GetActive()); if ( loop ) loop->Yield(); @@ -199,7 +199,9 @@ bool wxApp::Yield(bool onlyIfNeeded) // OnUpdateUI() which is a nice (and desired) side effect) while ( ProcessIdle() ) {} +#if wxUSE_LOG wxLog::Resume(); +#endif // wxUSE_LOG s_inYield = false;