don't overload SizeInM{aj,in}orDir() on const/non-const, VC6 has troubles with this as does DMC, so use different names

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

include/wx/sizer.h

@@ -814,7 +814,7 @@ public:
 protected:
     // helpers for our code: this returns the component of the given wxSize in
     // the direction of the sizer and in the other direction, respectively
-    int SizeInMajorDir(const wxSize& sz) const
+    int GetSizeInMajorDir(const wxSize& sz) const
     {
         return m_orient == wxHORIZONTAL ? sz.x : sz.y;
     }
@@ -829,7 +829,7 @@ protected:
         return m_orient == wxHORIZONTAL ? pt.x : pt.y;
     }
 
-    int SizeInMinorDir(const wxSize& sz) const
+    int GetSizeInMinorDir(const wxSize& sz) const
     {
         return m_orient == wxHORIZONTAL ? sz.y : sz.x;
     }

src/common/sizer.cpp

@@ -1848,11 +1848,11 @@ void wxBoxSizer::RecalcSizes()
     if ( m_children.empty() )
         return;
 
-    const wxCoord totalMinorSize = SizeInMinorDir(m_size);
+    const wxCoord totalMinorSize = GetSizeInMinorDir(m_size);
 
     // the amount of free space which we should redistribute among the
     // stretchable items (i.e. those with non zero proportion)
-    int delta = SizeInMajorDir(m_size) - SizeInMajorDir(m_minSize);
+    int delta = GetSizeInMajorDir(m_size) - GetSizeInMajorDir(m_minSize);
 
 
     // Inform child items about the size in minor direction, that can
@@ -1871,21 +1871,21 @@ void wxBoxSizer::RecalcSizes()
         wxSize szMinPrev = item->GetMinSizeWithBorder();
         item->InformFirstDirection(m_orient^wxBOTH,totalMinorSize,delta);
         wxSize szMin = item->GetMinSizeWithBorder();
-        int deltaChange = SizeInMajorDir(szMin-szMinPrev); 
+        int deltaChange = GetSizeInMajorDir(szMin-szMinPrev);
         if( deltaChange )
         {
             // Since we passed available space along to the item, it should not
-        	// take too much ,so delat should not become negative. 
+            // take too much, so delta should not become negative.
             delta -= deltaChange;
         }
-        majorMinSum += SizeInMajorDir(item->GetMinSizeWithBorder());
+        majorMinSum += GetSizeInMajorDir(item->GetMinSizeWithBorder());
     }
     // And update our min size
     SizeInMajorDir(m_minSize) = majorMinSum;
 
 
     // might have a new delta now
-    delta = SizeInMajorDir(m_size) - SizeInMajorDir(m_minSize);
+    delta = GetSizeInMajorDir(m_size) - GetSizeInMajorDir(m_minSize);
 
     // the position at which we put the next child
     wxPoint pt(m_position);
@@ -1900,16 +1900,10 @@ void wxBoxSizer::RecalcSizes()
         if ( !item->IsShown() )
             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
-        wxCoord majorSize = SizeInMajorDir(sizeThis);
+        wxCoord majorSize = GetSizeInMajorDir(sizeThis);
         const int propItem = item->GetProportion();
         if ( propItem )
         {
@@ -1925,7 +1919,7 @@ void wxBoxSizer::RecalcSizes()
         // apply the alignment in the minor direction
         wxPoint posChild(pt);
 
-        wxCoord minorSize = SizeInMinorDir(sizeThis);
+        wxCoord minorSize = GetSizeInMinorDir(sizeThis);
         const int flag = item->GetFlag();
         if ( flag & (wxEXPAND | wxSHAPED) )
         {
@@ -1975,14 +1969,11 @@ wxSize wxBoxSizer::CalcMin()
 
         if ( !item->IsShown() )
             continue;
-#ifndef __DMC__
-        const // see __DMC__ above
-#endif        
-        wxSize sizeMinThis = item->CalcMin();
 
-        SizeInMajorDir(m_minSize) += SizeInMajorDir(sizeMinThis);
+        const wxSize sizeMinThis = item->CalcMin();
-        if ( SizeInMinorDir(sizeMinThis) > SizeInMinorDir(m_minSize) )
+        SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis);
-            SizeInMinorDir(m_minSize) = SizeInMinorDir(sizeMinThis);
+        if ( GetSizeInMinorDir(sizeMinThis) > GetSizeInMinorDir(m_minSize) )
+            SizeInMinorDir(m_minSize) = GetSizeInMinorDir(sizeMinThis);
 
         m_totalProportion += item->GetProportion();
     }
@@ -2089,7 +2080,7 @@ void wxWrapSizer::RecalcSizes()
     }
 
     int lineSumMajor = 0;
-    int majorSize = SizeInMajorDir(m_size);
+    int majorSize = GetSizeInMajorDir(m_size);
 
     // Make sure we have at least one child sizer
     m_n_line = 1;
@@ -2109,7 +2100,7 @@ void wxWrapSizer::RecalcSizes()
         if ( item->IsShown() )
         {
             wxSize minSz = item->GetMinSize();
-            int minSzMajor = SizeInMajorDir(minSz);
+            int minSzMajor = GetSizeInMajorDir(minSz);
 
             // More space on this line?
             if( !lineSumMajor || lineSumMajor+minSzMajor<=majorSize )
@@ -2153,7 +2144,7 @@ void wxWrapSizer::RecalcSizes()
     m_rows.SetDimension( m_position.x, m_position.y, m_size.x, m_size.y );
 
     // Remember this to next time (will be overridden by InformFirstDirection if used)
-    m_prim_size_last = SizeInMajorDir(m_size);
+    m_prim_size_last = GetSizeInMajorDir(m_size);
 }
 
 
@@ -2181,8 +2172,8 @@ wxSize wxWrapSizer::CalcMin()
         if ( item->IsShown() )
         {
             wxSize minSz = item->CalcMin();
-            int szMajor = SizeInMajorDir(minSz);
+            int szMajor = GetSizeInMajorDir(minSz);
-            int szMinor = SizeInMinorDir(minSz);
+            int szMinor = GetSizeInMinorDir(minSz);
             if( szMajor>maxMajor ) maxMajor = szMajor;
             // More space on this line?
             if( m_prim_size_last<0 || !lineSumMajor ||