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

Fixed bug causing crashes when all rows or cols were deleted and then an attempt was made to insert rows/cols

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
1999-10-13 11:49:55 +00:00
parent 616b488dbc
commit 3f2965162c
1 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/generic/grid.cpp
View File

@@ -3354,8 +3354,26 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
// //
if ( ok ) if ( ok )
{ {
if ( m_numCols == 0 )
{
m_table->AppendCols( WXGRID_DEFAULT_NUMBER_COLS );
//
// TODO: perhaps instead of appending the default number of cols
// we should remember what the last non-zero number of cols was ?
//
}
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
// cell will be undefined...
//
SelectCell( 0, 0 );
}
if ( !GetBatchCount() ) Refresh(); if ( !GetBatchCount() ) Refresh();
} }
SetEditControlValue(); SetEditControlValue();
return ok; return ok;
} }
@@ -3377,6 +3395,14 @@ bool wxGrid::AppendRows( int numRows, bool WXUNUSED(updateLabels) )
if ( m_table && m_table->AppendRows( numRows ) ) if ( m_table && m_table->AppendRows( numRows ) )
{ {
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
// cell will be undefined...
//
SelectCell( 0, 0 );
}
// the table will have sent the results of the append row // the table will have sent the results of the append row
// operation to this view object as a grid table message // operation to this view object as a grid table message
// //
@@ -3432,13 +3458,23 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
{ {
HideCellEditControl(); HideCellEditControl();
bool ok = m_table->InsertCols( pos, numCols ); bool ok = m_table->InsertCols( pos, numCols );
if ( ok )
{
// the table will have sent the results of the insert col // the table will have sent the results of the insert col
// operation to this view object as a grid table message // operation to this view object as a grid table message
// //
if ( ok )
{
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
// cell will be undefined...
//
SelectCell( 0, 0 );
}
if ( !GetBatchCount() ) Refresh(); if ( !GetBatchCount() ) Refresh();
} }
SetEditControlValue(); SetEditControlValue();
return ok; return ok;
} }
@@ -3463,6 +3499,13 @@ bool wxGrid::AppendCols( int numCols, bool WXUNUSED(updateLabels) )
// the table will have sent the results of the append col // the table will have sent the results of the append col
// operation to this view object as a grid table message // operation to this view object as a grid table message
// //
if ( m_currentCellCoords == wxGridNoCellCoords )
{
// if we have just inserted cols into an empty grid the current
// cell will be undefined...
//
SelectCell( 0, 0 );
}
if ( !GetBatchCount() ) Refresh(); if ( !GetBatchCount() ) Refresh();
return TRUE; return TRUE;
} }