Changed grid line positioning slightly to line up the cells with the labels.

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index b954dcdf74bf7edbe06c070c0b2210f32283d3d4..bcf0c8d7b50ffe0a44ba1500e72af868b0b58456 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2668,13 +2668,13 @@ void wxGrid::DrawCellBorder( wxDC& dc, const wxGridCellCoords& coords )
 
     // right hand border
     //
 
     // right hand border
     //

-    dc.DrawLine( m_colRights[col], m_rowBottoms[row] - m_rowHeights[row],
-                 m_colRights[col], m_rowBottoms[row] );
+    dc.DrawLine( m_colRights[col]-1, m_rowBottoms[row] - m_rowHeights[row],
+                 m_colRights[col]-1, m_rowBottoms[row]-1 );

 
     // bottom border
     //
 
     // bottom border
     //

-    dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row],
-                 m_colRights[col], m_rowBottoms[row] );
+    dc.DrawLine( m_colRights[col] - m_colWidths[col], m_rowBottoms[row]-1,
+                 m_colRights[col]-1, m_rowBottoms[row]-1 );

 }
 
 
 }
 
 


@@ -2786,13 +2786,13 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
     int i;
     for ( i = 0; i < m_numRows; i++ )
     {
     int i;
     for ( i = 0; i < m_numRows; i++ )
     {

-        if ( m_rowBottoms[i] > bottom )
+        if ( m_rowBottoms[i]-1 > bottom )

         {
             break;
         }
         {
             break;
         }

-        else if ( m_rowBottoms[i] >= top )
+        else if ( m_rowBottoms[i]-1 >= top )

         {
         {

-            dc.DrawLine( left, m_rowBottoms[i], right, m_rowBottoms[i] );
+            dc.DrawLine( left, m_rowBottoms[i]-1, right, m_rowBottoms[i]-1 );

         }
     }
 
         }
     }
 


@@ -2801,13 +2801,13 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
     //
     for ( i = 0; i < m_numCols; i++ )
     {
     //
     for ( i = 0; i < m_numCols; i++ )
     {

-        if ( m_colRights[i] > right )
+        if ( m_colRights[i]-1 > right )

         {
             break;
         }
         {
             break;
         }

-        else if ( m_colRights[i] >= left )
+        else if ( m_colRights[i]-1 >= left )

         {
         {

-            dc.DrawLine( m_colRights[i], top, m_colRights[i], bottom );
+            dc.DrawLine( m_colRights[i]-1, top, m_colRights[i]-1, bottom );

         }
     }
 }
         }
     }
 }