Added chapter on collection and container classes to contents

[wxWidgets.git] / src / generic / laywin.cpp

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index c3b2c3fd961a68cd060bdaaf194b3a7300267f30..409814e68277696729d3e672379ee2e85326a5c1 100644 (file)
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -9,7 +9,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -33,6 +33,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
 
+#if wxUSE_SASH
 IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
 
 BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
@@ -40,24 +41,25 @@ 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;
 }
 
-// These are the functions that wxWin will call to ascertain the window
+// This is the function that wxLayoutAlgorithm calls to ascertain the window
 // dimensions.
 void wxSashLayoutWindow::OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event)
 {
-    int flags = event.GetFlags();
+  //    int flags = event.GetFlags();
     int requestedLength = event.GetRequestedLength();
 
-    // This code won't be in the final thing, it's just so we don't have to give it
-    // real windows: mock up some dimensions.
-
     event.SetOrientation(m_orientation);
     event.SetAlignment(m_alignment);
 
@@ -69,7 +71,6 @@ void wxSashLayoutWindow::OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event)
 
 // Called by parent to allow window to take a bit out of the
 // client rectangle, and size itself if not in wxLAYOUT_QUERY mode.
-// Will eventually be an event.
 
 void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
 {
@@ -145,17 +146,31 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
             clientSize.height -= thisRect.height;
             break;
         }
+        case wxLAYOUT_NONE:
+        {
+            break;
+        }
+
     }
 
     if ((flags & wxLAYOUT_QUERY) == 0)
     {
         // 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
@@ -163,17 +178,19 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
 
 // Lays out windows for an MDI frame. The MDI client area gets what's left
 // over.
-bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame)
+bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)
 {
     int cw, ch;
     frame->GetClientSize(& cw, & ch);
 
     wxRect rect(0, 0, cw, ch);
+    if (r)
+        rect = * r;
 
     wxCalculateLayoutEvent event;
     event.SetRect(rect);
 
-    wxNode* node = frame->GetChildren()->First();
+    wxNode* node = frame->GetChildren().First();
     while (node)
     {
         wxWindow* win = (wxWindow*) node->Data();
@@ -196,34 +213,63 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame)
     return TRUE;
 }
 
-// Layout algorithm for normal frame. mainWindow gets what's left over.
-bool wxLayoutAlgorithm::LayoutFrame(wxFrame* frame, wxWindow* mainWindow)
+// Layout algorithm for any window. mainWindow gets what's left over.
+bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
 {
+    // Test if the parent is a sash window, and if so,
+    // 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;
+
+        leftMargin = sashWindow->GetExtraBorderSize();
+        rightMargin = sashWindow->GetExtraBorderSize();
+        topMargin = sashWindow->GetExtraBorderSize();
+        bottomMargin = sashWindow->GetExtraBorderSize();
+
+        if (sashWindow->GetSashVisible(wxSASH_LEFT))
+            leftMargin += sashWindow->GetDefaultBorderSize();
+        if (sashWindow->GetSashVisible(wxSASH_RIGHT))
+            rightMargin += sashWindow->GetDefaultBorderSize();
+        if (sashWindow->GetSashVisible(wxSASH_TOP))
+            topMargin += sashWindow->GetDefaultBorderSize();
+        if (sashWindow->GetSashVisible(wxSASH_BOTTOM))
+            bottomMargin += sashWindow->GetDefaultBorderSize();
+    }
+#endif // wxUSE_SASH
+
     int cw, ch;
-    frame->GetClientSize(& cw, & ch);
+    parent->GetClientSize(& cw, & ch);
 
-    wxRect rect(0, 0, cw, ch);
+    wxRect rect(leftMargin, topMargin, cw - leftMargin - rightMargin, ch - topMargin - bottomMargin);
 
     wxCalculateLayoutEvent event;
     event.SetRect(rect);
 
-    wxNode* node = frame->GetChildren()->First();
+    wxNode* node = parent->GetChildren().First();
     while (node)
     {
         wxWindow* win = (wxWindow*) node->Data();
 
-        event.SetId(win->GetId());
-        event.SetEventObject(win);
-        event.SetFlags(0); // ??
+        if (win != mainWindow)
+        {
+            event.SetId(win->GetId());
+            event.SetEventObject(win);
+            event.SetFlags(0); // ??
 
-        win->GetEventHandler()->ProcessEvent(event);
+            win->GetEventHandler()->ProcessEvent(event);
+        }
 
         node = node->Next();
     }
 
     rect = event.GetRect();
 
-    mainWindow->SetSize(rect.x, rect.y, rect.width, rect.height);
+    if (mainWindow)
+        mainWindow->SetSize(rect.x, rect.y, rect.width, rect.height);
 
     return TRUE;
 }