wxMSWUniv wxWindowMSW vs. wxWindow fix.

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index f5e053bc5fe31f785e12c18ca61357be04b1b6c6..cf15c6ae66236cf30e1faff0ecf61d9411fe3a10 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1533,7 +1533,14 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
         height = 0;
 
     // if our parent had prepared a defer window handle for us, use it
         height = 0;
 
     // if our parent had prepared a defer window handle for us, use it

-    HDWP hdwp = m_parent ? (HDWP)m_parent->m_hDWP : NULL;
+    wxWindowMSW *parent =
+#ifdef __WXUNIVERSAL__
+                          wxDynamicCast(m_parent, wxWindowMSW)
+#else
+                          m_parent
+#endif
+                          ;
+    HDWP hdwp = parent ? (HDWP)parent->m_hDWP : NULL;

     if ( hdwp )
     {
         hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL,
     if ( hdwp )
     {
         hdwp = ::DeferWindowPos(hdwp, GetHwnd(), NULL,


@@ -1545,7 +1552,7 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
         }
 
         // hdwp must be updated as it may have been changed
         }
 
         // hdwp must be updated as it may have been changed

-        m_parent->m_hDWP = (WXHANDLE)hdwp;
+        parent->m_hDWP = (WXHANDLE)hdwp;

     }
 
     // otherwise (or if deferring failed) move the window in place immediately
     }
 
     // otherwise (or if deferring failed) move the window in place immediately