AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sash window layout algorithm now fails if not enough space to complete.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2000-08-29 16:09:59 +00:00
parent fa755cf187
commit 8c023dee92
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/generic/laywin.cpp
View File

@ -270,6 +270,7 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
node = node->Next();
}
// Now do a dummy run to see if we have any space left for the final window (fail if not)
node = parent->GetChildren().First();
while (node)
{
@ -277,7 +278,31 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
// If mainWindow is NULL and we're at the last window,
// skip this, because we'll simply make it fit the remaining space.
if ((win != mainWindow) && (mainWindow != NULL || win != lastAwareWindow))
if (win->IsShown() && (win != mainWindow) && (mainWindow != NULL || win != lastAwareWindow))
{
event.SetId(win->GetId());
event.SetEventObject(win);
event.SetFlags(wxLAYOUT_QUERY);
win->GetEventHandler()->ProcessEvent(event);
}
node = node->Next();
}
if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0)
return FALSE;
event.SetRect(rect);
node = parent->GetChildren().First();
while (node)
{
wxWindow* win = (wxWindow*) node->Data();
// If mainWindow is NULL and we're at the last window,
// skip this, because we'll simply make it fit the remaining space.
if (win->IsShown() && (win != mainWindow) && (mainWindow != NULL || win != lastAwareWindow))
{
event.SetId(win->GetId());
event.SetEventObject(win);