From c5f885c034054a940ee27b5dc6efeb5c94d06a6f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 28 Dec 1998 15:36:14 +0000 Subject: [PATCH] wxGTK compiles (and links) when configured without threads git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/threadno.cpp | 26 +++++++++++++++++--------- src/gtk1/threadno.cpp | 26 +++++++++++++++++--------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/gtk/threadno.cpp b/src/gtk/threadno.cpp index f6532847ab..482ab6b496 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) ) @@ -181,3 +181,11 @@ void wxThreadModule::OnExit() } IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) + +void wxMutexGuiEnter() +{ +} + +void wxMutexGuiLeave() +{ +} diff --git a/src/gtk1/threadno.cpp b/src/gtk1/threadno.cpp index f6532847ab..482ab6b496 100644 --- a/src/gtk1/threadno.cpp +++ b/src/gtk1/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) ) @@ -181,3 +181,11 @@ void wxThreadModule::OnExit() } IMPLEMENT_DYNAMIC_CLASS(wxThreadModule, wxModule) + +void wxMutexGuiEnter() +{ +} + +void wxMutexGuiLeave() +{ +} -- 2.45.2