Minor compilation fix for Borland

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 04cda80f0c56ad3bb0f4a3057149a257d0efdca8..a03beb0823a5a32e44044794051a4daef28a3a31 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -7142,8 +7142,12 @@ void wxGrid::AutoSizeColOrRow( int colOrRow, bool setAsMin, bool column )
     // now also compare with the column label extent
     wxCoord w, h;
     dc.SetFont( GetLabelFont() );
     // now also compare with the column label extent
     wxCoord w, h;
     dc.SetFont( GetLabelFont() );

-    dc.GetTextExtent( column ? GetColLabelValue(col)
-                             : GetRowLabelValue(row), &w, &h );
+
+    if ( column )
+        dc.GetTextExtent( GetColLabelValue(col), &w, &h );
+    else
+        dc.GetTextExtent( GetRowLabelValue(col), &w, &h );
+

     extent = column ? w : h;
     if ( extent > extentMax )
     {
     extent = column ? w : h;
     if ( extent > extentMax )
     {