fixing the usage of hishape

[wxWidgets.git] / src / common / sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 9dde5b581bca5b6f89a6bd667bdf4bb1f6d46e97..3b1a77280abf9af8d861d6f65069639e28b97a03 100644 (file)
--- 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) )