From 093475d2675caf0fd178bb93fd79fc5c529801e9 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 22 Apr 2004 21:44:29 +0000 Subject: [PATCH] Instead of using GetAdjustedBestSize use the minsize if there is one, 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 --- src/common/sizer.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 062e2767d5..c2320a4d5a 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -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; -- 2.49.0