git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58532
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
#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
{
// 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;
}