X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f8cdda4851796e5f5f5bcd82d9e867a30581a6f..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/unix/evtloop.h diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h index ab5a5f9a40..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,14 +16,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 +38,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,12 +46,15 @@ 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; - DECLARE_NO_COPY_CLASS(wxConsoleEventLoop) + wxDECLARE_NO_COPY_CLASS(wxConsoleEventLoop); }; #endif // wxUSE_CONSOLE_EVENTLOOP