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

disable edit control before insert/delete row/col

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-02-16 20:42:43 +00:00
parent d73dd2b2fc
commit b7fff980e7
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/generic/grid.cpp
View File

@@ -3240,6 +3240,9 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
if ( m_table ) if ( m_table )
{ {
if (IsCellEditControlEnabled())
EnableCellEditControl(FALSE);
bool ok = m_table->InsertRows( pos, numRows ); bool ok = m_table->InsertRows( pos, numRows );
// the table will have sent the results of the insert row // the table will have sent the results of the insert row
@@ -3322,24 +3325,23 @@ bool wxGrid::DeleteRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
return FALSE; return FALSE;
} }
if ( m_table && m_table->DeleteRows( pos, numRows ) ) if ( m_table )
{ {
// the table will have sent the results of the delete row if (IsCellEditControlEnabled())
// operation to this view object as a grid table message EnableCellEditControl(FALSE);
//
if ( m_numRows > 0 )
SetEditControlValue();
else
HideCellEditControl();
ClearSelection(); if (m_table->DeleteRows( pos, numRows ))
if ( !GetBatchCount() ) Refresh(); {
return TRUE;
} // the table will have sent the results of the delete row
else // operation to this view object as a grid table message
{ //
return FALSE; ClearSelection();
if ( !GetBatchCount() ) Refresh();
return TRUE;
}
} }
return FALSE;
} }
@@ -3355,7 +3357,9 @@ bool wxGrid::InsertCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
if ( m_table ) if ( m_table )
{ {
HideCellEditControl(); if (IsCellEditControlEnabled())
EnableCellEditControl(FALSE);
bool ok = m_table->InsertCols( pos, numCols ); bool ok = m_table->InsertCols( pos, numCols );
// the table will have sent the results of the insert col // the table will have sent the results of the insert col
@@ -3429,24 +3433,22 @@ bool wxGrid::DeleteCols( int pos, int numCols, bool WXUNUSED(updateLabels) )
return FALSE; return FALSE;
} }
if ( m_table && m_table->DeleteCols( pos, numCols ) ) if ( m_table )
{ {
// the table will have sent the results of the delete col if (IsCellEditControlEnabled())
// operation to this view object as a grid table message EnableCellEditControl(FALSE);
//
if ( m_numCols > 0 )
SetEditControlValue();
else
HideCellEditControl();
ClearSelection(); if ( m_table->DeleteCols( pos, numCols ) )
if ( !GetBatchCount() ) Refresh(); {
return TRUE; // the table will have sent the results of the delete col
} // operation to this view object as a grid table message
else //
{ ClearSelection();
return FALSE; if ( !GetBatchCount() ) Refresh();
return TRUE;
}
} }
return FALSE;
} }