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

Added wxGrid::DrawGridSpace function to suppress junk beyond last

Browse Source 
row and col of grid.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
2000-02-23 07:15:04 +00:00
parent 4cfa5de640
commit 7c8a8ad57e
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -902,6 +902,7 @@ public:
bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE ); bool DeleteCols( int pos = 0, int numCols = 1, bool updateLabels=TRUE );
void DrawGridCellArea( wxDC& dc ); void DrawGridCellArea( wxDC& dc );
void DrawGridSpace( wxDC& dc );
void DrawCellBorder( wxDC& dc, const wxGridCellCoords& ); void DrawCellBorder( wxDC& dc, const wxGridCellCoords& );
void DrawAllGridLines( wxDC& dc, const wxRegion & reg ); void DrawAllGridLines( wxDC& dc, const wxRegion & reg );
void DrawCell( wxDC& dc, const wxGridCellCoords& ); void DrawCell( wxDC& dc, const wxGridCellCoords& );

66
src/generic/grid.cpp
View File

@@ -2579,6 +2579,7 @@ void wxGridWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxRegion reg = GetUpdateRegion(); wxRegion reg = GetUpdateRegion();
m_owner->CalcCellsExposed( reg ); m_owner->CalcCellsExposed( reg );
m_owner->DrawGridCellArea( dc ); m_owner->DrawGridCellArea( dc );
m_owner->DrawGridSpace( dc );
#if WXGRID_DRAW_LINES #if WXGRID_DRAW_LINES
m_owner->DrawAllGridLines( dc, reg ); m_owner->DrawAllGridLines( dc, reg );
#endif #endif
@@ -2608,40 +2609,9 @@ void wxGridWindow::OnKeyDown( wxKeyEvent& event )
if ( !m_owner->ProcessEvent( event ) ) event.Skip(); if ( !m_owner->ProcessEvent( event ) ) event.Skip();
} }
// We are trapping erase background events to reduce flicker under MSW
// and GTK but this can leave junk in the space beyond the last row and
// col. So here we paint these spaces if they are visible.
//
void wxGridWindow::OnEraseBackground(wxEraseEvent& event) void wxGridWindow::OnEraseBackground(wxEraseEvent& event)
{ {
int cw, ch;
GetClientSize( &cw, &ch );
int right, bottom;
m_owner->CalcUnscrolledPosition( cw, ch, &right, &bottom );
wxRect rightRect;
rightRect = m_owner->CellToRect( 0, m_owner->GetNumberCols()-1 );
wxRect bottomRect;
bottomRect = m_owner->CellToRect( m_owner->GetNumberRows()-1, 0 );
if ( right > rightRect.GetRight() || bottom > bottomRect.GetBottom() )
{
int left, top;
m_owner->CalcUnscrolledPosition( 0, 0, &left, &top );
wxClientDC dc( this );
m_owner->PrepareDC( dc );
dc.SetBrush( wxBrush(m_owner->GetDefaultCellBackgroundColour(), wxSOLID) );
dc.SetPen( *wxTRANSPARENT_PEN );
if ( right > rightRect.GetRight() )
dc.DrawRectangle( rightRect.GetRight()+1, top, right - rightRect.GetRight(), ch );
if ( bottom > bottomRect.GetBottom() )
dc.DrawRectangle( left, bottomRect.GetBottom()+1, cw, bottom - bottomRect.GetBottom() );
}
} }
@@ -4829,6 +4799,37 @@ void wxGrid::DrawGridCellArea( wxDC& dc )
} }
void wxGrid::DrawGridSpace( wxDC& dc )
{
if ( m_numRows && m_numCols )
{
int cw, ch;
m_gridWin->GetClientSize( &cw, &ch );
int right, bottom;
CalcUnscrolledPosition( cw, ch, &right, &bottom );
if ( right > GetColRight(m_numCols-1) ||
bottom > GetRowBottom(m_numRows-1) )
{
int left, top;
CalcUnscrolledPosition( 0, 0, &left, &top );
dc.SetBrush( wxBrush(GetDefaultCellBackgroundColour(), wxSOLID) );
dc.SetPen( *wxTRANSPARENT_PEN );
if ( right > GetColRight(m_numCols-1) )
dc.DrawRectangle( GetColRight(m_numCols-1)+1, top,
right - GetColRight(m_numCols-1), ch );
if ( bottom > GetRowBottom(m_numRows-1) )
dc.DrawRectangle( left, GetRowBottom(m_numRows-1)+1,
cw, bottom - GetRowBottom(m_numRows-1) );
}
}
}
void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords ) void wxGrid::DrawCell( wxDC& dc, const wxGridCellCoords& coords )
{ {
int row = coords.GetRow(); int row = coords.GetRow();
@@ -5401,7 +5402,6 @@ void wxGrid::HideCellEditControl()
} }
void wxGrid::SaveEditControlValue() void wxGrid::SaveEditControlValue()
{ {
if ( IsCellEditControlEnabled() ) if ( IsCellEditControlEnabled() )