X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74ab5f5b9df928c75c119a2c00b0d2092caa49f1..82c126e50158efee5a1f46e1200be380c5199f8d:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 9dde5b581b..3b1a77280a 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -1711,8 +1711,13 @@ void wxBoxSizer::RecalcSizes() if ( !item->IsShown() ) continue; - - const wxSize sizeThis(item->GetMinSizeWithBorder()); +#ifndef __DMC__ + // DMC doesn't distinguish between + // int SizeInMajorDir(const wxSize& sz) const + // and int& SizeInMajorDir(wxSize& sz) + const +#endif + wxSize sizeThis(item->GetMinSizeWithBorder()); // adjust the size in the major direction using the proportion @@ -1782,8 +1787,10 @@ wxSize wxBoxSizer::CalcMin() if ( !item->IsShown() ) continue; - - const wxSize sizeMinThis = item->CalcMin(); +#ifndef __DMC__ + const // see __DMC__ above +#endif + wxSize sizeMinThis = item->CalcMin(); SizeInMajorDir(m_minSize) += SizeInMajorDir(sizeMinThis); if ( SizeInMinorDir(sizeMinThis) > SizeInMinorDir(m_minSize) )