Cast needed to fix compilation on 10.4 --This line, and those below,

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

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index da487759381ec8ce0d4d9c8c867bd75926ee3a04..786d662b16225fd6b8c0dbc914c004b28af7d1df 100644 (file)
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -12,10 +12,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "laywin.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -24,21 +20,26 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
-#include "wx/mdi.h"
+    #include "wx/frame.h"

 #endif
 
 #include "wx/laywin.h"
 #endif
 
 #include "wx/laywin.h"

+#include "wx/mdi.h"
+

 
 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)
+wxDEFINE_EVENT( wxEVT_QUERY_LAYOUT_INFO, wxQueryLayoutInfoEvent );
+wxDEFINE_EVENT( wxEVT_CALCULATE_LAYOUT, wxCalculateLayoutEvent );
+
+
+// ----------------------------------------------------------------------------
+// wxSashLayoutWindow
+// ----------------------------------------------------------------------------

 
 #if wxUSE_SASH
 IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)
 
 #if wxUSE_SASH
 IMPLEMENT_CLASS(wxSashLayoutWindow, wxSashWindow)

-

 BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
     EVT_CALCULATE_LAYOUT(wxSashLayoutWindow::OnCalculateLayout)
     EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo)
 BEGIN_EVENT_TABLE(wxSashLayoutWindow, wxSashWindow)
     EVT_CALCULATE_LAYOUT(wxSashLayoutWindow::OnCalculateLayout)
     EVT_QUERY_LAYOUT_INFO(wxSashLayoutWindow::OnQueryLayoutInfo)


@@ -54,6 +55,9 @@ void wxSashLayoutWindow::Init()
 {
     m_orientation = wxLAYOUT_HORIZONTAL;
     m_alignment = wxLAYOUT_TOP;
 {
     m_orientation = wxLAYOUT_HORIZONTAL;
     m_alignment = wxLAYOUT_TOP;

+#ifdef __WXMAC__
+    MacSetClipChildren( true ) ;
+#endif

 }
 
 // This is the function that wxLayoutAlgorithm calls to ascertain the window
 }
 
 // This is the function that wxLayoutAlgorithm calls to ascertain the window


@@ -160,14 +164,14 @@ 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();
+        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
         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)))
             (GetSashVisible(wxSASH_TOP) || GetSashVisible(wxSASH_RIGHT) || GetSashVisible(wxSASH_BOTTOM) || GetSashVisible(wxSASH_LEFT)))

-            Refresh(TRUE);
+            Refresh(true);

 
     }
 
 
     }
 


@@ -175,9 +179,12 @@ void wxSashLayoutWindow::OnCalculateLayout(wxCalculateLayoutEvent& event)
 }
 #endif // wxUSE_SASH
 
 }
 #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.


@@ -193,10 +200,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);


@@ -204,7 +211,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();


@@ -213,7 +220,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.


@@ -254,11 +268,12 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
 
     // Find the last layout-aware window, so we can make it fill all remaining
     // space.
 
     // 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)
     {
     while (node)
     {

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

 
         if (win->IsShown())
         {
 
         if (win->IsShown())
         {


@@ -270,14 +285,14 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
                 lastAwareWindow = win;
         }
 
                 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)
     }
 
     // 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)
     {
     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.
 
         // 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 +305,18 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
             win->GetEventHandler()->ProcessEvent(event);
         }
 
             win->GetEventHandler()->ProcessEvent(event);
         }
 

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

     }
 
     if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0)
     }
 
     if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0)

-        return FALSE;
+        return false;

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

-    node = parent->GetChildren().First();
+    node = parent->GetChildren().GetFirst();

     while (node)
     {
     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.
 
         // 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 +329,7 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
             win->GetEventHandler()->ProcessEvent(event);
         }
 
             win->GetEventHandler()->ProcessEvent(event);
         }
 

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

     }
 
     rect = event.GetRect();
     }
 
     rect = event.GetRect();


@@ -327,6 +342,6 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
         lastAwareWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height));
     }
 
         lastAwareWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height));
     }
 

-    return TRUE;
+    return true;

 }
 
 }