merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions

View File

@@ -107,22 +107,20 @@ void wxPanel::OnSize(wxSizeEvent& event)
#if wxUSE_CONSTRAINTS
if (GetAutoLayout())
Layout();
#endif // wxUSE_CONSTRAINTS
//
// Need to properly move child windows under OS/2
//
#if defined(__WXPM__)
else
{
// Need to properly move child windows under OS/2
PSWP pWinSwp = GetSwp();
if (pWinSwp->cx == 0 && pWinSwp->cy == 0 && pWinSwp->fl == 0)
//
{
// Uninitialized
//
::WinQueryWindowPos(GetHWND(), pWinSwp);
else
}
else
{
SWP vSwp;
int nYDiff;
@@ -135,6 +133,8 @@ void wxPanel::OnSize(wxSizeEvent& event)
}
}
#endif
#endif // wxUSE_CONSTRAINTS
event.Skip();
}