added IsSizeDeferred() (part of patch 1199639)

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 30d25ba4b7ac3439c270c2441b4ecbe3ed018c97..10e33d8b1c180351b2c68391acadb37f86043224 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -166,6 +166,9 @@ public:
     void AssociateHandle(WXWidget handle);
     void DissociateHandle();
 
+    // does this window have deferred position and/or size?
+    bool IsSizeDeferred() const;
+
 
     // implementation from now on
     // ==========================

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ca9fe433c6042f2d741e11a75fc66f5bd3614184..894af154e316dfb4713ed6fb881422bb5cca84a5 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1450,6 +1450,17 @@ void wxWindowMSW::DoSetToolTip(wxToolTip *tooltip)
 // moving and resizing
 // ---------------------------------------------------------------------------
 
+bool wxWindowMSW::IsSizeDeferred() const
+{
+#if USE_DEFERRED_SIZING
+    if ( m_pendingPosition != wxDefaultPosition ||
+         m_pendingSize     != wxDefaultSize )
+        return true;
+#endif // USE_DEFERRED_SIZING
+
+    return false;
+}
+
 // Get total size
 void wxWindowMSW::DoGetSize(int *x, int *y) const
 {
@@ -4228,7 +4239,7 @@ bool wxWindowMSW::HandleSize(int WXUNUSED(w), int WXUNUSED(h), WXUINT wParam)
                 useDefer = true;
         }
     }
-#endif
+#endif // USE_DEFERRED_SIZING
 
     // update this window size
     bool processed = false;