From: Chris Elliott <biol75@york.ac.uk>
Date: Sat, 27 Oct 2007 13:24:29 +0000 (+0000)
Subject: another DMC build fix http://www.digitalmars.com/pnews/read.php?server=news.digitalma... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/653d72b33b797f33ea0f3830c8a7f7cd84d695de

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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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) )