Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added different strategy for updating grid lines.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2000-02-05 18:04:13 +00:00
parent 8febdd3905
commit 796df70a76
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/grid.h
View File

@@ -449,7 +449,7 @@ public:
void DrawGridCellArea( wxDC& dc ); void DrawGridCellArea( wxDC& dc );
void DrawCellBorder( wxDC& dc, const wxGridCellCoords& ); void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
void DrawAllGridLines( wxDC& dc ); // TODO - delete this ? void DrawAllGridLines( wxDC& dc, const wxRegion & reg = wxRegion() );
void DrawCell( wxDC& dc, const wxGridCellCoords& ); void DrawCell( wxDC& dc, const wxGridCellCoords& );
void DrawCellBackground( wxDC& dc, const wxGridCellCoords& ); void DrawCellBackground( wxDC& dc, const wxGridCellCoords& );
void DrawCellValue( wxDC& dc, const wxGridCellCoords& ); void DrawCellValue( wxDC& dc, const wxGridCellCoords& );

26
src/generic/grid.cpp
View File

@@ -36,6 +36,10 @@
#include "wx/generic/grid.h" #include "wx/generic/grid.h"
#ifndef DRAW_LINES
#define DRAW_LINES 1
#endif
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
wxGridCellCoords wxGridNoCellCoords( -1, -1 ); wxGridCellCoords wxGridNoCellCoords( -1, -1 );
@@ -869,9 +873,12 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
{ {
wxPaintDC dc( this ); wxPaintDC dc( this );
m_owner->PrepareDC( dc ); m_owner->PrepareDC( dc );
wxRegion reg = GetUpdateRegion();
m_owner->CalcCellsExposed( GetUpdateRegion() ); m_owner->CalcCellsExposed( reg );
m_owner->DrawGridCellArea( dc ); m_owner->DrawGridCellArea( dc );
#if DRAW_LINES
m_owner->DrawAllGridLines( dc, reg );
#endif
} }
@@ -2602,8 +2609,10 @@ void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
if ( m_colWidths[coords.GetCol()] <=0 || if ( m_colWidths[coords.GetCol()] <=0 ||
m_rowHeights[coords.GetRow()] <= 0 ) return; m_rowHeights[coords.GetRow()] <= 0 ) return;
#if !DRAW_LINES
if ( m_gridLinesEnabled ) if ( m_gridLinesEnabled )
DrawCellBorder( dc, coords ); DrawCellBorder( dc, coords );
#endif
DrawCellBackground( dc, coords ); DrawCellBackground( dc, coords );
@@ -2707,20 +2716,29 @@ void wxGrid::DrawCellValue( wxDC& dc, const wxGridCellCoords& coords )
// This is used to redraw all grid lines e.g. when the grid line colour // This is used to redraw all grid lines e.g. when the grid line colour
// has been changed // has been changed
// //
void wxGrid::DrawAllGridLines( wxDC& dc ) void wxGrid::DrawAllGridLines( wxDC& dc, const wxRegion & reg )
{ {
if ( !m_gridLinesEnabled || if ( !m_gridLinesEnabled ||
!m_numRows || !m_numRows ||
!m_numCols ) return; !m_numCols ) return;
int top, bottom, left, right;
if (reg.IsEmpty()){
int cw, ch; int cw, ch;
m_gridWin->GetClientSize(&cw, &ch); m_gridWin->GetClientSize(&cw, &ch);
// virtual coords of visible area // virtual coords of visible area
// //
int top, bottom, left, right;
CalcUnscrolledPosition( 0, 0, &left, &top ); CalcUnscrolledPosition( 0, 0, &left, &top );
CalcUnscrolledPosition( cw, ch, &right, &bottom ); CalcUnscrolledPosition( cw, ch, &right, &bottom );
}
else{
wxCoord x, y, w, h;
reg.GetBox(x, y, w, h);
CalcUnscrolledPosition( x, y, &left, &top );
CalcUnscrolledPosition( x + w, y + h, &right, &bottom );
}
dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) ); dc.SetPen( wxPen(GetGridLineColour(), 1, wxSOLID) );