From: Robin Dunn <robin@alldunn.com>
Date: Tue, 8 Jun 2004 16:33:47 +0000 (+0000)
Subject: Only call GetBestSize if one or both of the minsize components are unset.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fda5e7a16ef41d1c4672e9e8d4451f680aee44f6

Only call GetBestSize if one or both of the minsize components are unset.


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

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 37c790a4bd..7123f19c6a 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -199,9 +199,12 @@ wxSize wxSizerItem::CalcMin()
             // should use the current minimal size.  If there is a MinSize,
             // use it, otherwise use the BestSize.
             wxSize min  = m_window->GetMinSize();
-            wxSize best = m_window->GetBestSize();
-            if (min.x == -1) min.x =  best.x;
-            if (min.y == -1) min.y =  best.y;
+            if (min.x == -1 || min.y == -1)
+            {
+                wxSize best = m_window->GetBestSize();
+                if (min.x == -1) min.x =  best.x;
+                if (min.y == -1) min.y =  best.y;
+            }
             m_minSize = min;
         }