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

Clean up wxDataViewMainWindow::ItemDeleted() a bit.

Browse Source 
Reuse shared code instead of duplicating it. No real changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2011-08-07 17:29:47 +00:00
parent c3b0247de1
commit b625294905
1 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/datavgen.cpp
View File

@@ -2006,17 +2006,11 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
(wxDataViewVirtualListModel*) GetOwner()->GetModel(); (wxDataViewVirtualListModel*) GetOwner()->GetModel();
m_count = list_model->GetCount(); m_count = list_model->GetCount();
if( m_currentRow > GetRowCount() )
m_currentRow = m_count - 1;
// TODO: why empty the entire selection? // TODO: why empty the entire selection?
m_selection.Empty(); m_selection.Empty();
UpdateDisplay();
return true;
} }
else // general case
{
wxDataViewTreeNode * node = FindNode(parent); wxDataViewTreeNode * node = FindNode(parent);
// Notice that it is possible that the item being deleted is not in the // Notice that it is possible that the item being deleted is not in the
@@ -2066,6 +2060,7 @@ bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
// Make the row number invalid and get a new valid one when user call GetRowCount // Make the row number invalid and get a new valid one when user call GetRowCount
m_count = -1; m_count = -1;
node->ChangeSubTreeCount(sub); node->ChangeSubTreeCount(sub);
}
// Change the current row to the last row if the current exceed the max row number // Change the current row to the last row if the current exceed the max row number
if( m_currentRow > GetRowCount() ) if( m_currentRow > GetRowCount() )