From 5a2d9e121fb80a2cb0614c57ffa73eca178cda41 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 18 Jan 2007 19:53:36 +0000 Subject: [PATCH] reverted last change: wxGTK-specific wxMutextGui code breaks linkage of wxBase programs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/threadpsx.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp index ad7585062f..ff291daa3f 100644 --- a/src/unix/threadpsx.cpp +++ b/src/unix/threadpsx.cpp @@ -132,12 +132,10 @@ static wxMutex *gs_mutexDeleteThread = (wxMutex *)NULL; // gs_nThreadsBeingDeleted will have been deleted static wxCondition *gs_condAllDeleted = (wxCondition *)NULL; -#ifndef __WXGTK20__ // 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 // of wxBase) static wxMutex *gs_mutexGui = NULL; -#endif // 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 @@ -1626,10 +1624,8 @@ bool wxThreadModule::OnInit() gs_mutexAllThreads = new wxMutex(); -#ifndef __WXGTK20__ gs_mutexGui = new wxMutex(); gs_mutexGui->Lock(); -#endif gs_mutexDeleteThread = new wxMutex(); gs_condAllDeleted = new wxCondition(*gs_mutexDeleteThread); @@ -1682,11 +1678,9 @@ void wxThreadModule::OnExit() delete gs_mutexAllThreads; -#ifndef __WXGTK20__ // destroy GUI mutex gs_mutexGui->Unlock(); delete gs_mutexGui; -#endif // and free TLD slot (void)pthread_key_delete(gs_keySelf); @@ -1733,7 +1727,6 @@ static void DeleteThread(wxThread *This) } } -#ifndef __WXGTK20__ void wxMutexGuiEnter() { gs_mutexGui->Lock(); @@ -1743,7 +1736,6 @@ void wxMutexGuiLeave() { gs_mutexGui->Unlock(); } -#endif // ---------------------------------------------------------------------------- // include common implementation code