Fix wxGTK compilation in wxUSE_MENUS==0 case.

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

diff --git a/include/wx/unix/evtloop.h b/include/wx/unix/evtloop.h
index 1c47c5cd55c6b033c3e8dc98da61d5f679cd8270..2e02cf358ac3d7b9cb1fe9746475a752de7fa15b 100644 (file)
--- a/include/wx/unix/evtloop.h
+++ b/include/wx/unix/evtloop.h
@@ -17,17 +17,13 @@
 // wxConsoleEventLoop
 // ----------------------------------------------------------------------------
 
 // wxConsoleEventLoop
 // ----------------------------------------------------------------------------
 

+class wxEventLoopSource;

 class wxFDIODispatcher;
 class wxFDIODispatcher;

-class wxUnixEventLoopSource;
+class wxWakeUpPipeMT;

 
 

-namespace wxPrivate
-{
-    class PipeIOHandler;
-}
-
-class WXDLLIMPEXP_BASE wxConsoleEventLoop 
+class WXDLLIMPEXP_BASE wxConsoleEventLoop

 #ifdef __WXOSX__
 #ifdef __WXOSX__

-: public wxEventLoopBase
+: public wxCFEventLoop

 #else
 : public wxEventLoopManual
 #endif
 #else
 : public wxEventLoopManual
 #endif


@@ -45,18 +41,16 @@ public:
     virtual bool IsOk() const { return m_dispatcher != NULL; }
     virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
 
     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
 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;
 
     // either wxSelectDispatcher or wxEpollDispatcher
     wxFDIODispatcher *m_dispatcher;