no changes, just remove #if'd out code

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

diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h
index e6c2796cf2eeb50c432c90767d715a5c1e2faa4f..b6b4c59c34d31ee229a4d5924290e774ed105256 100644 (file)
--- a/include/wx/dfb/window.h
+++ b/include/wx/dfb/window.h
@@ -20,8 +20,8 @@
 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 struct wxDFBWindowEvent;
 
 wxDFB_DECLARE_INTERFACE(IDirectFBSurface);
 struct wxDFBWindowEvent;
 

-class WXDLLIMPEXP_CORE wxFont;
-class WXDLLIMPEXP_CORE wxTopLevelWindowDFB;
+class WXDLLIMPEXP_FWD_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;

 
 class wxOverlayImpl;
 class wxDfbOverlaysList;
 
 class wxOverlayImpl;
 class wxDfbOverlaysList;


@@ -75,10 +75,6 @@ public:
     virtual void Refresh(bool eraseBackground = true,
                          const wxRect *rect = (const wxRect *) NULL);
     virtual void Update();
     virtual void Refresh(bool eraseBackground = true,
                          const wxRect *rect = (const wxRect *) NULL);
     virtual void Update();

-    virtual void Clear();
-    virtual void Freeze();
-    virtual void Thaw();
-    virtual bool IsFrozen() const { return m_frozenness > 0; }

 
     virtual bool SetCursor(const wxCursor &cursor);
     virtual bool SetFont(const wxFont &font) { m_font = font; return true; }
 
     virtual bool SetCursor(const wxCursor &cursor);
     virtual bool SetFont(const wxFont &font) { m_font = font; return true; }


@@ -87,8 +83,8 @@ public:
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
                                int *x, int *y,
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
                                int *x, int *y,

-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
+                               int *descent = NULL,
+                               int *externalLeading = NULL,

                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 
                                const wxFont *theFont = (const wxFont *) NULL)
                                const;
 


@@ -108,7 +104,7 @@ public:
     wxIDirectFBSurfacePtr GetDfbSurface();
 
     // returns toplevel window the window belongs to
     wxIDirectFBSurfacePtr GetDfbSurface();
 
     // returns toplevel window the window belongs to

-    wxTopLevelWindowDFB *GetTLW() const { return m_tlw; }
+    wxNonOwnedWindow *GetTLW() const { return m_tlw; }

 
     void OnInternalIdle();
 
 
     void OnInternalIdle();
 


@@ -129,6 +125,8 @@ protected:
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();
 
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();
 

+    virtual void DoThaw();
+

     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::MoveWindow() except for composite controls which will want to arrange


@@ -174,7 +172,7 @@ private:
 
 protected:
     // toplevel window (i.e. DirectFB window) this window belongs to
 
 protected:
     // toplevel window (i.e. DirectFB window) this window belongs to

-    wxTopLevelWindowDFB *m_tlw;
+    wxNonOwnedWindow *m_tlw;

 
 private:
     // subsurface of TLW's surface covered by this window
 
 private:
     // subsurface of TLW's surface covered by this window


@@ -184,18 +182,15 @@ private:
     // don't access it directly)
     wxRect m_rect;
 
     // don't access it directly)
     wxRect m_rect;
 

-    // number of calls to Freeze() minus number of calls to Thaw()
-    unsigned m_frozenness;
-

     // overlays for this window (or NULL if it doesn't have any)
     wxDfbOverlaysList *m_overlays;
 
     // overlays for this window (or NULL if it doesn't have any)
     wxDfbOverlaysList *m_overlays;
 

-    friend class wxTopLevelWindowDFB; // for HandleXXXEvent
+    friend class wxNonOwnedWindow; // for HandleXXXEvent

     friend class wxOverlayImpl; // for Add/RemoveOverlay
     friend class wxOverlayImpl; // for Add/RemoveOverlay

-    friend class wxWindowDC; // for PaintOverlays
+    friend class wxWindowDCImpl; // for PaintOverlays

 
     DECLARE_DYNAMIC_CLASS(wxWindowDFB)
 
     DECLARE_DYNAMIC_CLASS(wxWindowDFB)

-    DECLARE_NO_COPY_CLASS(wxWindowDFB)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDFB);

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };