A couple of fixes for wxChm

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

diff --git a/include/wx/dfb/evtloop.h b/include/wx/dfb/evtloop.h
index 05a08f87ea173f758330bb8b6c9b33f74ba9f2f8..2a58619ed1dfab9b6d8b13cd7d8a98970fe36d53 100644 (file)
--- a/include/wx/dfb/evtloop.h
+++ b/include/wx/dfb/evtloop.h
@@ -11,41 +11,36 @@
 #ifndef _WX_DFB_EVTLOOP_H_
 #define _WX_DFB_EVTLOOP_H_
 
-#include "wx/dfb/ifacehelpers.h"
+#include "wx/dfb/dfbptr.h"
+#include "wx/unix/evtloop.h"
 
 wxDFB_DECLARE_INTERFACE(IDirectFBEventBuffer);
-struct wxDFBEvent;
 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxEventLoop : public wxEventLoopManual
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxConsoleEventLoop
 {
 public:
-    wxEventLoop();
+    wxGUIEventLoop();
 
-    virtual bool Pending() const;
-    virtual bool Dispatch();
+    virtual bool YieldFor(long eventsToProcess);
 
     // returns DirectFB event buffer used by wx
-    static IDirectFBEventBufferPtr GetDirectFBEventBuffer();
-
-protected:
-    virtual void WakeUp();
-    virtual void OnNextIteration();
-
-    virtual void HandleDFBEvent(const wxDFBEvent& event);
+    static wxIDirectFBEventBufferPtr GetDirectFBEventBuffer();
 
 private:
     static void InitBuffer();
+    static void CleanUp();
 
-private:
-    static IDirectFBEventBufferPtr ms_buffer;
+    friend class wxApp; // calls CleanUp()
 
-    friend class wxApp; // calls WakeUp()
+private:
+    static wxIDirectFBEventBufferPtr ms_buffer;
+    static int ms_bufferFd;
 
-    DECLARE_NO_COPY_CLASS(wxEventLoop)
+    wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop);
 };
 
 #endif // _WX_DFB_EVTLOOP_H_