X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbc751bc56d54d7113c6a6078e893245472e993b..b8710bbee8cc69d6ba10fb8b33322bf8de957024:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index a6b6b4920b..ebf81ecc1f 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -582,6 +582,7 @@ bool wxSizerItem::IsShown() const return m_window->IsShown(); case Item_Sizer: + { // arbitrarily decide that if at least one of our elements is // shown, so are we (this arbitrariness is the reason for // deprecating this function) @@ -594,6 +595,7 @@ bool wxSizerItem::IsShown() const return true; } return false; + } case Item_Spacer: return m_spacer->IsShown(); @@ -2332,7 +2334,7 @@ wxSize wxBoxSizer::CalcMin() // Using the max ratio ensures that the min size is big enough for all // items to have their min size and satisfy the proportions among them. - SizeInMajorDir(m_minSize) += maxMinSizeToProp*m_totalProportion; + SizeInMajorDir(m_minSize) += (int)(maxMinSizeToProp*m_totalProportion); return m_minSize; }