X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..f363cee882672e147340240cf0bb194a68e37833:/src/gtk1/threadsgi.cpp diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp index 57596edb67..830c0eb1d2 100644 --- a/src/gtk1/threadsgi.cpp +++ b/src/gtk1/threadsgi.cpp @@ -1,35 +1,35 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: threadsgi.cpp +// Name: src/gtk1/threadsgi.cpp // Purpose: wxThread (SGI) Implementation // Author: Original from Wolfram Gloger/Guilhem Lavaux // Modified by: // Created: 04/22/98 -// RCS-ID: $Id$ // Copyright: (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998) -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "thread.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#include "wx/thread.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/module.h" +#endif + #include #include #include #include #include -#include "wx/thread.h" -#include "wx/module.h" -#include "wx/utils.h" -#include "wx/log.h" #include "gdk/gdk.h" #include "gtk/gtk.h" -enum thread_state +enum thread_state { STATE_IDLE = 0, STATE_RUNNING, @@ -65,7 +65,9 @@ wxMutex::wxMutex() wxMutex::~wxMutex() { if (m_locked > 0) + { wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked ); + } delete p_internal; } @@ -87,7 +89,7 @@ wxMutexError wxMutex::TryLock() wxMutexError wxMutex::Unlock() { if (m_locked == 0) - return wxMUTEX_UNLOCKED; + return wxMUTEX_UNLOCKED; release_lock(&(p_internal->p_mutex)); m_locked--; return wxMUTEX_NO_ERROR; @@ -123,7 +125,7 @@ void wxThreadPrivate::SprocStart(void *ptr) thr->p_internal->thread_id = getpid(); thr->p_internal->exit_status = 0; - status = thr->Entry(); + status = thr->CallEntry(); thr->Exit(status); } @@ -254,13 +256,13 @@ private: IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) -bool wxThreadModule::OnInit() +bool wxThreadModule::OnInit() { wxMainMutex = new wxMutex(); wxThreadGuiInit(); p_mainid = (int)getpid(); wxMainMutex->Lock(); - return TRUE; + return true; } void wxThreadModule::OnExit() @@ -269,4 +271,3 @@ void wxThreadModule::OnExit() wxThreadGuiExit(); delete wxMainMutex; } -