// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#endif
#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#include "wx/mdi.h"
+ #include "wx/frame.h"
+ #include "wx/mdi.h"
#endif
#include "wx/laywin.h"
IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
+DEFINE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO)
+DEFINE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT)
+
+#if wxUSE_SASH
IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo)
END_EVENT_TABLE()
-wxSashLayoutWindow::wxSashLayoutWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
- const wxSize& size, long style, const wxString& name):
- wxSashWindow(parent, id, pos, size, style, name)
+bool wxSashLayoutWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
+ const wxSize& size, long style, const wxString& name)
+{
+ return wxSashWindow::Create(parent, id, pos, size, style, name);
+}
+
+void wxSashLayoutWindow::Init()
{
m_orientation = wxLAYOUT_HORIZONTAL;
m_alignment = wxLAYOUT_TOP;
}
case wxLAYOUT_NONE:
{
- break;
+ break;
}
}
{
// If not in query mode, resize the window.
// TODO: add wxRect& form to wxWindow::SetSize
+ wxSize sz = GetSize();
+ wxPoint pos = GetPosition();
SetSize(thisRect.x, thisRect.y, thisRect.width, thisRect.height);
+
+ // Make sure the sash is erased when the window is resized
+ if ((pos.x != thisRect.x || pos.y != thisRect.y || sz.x != thisRect.width || sz.y != thisRect.height) &&
+ (GetSashVisible(wxSASH_TOP) || GetSashVisible(wxSASH_RIGHT) || GetSashVisible(wxSASH_BOTTOM) || GetSashVisible(wxSASH_LEFT)))
+ Refresh(TRUE);
+
}
event.SetRect(clientSize);
}
+#endif // wxUSE_SASH
/*
* wxLayoutAlgorithm
*/
+#if wxUSE_MDI_ARCHITECTURE
+
// Lays out windows for an MDI frame. The MDI client area gets what's left
// over.
bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)
wxCalculateLayoutEvent event;
event.SetRect(rect);
- wxNode* node = frame->GetChildren().First();
+ wxWindowList::Node *node = frame->GetChildren().GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
event.SetId(win->GetId());
event.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(event);
- node = node->Next();
+ node = node->GetNext();
}
wxWindow* clientWindow = frame->GetClientWindow();
return TRUE;
}
+#endif // wxUSE_MDI_ARCHITECTURE
+
+bool wxLayoutAlgorithm::LayoutFrame(wxFrame* frame, wxWindow* mainWindow)
+{
+ return LayoutWindow(frame, mainWindow);
+}
+
// Layout algorithm for any window. mainWindow gets what's left over.
bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
{
// reduce the available space to allow space for any active edges.
int leftMargin = 0, rightMargin = 0, topMargin = 0, bottomMargin = 0;
+#if wxUSE_SASH
if (parent->IsKindOf(CLASSINFO(wxSashWindow)))
{
wxSashWindow* sashWindow = (wxSashWindow*) parent;
if (sashWindow->GetSashVisible(wxSASH_BOTTOM))
bottomMargin += sashWindow->GetDefaultBorderSize();
}
+#endif // wxUSE_SASH
int cw, ch;
parent->GetClientSize(& cw, & ch);
wxCalculateLayoutEvent event;
event.SetRect(rect);
- wxNode* node = parent->GetChildren().First();
+ // Find the last layout-aware window, so we can make it fill all remaining
+ // space.
+ wxWindow *lastAwareWindow = NULL;
+ wxWindowList::Node *node = parent->GetChildren().GetFirst();
+
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
- event.SetId(win->GetId());
- event.SetEventObject(win);
- event.SetFlags(0); // ??
+ if (win->IsShown())
+ {
+ wxCalculateLayoutEvent tempEvent(win->GetId());
+ tempEvent.SetEventObject(win);
+ tempEvent.SetFlags(wxLAYOUT_QUERY);
+ tempEvent.SetRect(event.GetRect());
+ if (win->GetEventHandler()->ProcessEvent(tempEvent))
+ lastAwareWindow = win;
+ }
- win->GetEventHandler()->ProcessEvent(event);
+ node = node->GetNext();
+ }
- 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().GetFirst();
+ while (node)
+ {
+ wxWindow* win = node->GetData();
+
+ // 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);
+ event.SetFlags(wxLAYOUT_QUERY);
+
+ win->GetEventHandler()->ProcessEvent(event);
+ }
+
+ node = node->GetNext();
+ }
+
+ if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0)
+ return FALSE;
+
+ event.SetRect(rect);
+
+ node = parent->GetChildren().GetFirst();
+ while (node)
+ {
+ wxWindow* win = node->GetData();
+
+ // 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);
+ event.SetFlags(0); // ??
+
+ win->GetEventHandler()->ProcessEvent(event);
+ }
+
+ node = node->GetNext();
}
rect = event.GetRect();
if (mainWindow)
- mainWindow->SetSize(rect.x, rect.y, rect.width, rect.height);
+ mainWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height));
+ else if (lastAwareWindow)
+ {
+ // Fit the remaining space
+ lastAwareWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height));
+ }
return TRUE;
}
projects / wxWidgets.git / blobdiff