Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/dfb/app.h b/include/wx/dfb/app.h
index f1e8041ab60c7ca1c083479038bde5ca6a232133..5407b18c5ade6cdc1d3facdf02aa6a04ef2fdecf 100644 (file)
--- a/include/wx/dfb/app.h
+++ b/include/wx/dfb/app.h
@@ -11,7 +11,9 @@
 #ifndef _WX_DFB_APP_H_
 #define _WX_DFB_APP_H_
 
 #ifndef _WX_DFB_APP_H_
 #define _WX_DFB_APP_H_
 

-#include "wx/dfb/ifacehelpers.h"
+#include "wx/dfb/dfbptr.h"
+
+#include "wx/vidmode.h"

 
 wxDFB_DECLARE_INTERFACE(IDirectFB);
 
 
 wxDFB_DECLARE_INTERFACE(IDirectFB);
 


@@ -30,20 +32,14 @@ public:
     virtual void CleanUp();
 
     virtual void WakeUpIdle();
     virtual void CleanUp();
 
     virtual void WakeUpIdle();

-    virtual bool Yield(bool onlyIfNeeded = false);

 
     virtual wxVideoMode GetDisplayMode() const;
     virtual bool SetDisplayMode(const wxVideoMode& mode);
 
 
     virtual wxVideoMode GetDisplayMode() const;
     virtual bool SetDisplayMode(const wxVideoMode& mode);
 

-    // implementation - get singleton DirectFB interface
-    IDirectFBPtr GetDirectFBInterface();
-

 private:
 private:

-    IDirectFBPtr m_dfb;

     wxVideoMode m_videoMode;
 
     DECLARE_DYNAMIC_CLASS(wxApp)
     wxVideoMode m_videoMode;
 
     DECLARE_DYNAMIC_CLASS(wxApp)

-    DECLARE_EVENT_TABLE()

 };
 
 #endif // _WX_DFB_APP_H_
 };
 
 #endif // _WX_DFB_APP_H_