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
This commit is contained in:
Vadim Zeitlin 2006-11-04 12:33:48 +00:00
parent e8a147a6c3
commit 7c3f33a943

View File

@ -7708,10 +7708,10 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
int i, j, cell_rows, cell_cols;
wxRect rect;
for (j=topRow; j<bottomRow; j++)
for (j=topRow; j<=bottomRow; j++)
{
int colPos;
for (colPos=leftCol; colPos<rightCol; colPos++)
for (colPos=leftCol; colPos<=rightCol; 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;
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))