Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

another DMC build fix http://www.digitalmars.com/pnews/read.php?server=news.digitalmars.com&group=c++.beta&artnum=684

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2007-10-27 13:24:29 +00:00
parent 558820fd08
commit 653d72b33b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/sizer.cpp
View File

@@ -1711,8 +1711,13 @@ void wxBoxSizer::RecalcSizes()
if ( !item->IsShown() ) if ( !item->IsShown() )
continue; continue;
#ifndef __DMC__
const wxSize sizeThis(item->GetMinSizeWithBorder()); // 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 // adjust the size in the major direction using the proportion
@@ -1782,8 +1787,10 @@ wxSize wxBoxSizer::CalcMin()
if ( !item->IsShown() ) if ( !item->IsShown() )
continue; continue;
#ifndef __DMC__
const wxSize sizeMinThis = item->CalcMin(); const // see __DMC__ above
#endif
wxSize sizeMinThis = item->CalcMin();
SizeInMajorDir(m_minSize) += SizeInMajorDir(sizeMinThis); SizeInMajorDir(m_minSize) += SizeInMajorDir(sizeMinThis);
if ( SizeInMinorDir(sizeMinThis) > SizeInMinorDir(m_minSize) ) if ( SizeInMinorDir(sizeMinThis) > SizeInMinorDir(m_minSize) )