don't remember size passed to SetSize() as pending position/size for TLW as deferred...

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index d322098a87b37d14ddc935d611319cd1be6b5104..30d25ba4b7ac3439c270c2441b4ecbe3ed018c97 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -458,7 +458,10 @@ protected:
     // 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)
     // 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)

-    void DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height);
+    //
+    // returns true if the window move was deferred, false if it was moved
+    // immediately (no error return)
+    bool DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height);

 
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
 
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 554b6e4e264e355e3666c772d46796b2beccca52..257b2ac1370f25e55ff7801cf4603c6f8798a8ff 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1567,7 +1567,7 @@ void wxWindowMSW::DoClientToScreen(int *x, int *y) const
         *y = pt.y;
 }
 
         *y = pt.y;
 }
 

-void
+bool

 wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
 {
 #if USE_DEFERRED_SIZING
 wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
 {
 #if USE_DEFERRED_SIZING


@@ -1592,15 +1592,23 @@ wxWindowMSW::DoMoveSibling(WXHWND hwnd, int x, int y, int width, int height)
         parent->m_hDWP = (WXHANDLE)hdwp;
     }
 
         parent->m_hDWP = (WXHANDLE)hdwp;
     }
 

+    if ( hdwp )
+    {
+        // did deferred move, remember new coordinates of the window as they're
+        // different from what Windows would return for it
+        return true;
+    }
+

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

-    if ( !hdwp )

 #endif // USE_DEFERRED_SIZING
 #endif // USE_DEFERRED_SIZING

+    if ( !::MoveWindow((HWND)hwnd, x, y, width, height, IsShown()) )

     {
     {

-        if ( !::MoveWindow((HWND)hwnd, x, y, width, height, IsShown()) )
-        {
-            wxLogLastError(wxT("MoveWindow"));
-        }
+        wxLogLastError(wxT("MoveWindow"));

     }
     }

+
+    // if USE_DEFERRED_SIZING, indicates that we didn't use deferred move,
+    // ignored otherwise
+    return false;

 }
 
 void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
 }
 
 void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)


@@ -1612,7 +1620,13 @@ void wxWindowMSW::DoMoveWindow(int x, int y, int width, int height)
     if (height < 0)
         height = 0;
 
     if (height < 0)
         height = 0;
 

-    DoMoveSibling(m_hWnd, x, y, width, height);
+    if ( DoMoveSibling(m_hWnd, x, y, width, height) )
+    {
+#if USE_DEFERRED_SIZING
+        m_pendingPosition = wxPoint(x, y);
+        m_pendingSize = wxSize(width, height);
+#endif // USE_DEFERRED_SIZING
+    }

 }
 
 // set the size of the window: if the dimensions are positive, just use them,
 }
 
 // set the size of the window: if the dimensions are positive, just use them,


@@ -1680,8 +1694,6 @@ void wxWindowMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         }
     }
 
         }
     }
 

-    m_pendingPosition = wxPoint(x, y);
-    m_pendingSize = wxSize(width, height);

     DoMoveWindow(x, y, width, height);
 }
 
     DoMoveWindow(x, y, width, height);
 }