#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)
-const int wxEVT_QUERY_LAYOUT_INFO = wxNewEventType();
-const int wxEVT_CALCULATE_LAYOUT = wxNewEventType();
+DEFINE_EVENT_TYPE(wxEVT_QUERY_LAYOUT_INFO)
+DEFINE_EVENT_TYPE(wxEVT_CALCULATE_LAYOUT)
#if wxUSE_SASH
IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
* 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::compatibility_iterator 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)
{
// Find the last layout-aware window, so we can make it fill all remaining
// space.
- wxWindow* lastAwareWindow = NULL;
- wxNode* node = parent->GetChildren().First();
+ wxWindow *lastAwareWindow = NULL;
+ wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst();
+
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
if (win->IsShown())
{
lastAwareWindow = win;
}
- node = node->Next();
+ node = node->GetNext();
}
// Now do a dummy run to see if we have any space left for the final window (fail if not)
- node = parent->GetChildren().First();
+ node = parent->GetChildren().GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ 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.
win->GetEventHandler()->ProcessEvent(event);
}
- node = node->Next();
+ node = node->GetNext();
}
if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0)
event.SetRect(rect);
- node = parent->GetChildren().First();
+ node = parent->GetChildren().GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ 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.
win->GetEventHandler()->ProcessEvent(event);
}
- node = node->Next();
+ node = node->GetNext();
}
rect = event.GetRect();