From 8a150a2430370f0ce2769937b138cb4ca8108880 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 30 Jan 2009 23:03:01 +0000 Subject: [PATCH] Remove debug code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/wincmn.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 96e14509b3..5b3fb6b853 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -47,8 +47,6 @@ #include "wx/menu.h" #endif //WX_PRECOMP -#include "wx/collpane.h" - #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" #endif // wxUSE_DRAG_AND_DROP @@ -713,12 +711,14 @@ wxSize wxWindowBase::GetEffectiveMinSize() const { // merge the best size with the min size, giving priority to the min size wxSize min = GetMinSize(); + if (min.x == wxDefaultCoord || min.y == wxDefaultCoord) { wxSize best = GetBestSize(); if (min.x == wxDefaultCoord) min.x = best.x; if (min.y == wxDefaultCoord) min.y = best.y; } + return min; }