Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/dfb/evtloop.h b/include/wx/dfb/evtloop.h
index 11366e70a3c0adf658b470aabc61c345977f90ce..7a0dd0e05604e94368a1b8cbbd5686a0d18f7c63 100644 (file)
--- a/include/wx/dfb/evtloop.h
+++ b/include/wx/dfb/evtloop.h
@@ -3,7 +3,6 @@
 // Purpose:     declares wxEventLoop class
 // Author:      Vaclav Slavik
 // Created:     2006-08-16
-// RCS-ID:      $Id$
 // Copyright:   (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -12,40 +11,35 @@
 #define _WX_DFB_EVTLOOP_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 wxIDirectFBEventBufferPtr GetDirectFBEventBuffer();
 
-protected:
-    virtual void WakeUp();
-    virtual void OnNextIteration();
-
-    virtual void HandleDFBEvent(const wxDFBEvent& event);
-
 private:
     static void InitBuffer();
+    static void CleanUp();
+
+    friend class wxApp; // calls CleanUp()
 
 private:
     static wxIDirectFBEventBufferPtr ms_buffer;
+    static int ms_bufferFd;
 
-    friend class wxApp; // calls WakeUp()
-
-    DECLARE_NO_COPY_CLASS(wxEventLoop)
+    wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop);
 };
 
 #endif // _WX_DFB_EVTLOOP_H_