X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5f885c034054a940ee27b5dc6efeb5c94d06a6f..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/gtk/threadno.cpp diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp index 482ab6b496..435f921394 100644 --- a/src/gtk/threadno.cpp +++ b/src/gtk/threadno.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: thread.cpp +// Name: src/gtk/threadno.cpp // Purpose: Solaris thread support // Author: Guilhem Lavaux // Modified by: @@ -8,46 +8,50 @@ // Copyright: (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "thread.h" + +// 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/module.h" #endif #include "wx/wx.h" -#include "wx/module.h" -#include "wx/thread.h" -#include "wx/log.h" wxMutex::wxMutex() { - m_locked = 0; + m_locked = 0; } wxMutex::~wxMutex() { - if (m_locked) - wxLogDebug( "wxMutex warning: destroying a locked mutex (%d locks)\n", m_locked ); + if (m_locked) + wxLogDebug( "wxMutex warning: destroying a locked mutex (%d locks)", m_locked ); } wxMutexError wxMutex::Lock() { - m_locked++; - return wxMUTEX_NO_ERROR; + m_locked++; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::TryLock() { - if (m_locked > 0) - return wxMUTEX_BUSY; - m_locked++; - return wxMUTEX_NO_ERROR; + if (m_locked > 0) + return wxMUTEX_BUSY; + m_locked++; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::Unlock() { - if (m_locked == 0) - return wxMUTEX_UNLOCKED; - m_locked--; - return wxMUTEX_NO_ERROR; + if (m_locked == 0) + return wxMUTEX_UNLOCKED; + m_locked--; + return wxMUTEX_NO_ERROR; } wxCondition::wxCondition() @@ -63,9 +67,9 @@ void wxCondition::Wait(wxMutex& WXUNUSED(mutex)) } bool wxCondition::Wait(wxMutex& WXUNUSED(mutex), unsigned long WXUNUSED(sec), - unsigned long WXUNUSED(nsec)) + unsigned long WXUNUSED(nsec)) { - return FALSE; + return false; } void wxCondition::Signal() @@ -76,31 +80,32 @@ void wxCondition::Broadcast() { } -struct wxThreadInternal { - int thread_id; - void* exit_status; +struct wxThreadInternal +{ + int thread_id; + void* exit_status; }; wxThreadError wxThread::Create() { - p_internal->exit_status = Entry(); - OnExit(); - return wxTHREAD_NO_ERROR; + p_internal->exit_status = Entry(); + OnExit(); + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Destroy() { - return wxTHREAD_NOT_RUNNING; + return wxTHREAD_NOT_RUNNING; } wxThreadError wxThread::Pause() { - return wxTHREAD_NOT_RUNNING; + return wxTHREAD_NOT_RUNNING; } wxThreadError wxThread::Resume() { - return wxTHREAD_NOT_RUNNING; + return wxTHREAD_NOT_RUNNING; } void wxThread::DeferDestroy( bool WXUNUSED(on) ) @@ -113,27 +118,27 @@ void wxThread::TestDestroy() void *wxThread::Join() { - return p_internal->exit_status; + return p_internal->exit_status; } unsigned long wxThread::GetID() const { - return 0; + return 0; } bool wxThread::IsMain() { - return TRUE; + return true; } bool wxThread::IsRunning() const { - return FALSE; + return false; } bool wxThread::IsAlive() const { - return FALSE; + return false; } void wxThread::SetPriority(int WXUNUSED(prio)) { } @@ -143,44 +148,38 @@ wxMutex *wxMainMutex; // controls access to all GUI functions wxThread::wxThread() { - p_internal = new wxThreadInternal(); + p_internal = new wxThreadInternal(); } wxThread::~wxThread() { - Destroy(); - Join(); - delete p_internal; + Destroy(); + Join(); + delete p_internal; } // The default callback just joins the thread and throws away the result. void wxThread::OnExit() { - Join(); + Join(); } +IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) -// Automatic initialization -class wxThreadModule : public wxModule { - DECLARE_DYNAMIC_CLASS(wxThreadModule) -public: - bool OnInit(); - void OnExit(); -}; - -bool wxThreadModule::OnInit() { - wxMainMutex = new wxMutex(); - wxMainMutex->Lock(); - return TRUE; +bool wxThreadModule::OnInit() +{ + wxMainMutex = new wxMutex(); + wxMainMutex->Lock(); + return true; } void wxThreadModule::OnExit() { - wxMainMutex->Unlock(); - delete wxMainMutex; + wxMainMutex->Unlock(); + delete wxMainMutex; } -IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) + void wxMutexGuiEnter() {