Fixed some typos that occured in applying patch 606235.

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 8e541e67f2bcc62a24c703b6f5fbe1c2b5351356..9e25988500c6d0d413e739b219aab68a5aac21cc 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -1581,12 +1581,12 @@ void wxGridCellStringRenderer::Draw(wxGrid& grid,
                 for (int j=row; j<row+cell_rows; j++)
                 {
                     // check w/ anchor cell for multicell block
                 for (int j=row; j<row+cell_rows; j++)
                 {
                     // check w/ anchor cell for multicell block

-                    grid.GetCellSize(row, i, &c_rows, &c_cols);
+                    grid.GetCellSize(j, i, &c_rows, &c_cols);

                     if (c_rows > 0) c_rows = 0;
                     if (c_rows > 0) c_rows = 0;

-                    if (grid.GetTable()->IsEmptyCell(row+c_rows, i))
+                    if (!grid.GetTable()->IsEmptyCell(j+c_rows, i))

                     {
                        is_empty = FALSE;
                     {
                        is_empty = FALSE;

-                       break;
+                        break;

                     }
                 }
                 if (is_empty)
                     }
                 }
                 if (is_empty)