From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 7 May 2007 00:26:43 +0000 (+0000)
Subject: just return the min size needed by the sizer for the windows with sizers from their... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7e0f753950f9c3fe004818b9d7ba733a22bd169d

just return the min size needed by the sizer for the windows with sizers from their DoGetBestSize() instead of adjusting it upwards to the current size via GetWindowSizeForVirtualSize() call: this might be wrong as it could reintroduce the bug fixed in rev 1.66 of src/generic/scrlwing.cpp (but it's not really clear just what exactly this bug was) but the existing code was definitely wrong as the best size of the window must not change as it's being resized


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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 65a8be784c..13ccfb0e47 100644
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -483,18 +483,7 @@ wxSize wxWindowBase::DoGetBestSize() const
 
     if ( m_windowSizer )
     {
-        // Adjust to window size, since the return value of GetWindowSizeForVirtualSize is
-        // expressed in window and not client size
-        wxSize minSize = m_windowSizer->GetMinSize();
-        wxSize size(GetSize());
-        wxSize clientSize(GetClientSize());
-
-        wxSize minWindowSize(minSize.x + size.x - clientSize.x,
-                             minSize.y + size.y - clientSize.y);
-
-        best = GetWindowSizeForVirtualSize(minWindowSize);
-
-        return best;
+        best = m_windowSizer->GetMinSize();
     }
 #if wxUSE_CONSTRAINTS
     else if ( m_constraints )