Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-06-08 16:33:47 +00:00
parent fb6724f179
commit fda5e7a16e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/sizer.cpp
View File

@@ -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;
}