grid lines were incorrectly drawn over multicell cells in the last column (bug 1290841)

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 8f8d30f9756e15f75e659424782d172550c45bb9..a921b3817c8abc1f9b84fa0dacd225a8fe282fe7 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -7708,10 +7708,10 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     int i, j, cell_rows, cell_cols;
     wxRect rect;
 
     int i, j, cell_rows, cell_cols;
     wxRect rect;
 

-    for (j=topRow; j<bottomRow; j++)
+    for (j=topRow; j<=bottomRow; j++)

     {
         int colPos;
     {
         int colPos;

-        for (colPos=leftCol; colPos<rightCol; colPos++)
+        for (colPos=leftCol; colPos<=rightCol; colPos++)

         {
             i = GetColAt( colPos );
 
         {
             i = GetColAt( colPos );
 


@@ -7736,9 +7736,9 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
     int i, j, cell_rows, cell_cols;
     wxRect rect;
 
     int i, j, cell_rows, cell_cols;
     wxRect rect;
 

-    for (j=topRow; j<bottomRow; j++)
+    for (j=topRow; j<=bottomRow; j++)

     {
     {

-        for (i=leftCol; i<rightCol; i++)
+        for (i=leftCol; i<=rightCol; i++)

         {
             GetCellSize( j, i, &cell_rows, &cell_cols );
             if ((cell_rows > 1) || (cell_cols > 1))
         {
             GetCellSize( j, i, &cell_rows, &cell_cols );
             if ((cell_rows > 1) || (cell_cols > 1))