X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9aee1212251a85e7e52246a621e921af7da6be8d..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/unix/evtloop.h diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h index 4c57136f3a..2b91c72375 100644 --- a/include/wx/unix/evtloop.h +++ b/include/wx/unix/evtloop.h @@ -3,7 +3,6 @@ // Purpose: declares wxEventLoop class // Author: Lukasz Michalski (lm@zork.pl) // Created: 2007-05-07 -// RCS-ID: $Id$ // Copyright: (c) 2007 Lukasz Michalski // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -17,15 +16,11 @@ // wxConsoleEventLoop // ---------------------------------------------------------------------------- +class wxEventLoopSource; class wxFDIODispatcher; -class wxUnixEventLoopSource; +class wxWakeUpPipeMT; -namespace wxPrivate -{ - class PipeIOHandler; -} - -class WXDLLIMPEXP_BASE wxConsoleEventLoop +class WXDLLIMPEXP_BASE wxConsoleEventLoop #ifdef __WXOSX__ : public wxCFEventLoop #else @@ -45,18 +40,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;