X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f35aa3daa3106af9c062ef4981fcbf91983ba193..4f6aed9c6a21d4bc732579aa564adf4cdb2c9aab:/src/common/sizer.cpp?ds=sidebyside diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index f1e0c5dd4e..6280097628 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -413,7 +413,7 @@ void wxBoxSizer::RecalcSizes() if (m_orient == wxVERTICAL) { - long height = size.y; + wxCoord height = size.y; if (item->GetOption()) { height = (delta * weight) + extra; @@ -438,7 +438,7 @@ void wxBoxSizer::RecalcSizes() } else { - long width = size.x; + wxCoord width = size.x; if (item->GetOption()) { width = (delta * weight) + extra; @@ -469,7 +469,7 @@ void wxBoxSizer::RecalcSizes() wxSize wxBoxSizer::CalcMin() { if (m_children.GetCount() == 0) - return wxSize(2,2); + return wxSize(10,10); m_stretchable = 0; m_minWidth = 0; @@ -570,7 +570,7 @@ wxSize wxStaticBoxSizer::CalcMin() int other_border = 5; wxSize ret( wxBoxSizer::CalcMin() ); - ret.x += 2*top_border; + ret.x += 2*other_border; ret.y += other_border + top_border; return ret;