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

Instead of using GetAdjustedBestSize use the minsize if there is one,

Browse Source 
otherwise use GetBestSize.  This allows for situations where the
minsize is smaller than the bestsize (for example, abbreviated state
fields will normally be smaller than the 100px best size for
wxTextCtrls.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-04-22 21:44:29 +00:00
parent 0fbcc4d827
commit 093475d267
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/sizer.cpp
View File

@ -195,9 +195,14 @@ wxSize wxSizerItem::CalcMin()
{
if ( IsWindow() && !(m_flag & wxFIXED_MINSIZE) )
{
// the size of the window may change during run-time, we should
// use the current minimal size
m_minSize = m_window->GetAdjustedBestSize();
// Since the size of the window may change during runtime, we
// 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;
m_minSize = min;
}
ret = m_minSize;