X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ccfebab0925dd4bd5ad1671ad290ebc3141d782..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/unix/evtloop.h diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h index 972b3f7838..2e02cf358a 100644 --- a/include/wx/unix/evtloop.h +++ b/include/wx/unix/evtloop.h @@ -17,9 +17,9 @@ // wxConsoleEventLoop // ---------------------------------------------------------------------------- +class wxEventLoopSource; class wxFDIODispatcher; -class wxUnixEventLoopSource; -class wxWakeUpPipe; +class wxWakeUpPipeMT; class WXDLLIMPEXP_BASE wxConsoleEventLoop #ifdef __WXOSX__ @@ -41,18 +41,16 @@ public: virtual bool IsOk() const { return m_dispatcher != NULL; } virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; } -#if wxUSE_EVENTLOOP_SOURCE - virtual wxEventLoopSource * - AddSourceForFD(int fd, wxEventLoopSourceHandler *handler, int flags); -#endif // wxUSE_EVENTLOOP_SOURCE - protected: virtual void OnNextIteration(); private: // pipe used for wake up messages: when a child thread wants to wake up // the event loop in the main thread it writes to this pipe - wxWakeUpPipe *m_wakeupPipe; + wxWakeUpPipeMT *m_wakeupPipe; + + // the event loop source used to monitor this pipe + wxEventLoopSource* m_wakeupSource; // either wxSelectDispatcher or wxEpollDispatcher wxFDIODispatcher *m_dispatcher;