X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a624f6ed375e4dbf126743ff1068486cb5241a2..7e083675342b17762735ef2223fb9d264d6fc937:/include/wx/dfb/window.h?ds=sidebyside

diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h
index 684b282a4f..f6018c7c3f 100644
--- a/include/wx/dfb/window.h
+++ b/include/wx/dfb/window.h
@@ -75,21 +75,12 @@ public:
     virtual void Refresh(bool eraseBackground = true,
                          const wxRect *rect = (const wxRect *) NULL);
     virtual void Update();
-    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 int GetCharHeight() const;
     virtual int GetCharWidth() const;
-    virtual void GetTextExtent(const wxString& string,
-                               int *x, int *y,
-                               int *descent = (int *) NULL,
-                               int *externalLeading = (int *) NULL,
-                               const wxFont *theFont = (const wxFont *) NULL)
-                               const;
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget *dropTarget);
@@ -109,12 +100,15 @@ public:
     // returns toplevel window the window belongs to
     wxNonOwnedWindow *GetTLW() const { return m_tlw; }
 
-    void OnInternalIdle();
-
     virtual bool IsDoubleBuffered() const { return true; }
 
 protected:
     // implement the base class pure virtuals
+    virtual void DoGetTextExtent(const wxString& string,
+                                 int *x, int *y,
+                                 int *descent = NULL,
+                                 int *externalLeading = NULL,
+                                 const wxFont *theFont = NULL) const;
     virtual void DoClientToScreen(int *x, int *y) const;
     virtual void DoScreenToClient(int *x, int *y) const;
     virtual void DoGetPosition(int *x, int *y) const;
@@ -128,6 +122,8 @@ protected:
     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
@@ -183,9 +179,6 @@ private:
     // 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;
 
@@ -194,7 +187,7 @@ private:
     friend class wxWindowDCImpl; // for PaintOverlays
 
     DECLARE_DYNAMIC_CLASS(wxWindowDFB)
-    DECLARE_NO_COPY_CLASS(wxWindowDFB)
+    wxDECLARE_NO_COPY_CLASS(wxWindowDFB);
     DECLARE_EVENT_TABLE()
 };