X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6773ae198f4ff542231d85b4df7283af143d82eb..866592d872daa1f4e3d44948d7d3a6c90b0af9d0:/src/gtk/threadsgi.cpp diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp index 66b6b0da7b..217f67d7d9 100644 --- a/src/gtk/threadsgi.cpp +++ b/src/gtk/threadsgi.cpp @@ -21,8 +21,13 @@ #include "wx/thread.h" #include "wx/module.h" #include "wx/utils.h" +#include "wx/log.h" -enum thread_state { +#include "gdk/gdk.h" +#include "gtk/gtk.h" + +enum thread_state +{ STATE_IDLE = 0, STATE_RUNNING, STATE_CANCELED, @@ -57,8 +62,7 @@ wxMutex::wxMutex() wxMutex::~wxMutex() { if (m_locked > 0) - wxDebugMsg("wxMutex warning: freeing a locked mutex (%d locks)\n", - m_locked); + wxLogDebug( "wxMutex warning: freeing a locked mutex (%d locks)\n", m_locked ); delete p_internal; } @@ -66,24 +70,24 @@ wxMutexError wxMutex::Lock() { spin_lock(&(p_internal->p_mutex)); m_locked++; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::TryLock() { if (acquire_lock(&(p_internal->p_mutex)) != 0) - return MUTEX_BUSY; + return wxMUTEX_BUSY; m_locked++; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::Unlock() { if (m_locked == 0) - return MUTEX_UNLOCKED; + return wxMUTEX_UNLOCKED; release_lock(&(p_internal->p_mutex)); m_locked--; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } // GL: Don't know how it works on SGI. Wolfram ? @@ -132,13 +136,13 @@ void wxThread::Exit(void* status) wxThreadError wxThread::Create() { if (p_internal->state != STATE_IDLE) - return THREAD_RUNNING; + return wxTHREAD_RUNNING; p_internal->state = STATE_RUNNING; if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) { p_internal->state = STATE_IDLE; - return THREAD_NO_RESOURCE; + return wxTHREAD_NO_RESOURCE; } - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Destroy() @@ -146,17 +150,17 @@ wxThreadError wxThread::Destroy() if (p_internal->state == STATE_RUNNING) p_internal->state = STATE_CANCELED; - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Pause() { - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Resume() { - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } void *wxThread::Join() @@ -234,21 +238,32 @@ void wxThread::OnExit() } // Global initialization -class wxThreadModule : public wxModule { - DECLARE_DYNAMIC_CLASS(wxThreadModule) + +class wxThreadModule : public wxModule +{ public: - virtual bool OnInit() { + virtual bool OnInit(); + virtual void OnExit(); + +private: + DECLARE_DYNAMIC_CLASS(wxThreadModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) + +bool wxThreadModule::OnInit() +{ wxMainMutex = new wxMutex(); wxThreadGuiInit(); p_mainid = (int)getpid(); wxMainMutex->Lock(); - } + return TRUE; +} - virtual void OnExit() { +void wxThreadModule::OnExit() +{ wxMainMutex->Unlock(); wxThreadGuiExit(); delete wxMainMutex; - } -}; +} -IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule)