X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..7ea1c917764fb2588fe1aadc75c49ba300f8cb2f:/src/generic/laywin.cpp?ds=inline diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp index 2c9afa2c7d..524f4bf45a 100644 --- a/src/generic/laywin.cpp +++ b/src/generic/laywin.cpp @@ -12,10 +12,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "laywin.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -24,8 +20,8 @@ #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" @@ -33,6 +29,9 @@ 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) @@ -41,12 +40,19 @@ 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; +#ifdef __WXMAC__ + MacSetClipChildren( true ) ; +#endif } // This is the function that wxLayoutAlgorithm calls to ascertain the window @@ -153,7 +159,15 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event) { // If not in query mode, resize the window. // TODO: add wxRect& form to wxWindow::SetSize + wxSize sz2 = 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 || sz2.x != thisRect.width || sz2.y != thisRect.height) && + (GetSashVisible(wxSASH_TOP) || GetSashVisible(wxSASH_RIGHT) || GetSashVisible(wxSASH_BOTTOM) || GetSashVisible(wxSASH_LEFT))) + Refresh(true); + } event.SetRect(clientSize); @@ -164,6 +178,8 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event) * 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) @@ -178,10 +194,10 @@ 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); @@ -189,7 +205,7 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r) win->GetEventHandler()->ProcessEvent(event); - node = node->Next(); + node = node->GetNext(); } wxWindow* clientWindow = frame->GetClientWindow(); @@ -198,7 +214,14 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r) clientWindow->SetSize(rect.x, rect.y, rect.width, rect.height); - return TRUE; + 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. @@ -237,25 +260,82 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) 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::compatibility_iterator 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; + return true; }