X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1d4dd7add411ebff1ce4a8d1d992e0e43ee26b1..475edb11e0aa7f103478da219253d99db480d55b:/src/generic/laywin.cpp

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 943351d8e6..524f4bf45a 100644
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -12,10 +12,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "laywin.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -54,6 +50,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 +159,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);
 
     }
 
@@ -195,7 +194,7 @@ bool wxLayoutAlgorithm::LayoutMDIFrame(wxMDIParentFrame* frame, wxRect* r)
     wxCalculateLayoutEvent event;
     event.SetRect(rect);
 
-    wxWindowList::Node	*node = frame->GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = frame->GetChildren().GetFirst();
     while (node)
     {
         wxWindow* win = node->GetData();
@@ -215,7 +214,7 @@ 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
@@ -263,8 +262,8 @@ 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;
-    wxWindowList::Node	*node = parent->GetChildren().GetFirst();
+    wxWindow *lastAwareWindow = NULL;
+    wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst();
 
     while (node)
     {
@@ -304,7 +303,7 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
     }
 
     if (event.GetRect().GetWidth() < 0 || event.GetRect().GetHeight() < 0)
-        return FALSE;
+        return false;
 
     event.SetRect(rect);
 
@@ -337,6 +336,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;
 }