No real changes, just add wxSizerItem::AddBorderToSize() helper.

Factor out this function from GetMinSizeWithBorder() as it will be used for
max size too in a next commit.

See #11497.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 0e1b9684819872d5d35f18793ff0988514e0995b..73229cc8a177ab8f73b25abab067cc6c56c97124 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -436,6 +436,10 @@ protected:
     void DoSetSizer(wxSizer *sizer);
     void DoSetSpacer(const wxSize& size);
 
+    // Add the border specified for this item to the given size
+    // if it's != wxDefaultSize, just return wxDefaultSize otherwise.
+    wxSize AddBorderToSize(const wxSize& size) const;
+
     // discriminated union: depending on m_kind one of the fields is valid
     enum
     {

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 1e100d2973a3c43efc6396d4ef5609d91ac59efb..e0bdaa7c5b4488f7ef16de70dae846aa57db60ef 100644 (file)
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -207,6 +207,23 @@ void wxSizerItem::DoSetSpacer(const wxSize& size)
     SetRatio(size);
 }
 
+wxSize wxSizerItem::AddBorderToSize(const wxSize& size) const
+{
+    if (size == wxDefaultSize)
+        return size;
+
+    wxSize result = size;
+    if (m_flag & wxWEST)
+        result.x += m_border;
+    if (m_flag & wxEAST)
+        result.x += m_border;
+    if (m_flag & wxNORTH)
+        result.y += m_border;
+    if (m_flag & wxSOUTH)
+        result.y += m_border;
+    return result;
+}
+
 wxSizerItem::wxSizerItem(int width,
                          int height,
                          int proportion,
@@ -397,18 +414,7 @@ wxSize wxSizerItem::CalcMin()
 
 wxSize wxSizerItem::GetMinSizeWithBorder() const
 {
-    wxSize ret = m_minSize;
-
-    if (m_flag & wxWEST)
-        ret.x += m_border;
-    if (m_flag & wxEAST)
-        ret.x += m_border;
-    if (m_flag & wxNORTH)
-        ret.y += m_border;
-    if (m_flag & wxSOUTH)
-        ret.y += m_border;
-
-    return ret;
+    return AddBorderToSize(m_minSize);
 }