X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82a5f02c861e8d57ba8255a9553b941118ad4520..bddab017c6c78f1dab68745a532996bab37f3ee8:/src/generic/laywin.cpp diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp index 26fb6fdf52..5cb58f3f6a 100644 --- a/src/generic/laywin.cpp +++ b/src/generic/laywin.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: laywin.cpp +// Name: src/generic/laywin.cpp // Purpose: Implements a simple layout algorithm, plus // wxSashLayoutWindow which is an example of a window with // layout-awareness (via event handlers). This is suited to @@ -7,15 +7,10 @@ // Author: Julian Smart // Modified by: // Created: 04/01/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "laywin.h" -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -24,21 +19,26 @@ #endif #ifndef WX_PRECOMP -#include "wx/wx.h" -#include "wx/mdi.h" + #include "wx/frame.h" #endif #include "wx/laywin.h" +#include "wx/mdi.h" + IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent) IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent) -const int wxEVT_QUERY_LAYOUT_INFO = wxNewEventType(); -const int wxEVT_CALCULATE_LAYOUT = wxNewEventType(); +wxDEFINE_EVENT( wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent ); +wxDEFINE_EVENT( wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent ); + + +// ---------------------------------------------------------------------------- +// wxSashLayoutWindow +// ---------------------------------------------------------------------------- #if wxUSE_SASH IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow) - BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow) EVT_CALCULATE_LAYOUT(wxSashLayoutWindow::OnCalculateLayout) EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo) @@ -54,6 +54,9 @@ 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 @@ -160,14 +163,14 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event) { // If not in query mode, resize the window. // TODO: add wxRect& form to wxWindow::SetSize - wxSize sz = GetSize(); + 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 || sz.x != thisRect.width || sz.y != thisRect.height) && + 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); + Refresh(true); } @@ -175,9 +178,12 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event) } #endif // wxUSE_SASH -/* - * wxLayoutAlgorithm - */ + +// ---------------------------------------------------------------------------- +// wxLayoutAlgorithm +// ---------------------------------------------------------------------------- + +#if wxUSE_MDI_ARCHITECTURE // Lays out windows for an MDI frame. The MDI client area gets what's left // over. @@ -193,10 +199,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); @@ -204,7 +210,7 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r) win->GetEventHandler()->ProcessEvent(event); - node = node->Next(); + node = node->GetNext(); } wxWindow* clientWindow = frame->GetClientWindow(); @@ -213,7 +219,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. @@ -224,7 +237,7 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) int leftMargin = 0, rightMargin = 0, topMargin = 0, bottomMargin = 0; #if wxUSE_SASH - if (parent->IsKindOf(CLASSINFO(wxSashWindow))) + if (wxDynamicCast(parent, wxSashWindow)) { wxSashWindow* sashWindow = (wxSashWindow*) parent; @@ -254,11 +267,12 @@ 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()) { @@ -270,14 +284,14 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) 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. @@ -290,18 +304,18 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) win->GetEventHandler()->ProcessEvent(event); } - node = node->Next(); + node = node->GetNext(); } if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0) - return FALSE; + return false; 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. @@ -314,7 +328,7 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) win->GetEventHandler()->ProcessEvent(event); } - node = node->Next(); + node = node->GetNext(); } rect = event.GetRect(); @@ -327,6 +341,6 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow) lastAwareWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height)); } - return TRUE; + return true; }