flipped accessor conforming to plain c++ impl

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

diff --git a/include/wx/dfb/evtloop.h b/include/wx/dfb/evtloop.h
index 9845acd2653fb6a67d6705f7322ae38b433c12b4..d6fa511ddca0a838d3028bcd2baa5d6a6c949edd 100644 (file)
--- a/include/wx/dfb/evtloop.h
+++ b/include/wx/dfb/evtloop.h
@@ -12,45 +12,37 @@
 #define _WX_DFB_EVTLOOP_H_
 
 #include "wx/dfb/dfbptr.h"
 #define _WX_DFB_EVTLOOP_H_
 
 #include "wx/dfb/dfbptr.h"

+#include "wx/unix/evtloop.h"

 
 wxDFB_DECLARE_INTERFACE(IDirectFBEventBuffer);
 
 wxDFB_DECLARE_INTERFACE(IDirectFBEventBuffer);

-struct wxDFBEvent;

 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxEventLoop
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxEventLoop : public wxEventLoopManual
+class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxConsoleEventLoop

 {
 public:
 {
 public:

-    wxEventLoop();
-
-    virtual bool Pending() const;
-    virtual bool Dispatch();
+    wxGUIEventLoop();

 
     // returns DirectFB event buffer used by wx
     static wxIDirectFBEventBufferPtr GetDirectFBEventBuffer();
 
 
     // returns DirectFB event buffer used by wx
     static wxIDirectFBEventBufferPtr GetDirectFBEventBuffer();
 

+private:

     // wxYield implementation: iterate the loop as long as there are any
     // pending events
     void Yield();
 
     // wxYield implementation: iterate the loop as long as there are any
     // pending events
     void Yield();
 

-protected:
-    virtual void WakeUp();
-    virtual void OnNextIteration();
-
-    virtual void HandleDFBEvent(const wxDFBEvent& event);
-
-private:

     static void InitBuffer();
     static void CleanUp();
 
     static void InitBuffer();
     static void CleanUp();
 

-    friend class wxApp; // calls CleanUp() and WakeUp()
+    friend class wxApp; // calls CleanUp()

 
 private:
     static wxIDirectFBEventBufferPtr ms_buffer;
 
 private:
     static wxIDirectFBEventBufferPtr ms_buffer;

+    static int ms_bufferFd;

 
 

-    DECLARE_NO_COPY_CLASS(wxEventLoop)
+    wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop);

 };
 
 #endif // _WX_DFB_EVTLOOP_H_
 };
 
 #endif // _WX_DFB_EVTLOOP_H_