From c1d1a5ad5e50b6ffb1898c942216d90f5007a3ad Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 11 Apr 2014 04:48:12 +0000 Subject: [PATCH] build fix for wxUSE_THREADS==0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/unix/private/wakeuppipe.h | 10 +++------- src/unix/evtloopunix.cpp | 4 ++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/unix/private/wakeuppipe.h b/include/wx/unix/private/wakeuppipe.h index a601478a9f..5bd6db870a 100644 --- a/include/wx/unix/private/wakeuppipe.h +++ b/include/wx/unix/private/wakeuppipe.h @@ -64,10 +64,10 @@ private: // This class can be used from multiple threads, i.e. its WakeUp() can be // called concurrently. -#if wxUSE_THREADS class wxWakeUpPipeMT : public wxWakeUpPipe { +#if wxUSE_THREADS public: wxWakeUpPipeMT() { } @@ -90,12 +90,8 @@ public: private: // Protects access to m_pipeIsEmpty. wxCriticalSection m_pipeLock; + +#endif // wxUSE_THREADS }; -#else // !wxUSE_THREADS - -typedef wxWakeUpPipe wxWakeUpPipeMT; - -#endif // wxUSE_THREADS/!wxUSE_THREADS - #endif // _WX_UNIX_PRIVATE_WAKEUPPIPE_H_ diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp index aa991aec89..689b1b136a 100644 --- a/src/unix/evtloopunix.cpp +++ b/src/unix/evtloopunix.cpp @@ -201,7 +201,11 @@ int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout) void wxConsoleEventLoop::WakeUp() { +#if wxUSE_THREADS m_wakeupPipe->WakeUp(); +#else + m_wakeupPipe->WakeUpNoLock(); +#endif } void wxConsoleEventLoop::OnNextIteration()