X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/926c550dc5347b149be7a5f02dd452865a8a524d..debdd17e991830c4ced82f5e4672fe2b32a684c2:/src/gtk/threadno.cpp diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp index f6532847ab..7299440456 100644 --- a/src/gtk/threadno.cpp +++ b/src/gtk/threadno.cpp @@ -31,23 +31,23 @@ wxMutex::~wxMutex() wxMutexError wxMutex::Lock() { m_locked++; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } wxMutexError wxMutex::TryLock() { if (m_locked > 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; m_locked--; - return MUTEX_NO_ERROR; + return wxMUTEX_NO_ERROR; } wxCondition::wxCondition() @@ -85,22 +85,22 @@ wxThreadError wxThread::Create() { p_internal->exit_status = Entry(); OnExit(); - return THREAD_NO_ERROR; + return wxTHREAD_NO_ERROR; } wxThreadError wxThread::Destroy() { - return THREAD_NOT_RUNNING; + return wxTHREAD_NOT_RUNNING; } wxThreadError wxThread::Pause() { - return THREAD_NOT_RUNNING; + return wxTHREAD_NOT_RUNNING; } wxThreadError wxThread::Resume() { - return THREAD_NOT_RUNNING; + return wxTHREAD_NOT_RUNNING; } void wxThread::DeferDestroy( bool WXUNUSED(on) ) @@ -160,15 +160,10 @@ void wxThread::OnExit() } -// Automatic initialization -class wxThreadModule : public wxModule { - DECLARE_DYNAMIC_CLASS(wxThreadModule) -public: - bool OnInit(); - void OnExit(); -}; +IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) -bool wxThreadModule::OnInit() { +bool wxThreadModule::OnInit() +{ wxMainMutex = new wxMutex(); wxMainMutex->Lock(); return TRUE; @@ -180,4 +175,12 @@ void wxThreadModule::OnExit() delete wxMainMutex; } -IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) + + +void wxMutexGuiEnter() +{ +} + +void wxMutexGuiLeave() +{ +}