added wxWindow::IsFrozen() (only existed in wxMSW and wxDFB before)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex
index 581aa4be0024627276b8321ceee588cc2b457468..b4103f2261fe2308cdeab0f408f60d74562fb146 100644 (file)
--- a/docs/latex/wx/window.tex
+++ b/docs/latex/wx/window.tex
@@ -1529,6 +1529,18 @@ implements the following methods:\par
 \end{twocollist}}}
 
 
+\membersection{wxWindow::IsFrozen}\label{wxwindowisfrozen}
+
+\constfunc{virtual bool}{IsFrozen}{\void}
+
+Returns \true if the window is currently frozen by a call to 
+\helpref{Freeze()}{wxwindowfreeze}.
+
+\wxheading{See also}
+
+\helpref{Thaw()}{wxwindowthaw}
+
+
 \membersection{wxWindow::IsRetained}\label{wxwindowisretained}
 
 \constfunc{virtual bool}{IsRetained}{\void}

diff --git a/include/wx/dfb/window.h b/include/wx/dfb/window.h
index f5bc1b15b248cb04ecc5563a407bd3283198a298..582fc3cf5c006953eb541c77935d2e7a1acb42db 100644 (file)
--- a/include/wx/dfb/window.h
+++ b/include/wx/dfb/window.h
@@ -75,7 +75,7 @@ public:
     virtual void Clear();
     virtual void Freeze();
     virtual void Thaw();
-    bool IsFrozen() const { return m_frozenness > 0; }
+    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; }

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index a081beb211025121355d0bb5eb6e97a3dabe3f2e..d9a4f67610d73002f16cbc6881dce36398382207 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -83,6 +83,7 @@ public:
     virtual void Update();
     virtual void Freeze();
     virtual void Thaw();
+    virtual bool IsFrozen() const { return m_frozenness > 0; }
 
     virtual void SetWindowStyleFlag(long style);
     virtual void SetExtraStyle(long exStyle);
@@ -460,9 +461,6 @@ protected:
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();
 
-    // has the window been frozen by Freeze()?
-    bool IsFrozen() const { return m_frozenness > 0; }
-
     // this simply moves/resizes the given HWND which is supposed to be our
     // sibling (this is useful for controls which are composite at MSW level
     // and for which DoMoveWindow() is not enough)

diff --git a/include/wx/window.h b/include/wx/window.h
index 82b313d4b83f5dabdd5f2001b0e49f05f17dcd49..b752e7452f6ff51c6b0a088b787cd5cdadb98f4e 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -719,6 +719,9 @@ public:
         // thaw the window: redraw it after it had been frozen
     virtual void Thaw() { }
 
+        // return true if window had been frozen and not unthawed yet
+    virtual bool IsFrozen() const { return false; }
+
         // adjust DC for drawing on this window
     virtual void PrepareDC( wxDC & WXUNUSED(dc) ) { }