X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1873279648582e6af46f9103460da50bf5e03b9..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/unix/evtloop.h

diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h
index 3f5b54913c..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
 ///////////////////////////////////////////////////////////////////////////////
@@ -13,24 +12,33 @@
 
 #if wxUSE_CONSOLE_EVENTLOOP
 
-#include "wx/private/fdiodispatcher.h"
-#include "wx/unix/pipe.h"
-
 // ----------------------------------------------------------------------------
-// wxEventLoop
+// wxConsoleEventLoop
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxEventLoopManual
+class wxEventLoopSource;
+class wxFDIODispatcher;
+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
     wxConsoleEventLoop();
+    virtual ~wxConsoleEventLoop();
 
     // implement base class pure virtuals
     virtual bool Pending() const;
     virtual bool Dispatch();
+    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();
@@ -38,35 +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
-    class PipeIOHandler : public wxFDIOHandler
-    {
-    public:
-        // default ctor does nothing, call Create() to really initialize the
-        // object
-        PipeIOHandler() { }
-
-        bool Create();
-
-        // this method can be, and normally is, called from another thread
-        void WakeUp();
-
-        int GetReadFd() { return m_pipe[wxPipe::Read]; }
-
-        // implement wxFDIOHandler pure virtual methods
-        virtual void OnReadWaiting();
-        virtual void OnWriteWaiting() { }
-        virtual void OnExceptionWaiting() { }
-
-    private:
-        wxPipe m_pipe;
-    };
+    wxWakeUpPipeMT *m_wakeupPipe;
 
-    PipeIOHandler 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