Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MutexGui calls in WakeUpIdle are not needed under GTK2, fixing the long-standing "random" lockups experienced when using wxPostEvent from a thread. Collaboration with RR.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Hock
2004-10-25 03:24:42 +00:00
parent 7de8eddef5
commit 19722331f8
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/app.cpp
View File

@@ -164,20 +164,31 @@ bool wxApp::Yield(bool onlyIfNeeded)
// wxWakeUpIdle // wxWakeUpIdle
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// RR/KH: The wxMutexGui calls are not needed on GTK2 according to
// the GTK faq, http://www.gtk.org/faq/#AEN500
// The calls to gdk_threads_enter() and leave() are specifically noted
// as not being necessary. The MutexGui calls are still left in for GTK1.
// Eliminating the MutexGui calls fixes the long-standing "random" lockup
// when using wxPostEvent (which calls WakeUpIdle) from a thread.
void wxApp::WakeUpIdle() void wxApp::WakeUpIdle()
{ {
#ifndef __WXGTK20__
#if wxUSE_THREADS #if wxUSE_THREADS
if (!wxThread::IsMain()) if (!wxThread::IsMain())
wxMutexGuiEnter(); wxMutexGuiEnter();
#endif #endif // wxUSE_THREADS_
#endif // __WXGTK2__
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
#ifndef __WXGTK20__
#if wxUSE_THREADS #if wxUSE_THREADS
if (!wxThread::IsMain()) if (!wxThread::IsMain())
wxMutexGuiLeave(); wxMutexGuiLeave();
#endif #endif // wxUSE_THREADS_
#endif // __WXGTK2__
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

15
src/gtk1/app.cpp
View File

@@ -164,20 +164,31 @@ bool wxApp::Yield(bool onlyIfNeeded)
// wxWakeUpIdle // wxWakeUpIdle
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// RR/KH: The wxMutexGui calls are not needed on GTK2 according to
// the GTK faq, http://www.gtk.org/faq/#AEN500
// The calls to gdk_threads_enter() and leave() are specifically noted
// as not being necessary. The MutexGui calls are still left in for GTK1.
// Eliminating the MutexGui calls fixes the long-standing "random" lockup
// when using wxPostEvent (which calls WakeUpIdle) from a thread.
void wxApp::WakeUpIdle() void wxApp::WakeUpIdle()
{ {
#ifndef __WXGTK20__
#if wxUSE_THREADS #if wxUSE_THREADS
if (!wxThread::IsMain()) if (!wxThread::IsMain())
wxMutexGuiEnter(); wxMutexGuiEnter();
#endif #endif // wxUSE_THREADS_
#endif // __WXGTK2__
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
#ifndef __WXGTK20__
#if wxUSE_THREADS #if wxUSE_THREADS
if (!wxThread::IsMain()) if (!wxThread::IsMain())
wxMutexGuiLeave(); wxMutexGuiLeave();
#endif #endif // wxUSE_THREADS_
#endif // __WXGTK2__
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------