X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..9c34a216817028bc533e07873d047208a96b05a2:/include/wx/unix/evtloop.h diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h index 42d16625a9..2e02cf358a 100644 --- a/include/wx/unix/evtloop.h +++ b/include/wx/unix/evtloop.h @@ -17,14 +17,16 @@ // wxConsoleEventLoop // ---------------------------------------------------------------------------- +class wxEventLoopSource; class wxFDIODispatcher; - -namespace wxPrivate -{ - class PipeIOHandler; -}; - -class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxEventLoopManual +class wxWakeUpPipeMT; + +class WXDLLIMPEXP_BASE wxConsoleEventLoop +#ifdef __WXOSX__ +: public wxCFEventLoop +#else +: public wxEventLoopManual +#endif { public: // initialize the event loop, use IsOk() to check if we were successful @@ -37,6 +39,7 @@ public: virtual int DispatchTimeout(unsigned long timeout); virtual void WakeUp(); virtual bool IsOk() const { return m_dispatcher != NULL; } + virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; } protected: virtual void OnNextIteration(); @@ -44,7 +47,10 @@ protected: 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;