fixed bug in wxGrid dimensions calculation (Staffan Ulfberg)

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 6387d6e676684650a130ef2c6e99cc74e7980b2a..2471fc009017440f30dbf5cb62402c23cd44c3bd 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3904,9 +3904,9 @@ void wxGrid::CalcDimensions()
     int cw, ch;
     GetClientSize( &cw, &ch );
 
     int cw, ch;
     GetClientSize( &cw, &ch );
 

-    if ( m_colLabelWin->IsShown() )
-        cw -= m_rowLabelWidth;

     if ( m_rowLabelWin->IsShown() )
     if ( m_rowLabelWin->IsShown() )

+        cw -= m_rowLabelWidth;
+    if ( m_colLabelWin->IsShown() )

         ch -= m_colLabelHeight;
 
     // grid total size
         ch -= m_colLabelHeight;
 
     // grid total size