X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ecd8ca468b0650612562f3db13483fe84fad930..3225a4b8b8656f25dac6cb20684a3c2c273cf796:/src/dfb/app.cpp?ds=sidebyside diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp index 093bd63642..0cc0506b3f 100644 --- a/src/dfb/app.cpp +++ b/src/dfb/app.cpp @@ -148,62 +148,9 @@ bool wxApp::SetDisplayMode(const wxVideoMode& mode) void wxApp::WakeUpIdle() { -#if wxUSE_THREADS - if (!wxThread::IsMain()) - wxMutexGuiEnter(); -#endif - + // we don't need a mutex here, since we use the wxConsoleEventLoop + // and wxConsoleEventLoop::WakeUp() is thread-safe wxEventLoopBase * const loop = wxEventLoop::GetActive(); if ( loop ) loop->WakeUp(); - -#if wxUSE_THREADS - if (!wxThread::IsMain()) - wxMutexGuiLeave(); -#endif -} - - -bool wxApp::Yield(bool onlyIfNeeded) -{ -#if wxUSE_THREADS - if ( !wxThread::IsMain() ) - return true; // can't process events from other threads -#endif // wxUSE_THREADS - - static bool s_inYield = false; - - if ( s_inYield ) - { - if ( !onlyIfNeeded ) - { - wxFAIL_MSG( wxT("wxYield called recursively" ) ); - } - - return false; - } - - s_inYield = true; - -#if wxUSE_LOG - wxLog::Suspend(); -#endif // wxUSE_LOG - - wxEventLoop * const - loop = wx_static_cast(wxEventLoop *, wxEventLoop::GetActive()); - if ( loop ) - loop->Yield(); - - // it's necessary to call ProcessIdle() to update the frames sizes which - // might have been changed (it also will update other things set from - // OnUpdateUI() which is a nice (and desired) side effect) - while ( ProcessIdle() ) {} - -#if wxUSE_LOG - wxLog::Resume(); -#endif // wxUSE_LOG - - s_inYield = false; - - return true; }