Correct wxImage::Size() again; add unit tests for it.

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

diff --git a/include/wx/dfb/toplevel.h b/include/wx/dfb/toplevel.h
index 4d71aa7aac4df8f63a03ff3c05bf3060b1d4a73e..983320ffe25ca1e97d304b0d91e8fa96096ff24a 100644 (file)
--- a/include/wx/dfb/toplevel.h
+++ b/include/wx/dfb/toplevel.h
@@ -11,13 +11,6 @@
 #ifndef _WX_DFB_TOPLEVEL_H_
 #define _WX_DFB_TOPLEVEL_H_
 
-#include "wx/dfb/dfbptr.h"
-
-wxDFB_DECLARE_INTERFACE(IDirectFBWindow);
-
-class wxDfbQueuedPaintRequests;
-struct wxDFBWindowEvent;
-
 //-----------------------------------------------------------------------------
 // wxTopLevelWindowDFB
 //-----------------------------------------------------------------------------
@@ -48,8 +41,6 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxTopLevelWindowDFB();
-
     // implement base class pure virtuals
     virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
@@ -60,51 +51,17 @@ public:
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual bool IsFullScreen() const { return m_fsIsShowing; }
 
-    virtual bool Show(bool show = true);
-
     virtual bool CanSetTransparent() { return true; }
     virtual bool SetTransparent(wxByte alpha);
 
     virtual void SetTitle(const wxString &title) { m_title = title; }
     virtual wxString GetTitle() const { return m_title; }
 
-    virtual void Update();
-
-    // implementation from now on
-    // --------------------------
-
-    void OnInternalIdle();
-
-    wxIDirectFBWindowPtr GetDirectFBWindow() const { return m_dfbwin; }
-
-    // Returns true if some invalidated area of the TLW is currently being
-    // painted
-    bool IsPainting() const { return m_isPainting; }
-
 protected:
     // common part of all ctors
     void Init();
 
-    virtual wxIDirectFBSurfacePtr ObtainDfbSurface() const;
-
-    // overriden wxWindow methods
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-
-    virtual void DoRefreshRect(const wxRect& rect);
-
-    // sets DirectFB keyboard focus to this toplevel window (note that DFB
-    // focus is different from wx: only shown TLWs can have it and not any
-    // wxWindows as in wx
-    void SetDfbFocus();
-
-private:
-    // do queued painting in idle time
-    void HandleQueuedPaintRequests();
-
-    // DirectFB events handling
-    static void HandleDFBWindowEvent(const wxDFBWindowEvent& event_);
+    virtual void HandleFocusEvent(const wxDFBWindowEvent& event_);
 
 protected:
     wxString      m_title;
@@ -117,24 +74,6 @@ protected:
     // is the frame currently maximized?
     bool          m_isMaximized:1;
     wxRect        m_savedFrame;
-
-    // did we sent wxSizeEvent at least once?
-    bool          m_sizeSet:1;
-
-    // window's opacity (0: transparent, 255: opaque)
-    wxByte        m_opacity;
-
-    // interface to the underlying DirectFB window
-    wxIDirectFBWindowPtr m_dfbwin;
-
-private:
-    // invalidated areas of the TLW that need repainting
-    wxDfbQueuedPaintRequests *m_toPaint;
-    // are we currently painting some area of this TLW?
-    bool m_isPainting;
-
-    friend class wxEventLoop; // for HandleDFBWindowEvent
-    friend class wxWindowDFB; // for SetDfbFocus
 };
 
 #endif // _WX_DFB_TOPLEVEL_H_