X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/461e93f921df33c09637db5dddcfd07411ff0ded..e2386592d338b18cd408fa7912a50232e044e5f7:/src/common/wincmn.cpp?ds=sidebyside

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 453f9b90d5..2641125c24 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1185,9 +1185,9 @@ void wxWindowBase::DeleteRelatedConstraints()
 }
 #endif
 
-void wxWindowBase::SetSizer(wxSizer *sizer)
+void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld)
 {
-    if (m_windowSizer) delete m_windowSizer;
+    if (m_windowSizer && deleteOld) delete m_windowSizer;
 
     m_windowSizer = sizer;
 }
@@ -1451,7 +1451,7 @@ void wxWindowBase::GetPositionConstraint(int *x, int *y) const
 
 #endif // wxUSE_CONSTRAINTS
 
-void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) const
 {
     // don't do it for the dialogs/frames - they float independently of their
     // parent
@@ -1748,3 +1748,4 @@ void wxWindowBase::ReleaseMouse()
                GetCapture());
 }
 
+// vi:sts=4:sw=4:et