X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80eee8378f6b6e8b9ecae46062c2b66ff4469f48..4ec2eca1e8c2829b34bfc95a10cc3c6ab4798314:/include/wx/unix/evtloop.h?ds=sidebyside diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h index 1c47c5cd55..2e02cf358a 100644 --- a/include/wx/unix/evtloop.h +++ b/include/wx/unix/evtloop.h @@ -17,17 +17,13 @@ // wxConsoleEventLoop // ---------------------------------------------------------------------------- +class wxEventLoopSource; class wxFDIODispatcher; -class wxUnixEventLoopSource; +class wxWakeUpPipeMT; -namespace wxPrivate -{ - class PipeIOHandler; -} - -class WXDLLIMPEXP_BASE wxConsoleEventLoop +class WXDLLIMPEXP_BASE wxConsoleEventLoop #ifdef __WXOSX__ -: public wxEventLoopBase +: public wxCFEventLoop #else : public wxEventLoopManual #endif @@ -45,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 - wxPrivate::PipeIOHandler *m_wakeupPipe; + wxWakeUpPipeMT *m_wakeupPipe; + + // the event loop source used to monitor this pipe + wxEventLoopSource* m_wakeupSource; // either wxSelectDispatcher or wxEpollDispatcher wxFDIODispatcher *m_dispatcher;