From 3bcf4cce0775db9677e73bb4bbe14d9cfa7df688 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Wed, 30 Mar 2005 19:19:06 +0000 Subject: [PATCH] Backed out a fix which seems to cause more trouble than it's doing good. :-( git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/os2/window.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/os2/window.cpp b/src/os2/window.cpp index 977e27bc94..d5cb4af9fb 100644 --- a/src/os2/window.cpp +++ b/src/os2/window.cpp @@ -1628,7 +1628,14 @@ void wxWindowOS2::DoMoveWindow( MoveChildren(nYDiff); ::WinQueryWindowPos(GetHwnd(), &m_vWinSwp); } +#if 0 + // FIXME: By my logic, the next line should be needed as it moves child + // windows when resizing the parent (see comment at beginning of + // function). However, this seems to cause lots of problems. At + // least, e.g. the grid sample almost works with this line + // commented out but crashes badly with it. MoveChildren(nHeightDelta); +#endif } // end of wxWindowOS2::DoMoveWindow // @@ -4416,6 +4423,10 @@ void wxWindowOS2::MoveChildren( ::WinQueryWindowPos( GetHwndOf(pWin) ,&vSwp ); + // Actually, only move children that already are placed on the + // frame, not ones which are still at wxDefaultCoord. + if (vSwp.y == wxDefaultCoord) + continue; if (pWin->IsKindOf(CLASSINFO(wxControl))) { wxControl* pCtrl; -- 2.45.2