Removed checklistbox test

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

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 409814e68277696729d3e672379ee2e85326a5c1..3a9b07640395528fbddc026010f696b7d5f8515a 100644 (file)
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -12,7 +12,7 @@
 // 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,9 @@
 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)
 
 #if wxUSE_SASH
 IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
 


@@ -164,7 +167,7 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
         // 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)))
         // 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);
+            Refresh(true);

 
     }
 
 
     }
 


@@ -176,6 +179,8 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
  * wxLayoutAlgorithm
  */
 
  * 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)
 // Lays out windows for an MDI frame. The MDI client area gets what's left
 // over.
 bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)


@@ -190,10 +195,10 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* 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);


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

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

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


@@ -210,7 +215,14 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)
 
     clientWindow->SetSize(rect.x, rect.y, rect.width, rect.height);
 
 
     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.
 }
 
 // Layout algorithm for any window. mainWindow gets what's left over.


@@ -249,12 +261,61 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
     wxCalculateLayoutEvent event;
     event.SetRect(rect);
 
     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 = node->GetData();
+
+        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;
+        }
+
+        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();
+    }
+
+    if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0)
+        return false;
+
+    event.SetRect(rect);
+
+    node = parent->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

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

 
 

-        if (win != mainWindow)
+        // 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.SetId(win->GetId());
             event.SetEventObject(win);


@@ -263,14 +324,19 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
             win->GetEventHandler()->ProcessEvent(event);
         }
 
             win->GetEventHandler()->ProcessEvent(event);
         }
 

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

     }
 
     rect = event.GetRect();
 
     if (mainWindow)
     }
 
     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;

 }
 
 }