AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix for drawing correct gridlines even on scrolled positions (wxMac)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2005-04-22 06:53:03 +00:00
parent b94fa9f5ab
commit c03bf0c740
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/generic/grid.cpp
View File

@ -7146,8 +7146,10 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
int topRow = internalYToRow(top); int topRow = internalYToRow(top);
int rightCol = internalXToCol(right); int rightCol = internalXToCol(right);
int bottomRow = internalYToRow(bottom); int bottomRow = internalYToRow(bottom);
wxRegion clippedcells(0, 0, cw, ch);
#ifndef __WXMAC__
// CS: I don't know why suddenly unscrolled coordinates are used for clipping
wxRegion clippedcells(0, 0, cw, ch);
int i, j, cell_rows, cell_cols; int i, j, cell_rows, cell_cols;
wxRect rect; wxRect rect;
@ -7171,6 +7173,30 @@ void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & WXUNUSED(reg) )
} }
} }
} }
#else
wxRegion clippedcells( left , top, right - left, bottom - top);
int i, j, cell_rows, cell_cols;
wxRect rect;
for (j=topRow; j<bottomRow; j++)
{
for (i=leftCol; i<rightCol; i++)
{
GetCellSize( j, i, &cell_rows, &cell_cols );
if ((cell_rows > 1) || (cell_cols > 1))
{
rect = CellToRect(j,i);
clippedcells.Subtract(rect);
}
else if ((cell_rows < 0) || (cell_cols < 0))
{
rect = CellToRect(j+cell_rows, i+cell_cols);
clippedcells.Subtract(rect);
}
}
}
#endif
dc.SetClippingRegion( clippedcells ); dc.SetClippingRegion( clippedcells );
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );