Include wx/evtloop.h from wx/evtloopsrc.h.

[wxWidgets.git] / include / wx / unix / evtloop.h

diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h
index 3f5b54913c1d8cc3bf4580188fb33054b4fd5e68..0b717660683f43e3c21f64dc34086f9818559cac 100644 (file)
--- a/include/wx/unix/evtloop.h
+++ b/include/wx/unix/evtloop.h
@@ -13,24 +13,33 @@
 
 #if wxUSE_CONSOLE_EVENTLOOP
 
-#include "wx/private/fdiodispatcher.h"
-#include "wx/unix/pipe.h"
-
 // ----------------------------------------------------------------------------
-// wxEventLoop
+// wxConsoleEventLoop
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxConsoleEventLoop : public wxEventLoopManual
+class wxFDIODispatcher;
+class wxUnixEventLoopSource;
+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 +47,12 @@ 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;
-    };
-
-    PipeIOHandler m_wakeupPipe;
+    wxWakeUpPipeMT *m_wakeupPipe;
 
     // either wxSelectDispatcher or wxEpollDispatcher
     wxFDIODispatcher *m_dispatcher;
 
-    DECLARE_NO_COPY_CLASS(wxConsoleEventLoop)
+    wxDECLARE_NO_COPY_CLASS(wxConsoleEventLoop);
 };
 
 #endif // wxUSE_CONSOLE_EVENTLOOP