Instead of m_menuBar use GetMenuBar() which will be modified (with next patch)

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

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 2d27635bd9bf90e2e60dd01453374f7d439ccb18..738e819a0d3c56adc586995ceb81f318d4405c9b 100644 (file)
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -9,10 +9,10 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "laywin.h"
 #endif
 
 #pragma implementation "laywin.h"
 #endif
 


@@ -24,8 +24,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #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"
 #endif
 
 #include "wx/laywin.h"


@@ -33,6 +33,10 @@
 IMPLEMENT_DYNAMIC_CLASS(wxQueryLayoutInfoEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxCalculateLayoutEvent, wxEvent)
 
 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)
 IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
 
 BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)


@@ -40,24 +44,25 @@ BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
     EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo)
 END_EVENT_TABLE()
 
     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;
 }
 
 {
     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 requestedLength = event.GetRequestedLength();
 
 // dimensions.
 void wxSashLayoutWindow::OnQueryLayoutInfo(wxQueryLayoutInfoEvent& event)
 {
   //    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);
 
     event.SetOrientation(m_orientation);
     event.SetAlignment(m_alignment);
 


@@ -69,7 +74,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.
 
 // 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)
 {
 
 void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
 {


@@ -147,7 +151,7 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
         }
         case wxLAYOUT_NONE:
         {
         }
         case wxLAYOUT_NONE:
         {

-           break;
+            break;

         }
 
     }
         }
 
     }


@@ -156,32 +160,45 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
     {
         // If not in query mode, resize the window.
         // TODO: add wxRect& form to wxWindow::SetSize
     {
         // 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);
         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);
 }
     }
 
     event.SetRect(clientSize);
 }

+#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.
 // 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);
 {
     int cw, ch;
     frame->GetClientSize(& cw, & ch);
 
     wxRect rect(0, 0, cw, ch);

+    if (r)
+        rect = * r;

 
     wxCalculateLayoutEvent event;
     event.SetRect(rect);
 
 
     wxCalculateLayoutEvent event;
     event.SetRect(rect);
 

-    wxNode* node = frame->GetChildren()->First();
+    wxWindowList::compatibility_iterator node = frame->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

 
         event.SetId(win->GetId());
         event.SetEventObject(win);
 
         event.SetId(win->GetId());
         event.SetEventObject(win);


@@ -189,7 +206,7 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame)
 
         win->GetEventHandler()->ProcessEvent(event);
 
 
         win->GetEventHandler()->ProcessEvent(event);
 

-        node = node->Next();
+        node = node->GetNext();

     }
 
     wxWindow* clientWindow = frame->GetClientWindow();
     }
 
     wxWindow* clientWindow = frame->GetClientWindow();


@@ -201,34 +218,124 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame)
     return TRUE;
 }
 
     return TRUE;
 }
 

-// Layout algorithm for normal frame. mainWindow gets what's left over.
+#endif // wxUSE_MDI_ARCHITECTURE
+

 bool wxLayoutAlgorithm::LayoutFrame(wxFrame* frame, wxWindow* mainWindow)
 {
 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)
+{
+    // 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;
     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);
 
 
     wxCalculateLayoutEvent event;
     event.SetRect(rect);
 

-    wxNode* node = frame->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)
     {
     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();
+    }
+
+    // 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();
+    }

 
 

-        node = node->Next();
+    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();
 
     }
 
     rect = event.GetRect();
 

-    mainWindow->SetSize(rect.x, rect.y, rect.width, rect.height);
+    if (mainWindow)
+        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;
 }