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

Changed wxGrid::OnPaint to call Refresh on subwindows.

Browse Source 
Added Refresh to wxGrid::EndBatch().
Use batch mode in sample.
Changed CalcDimension to better handle cases with zero columns or rows.
No more automatic insertion of column when adding rows to a grid without
        columns.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2000-03-26 12:36:59 +00:00
parent 48ed8556ac
commit 6989e08f3a
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1049,7 +1049,16 @@ public:
// flicker
//
void BeginBatch() { m_batchCount++; }
void EndBatch() { if ( m_batchCount > 0 ) m_batchCount--; }
void EndBatch()
{
if ( m_batchCount > 0 )
{
m_batchCount--;
if ( !m_batchCount )
Refresh();
}
}
int GetBatchCount() { return m_batchCount; }

4
samples/newgrid/griddemo.cpp
View File

@@ -497,11 +497,13 @@ void GridFrame::DeleteSelectedRows( wxCommandEvent& WXUNUSED(ev) )
{
if ( grid->IsSelection() )
{
grid->BeginBatch();
for ( int n = 0; n < grid->GetNumberRows(); )
if ( grid->IsInSelection( n , 0 ) )
grid->DeleteRows( n, 1 );
else
n++;
grid->EndBatch();
}
}
@@ -510,11 +512,13 @@ void GridFrame::DeleteSelectedCols( wxCommandEvent& WXUNUSED(ev) )
{
if ( grid->IsSelection() )
{
grid->BeginBatch();
for ( int n = 0; n < grid->GetNumberCols(); )
if ( grid->IsInSelection( 0 , n ) )
grid->DeleteCols( n, 1 );
else
n++;
grid->EndBatch();
}
}

17
src/generic/grid.cpp
View File

@@ -3384,10 +3384,10 @@ void wxGrid::CalcDimensions()
int cw, ch;
GetClientSize( &cw, &ch );
if ( m_numRows > 0 && m_numCols > 0 )
if ( m_numRows > 0 || m_numCols > 0 )
{
int right = GetColRight( m_numCols-1 ) + m_extraWidth;
int bottom = GetRowBottom( m_numRows-1 ) + m_extraHeight;
int right = m_numCols > 0 ? GetColRight( m_numCols-1 ) + m_extraWidth : 0;
int bottom = m_numRows > 0 ? GetRowBottom( m_numRows-1 ) + m_extraHeight : 0;
// TODO: restore the scroll position that we had before sizing
//
@@ -4774,6 +4774,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
//
if ( ok )
{
#if 0
if ( m_numCols == 0 )
{
m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS );
@@ -4782,7 +4783,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
// we should remember what the last non-zero number of cols was ?
//
}
#endif
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
@@ -4821,6 +4822,7 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
if ( m_table && m_table->AppendRows( numRows ) )
{
#if 0
if ( m_numCols == 0 )
{
m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS );
@@ -4829,7 +4831,7 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
// we should remember what the last non-zero number of cols was ?
//
}
#endif
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
@@ -5104,7 +5106,10 @@ bool wxGrid::SendEvent( const wxEventType type,
void wxGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc( this );
m_rowLabelWin->Refresh();
m_colLabelWin->Refresh();
m_cornerLabelWin->Refresh();
m_gridWin->Refresh();
}