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

reverted last change: wxGTK-specific wxMutextGui code breaks linkage of wxBase programs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-01-18 19:53:36 +00:00
parent 6a6c9417a8
commit 5a2d9e121f
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/unix/threadpsx.cpp
View File

@@ -132,12 +132,10 @@ static wxMutex *gs_mutexDeleteThread = (wxMutex *)NULL;
// gs_nThreadsBeingDeleted will have been deleted // gs_nThreadsBeingDeleted will have been deleted
static wxCondition *gs_condAllDeleted = (wxCondition *)NULL; static wxCondition *gs_condAllDeleted = (wxCondition *)NULL;
#ifndef __WXGTK20__
// this mutex must be acquired before any call to a GUI function // this mutex must be acquired before any call to a GUI function
// (it's not inside #if wxUSE_GUI because this file is compiled as part // (it's not inside #if wxUSE_GUI because this file is compiled as part
// of wxBase) // of wxBase)
static wxMutex *gs_mutexGui = NULL; static wxMutex *gs_mutexGui = NULL;
#endif
// when we wait for a thread to exit, we're blocking on a condition which the // when we wait for a thread to exit, we're blocking on a condition which the
// thread signals in its SignalExit() method -- but this condition can't be a // thread signals in its SignalExit() method -- but this condition can't be a
@@ -1626,10 +1624,8 @@ bool wxThreadModule::OnInit()
gs_mutexAllThreads = new wxMutex(); gs_mutexAllThreads = new wxMutex();
#ifndef __WXGTK20__
gs_mutexGui = new wxMutex(); gs_mutexGui = new wxMutex();
gs_mutexGui->Lock(); gs_mutexGui->Lock();
#endif
gs_mutexDeleteThread = new wxMutex(); gs_mutexDeleteThread = new wxMutex();
gs_condAllDeleted = new wxCondition(*gs_mutexDeleteThread); gs_condAllDeleted = new wxCondition(*gs_mutexDeleteThread);
@@ -1682,11 +1678,9 @@ void wxThreadModule::OnExit()
delete gs_mutexAllThreads; delete gs_mutexAllThreads;
#ifndef __WXGTK20__
// destroy GUI mutex // destroy GUI mutex
gs_mutexGui->Unlock(); gs_mutexGui->Unlock();
delete gs_mutexGui; delete gs_mutexGui;
#endif
// and free TLD slot // and free TLD slot
(void)pthread_key_delete(gs_keySelf); (void)pthread_key_delete(gs_keySelf);
@@ -1733,7 +1727,6 @@ static void DeleteThread(wxThread *This)
} }
} }
#ifndef __WXGTK20__
void wxMutexGuiEnter() void wxMutexGuiEnter()
{ {
gs_mutexGui->Lock(); gs_mutexGui->Lock();
@@ -1743,7 +1736,6 @@ void wxMutexGuiLeave()
{ {
gs_mutexGui->Unlock(); gs_mutexGui->Unlock();
} }
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// include common implementation code // include common implementation code