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

87
src/generic/datavgen.cpp
View File

@@ -2006,66 +2006,61 @@ 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);
// Notice that it is possible that the item being deleted is not in the
// tree at all, for example we could be deleting a never shown (because
// collapsed) item in a tree model. So it's not an error if we don't know
// about this item, just return without doing anything then.
if ( !node || node->GetChildren().Index(item.GetID()) == wxNOT_FOUND )
return false;
int sub = -1;
node->GetChildren().Remove( item.GetID() );
// Manipolate selection
if( m_selection.GetCount() > 1 )
{ {
m_selection.Empty(); wxDataViewTreeNode * node = FindNode(parent);
}
bool isContainer = false; // Notice that it is possible that the item being deleted is not in the
wxDataViewTreeNodes nds = node->GetNodes(); // tree at all, for example we could be deleting a never shown (because
for (size_t i = 0; i < nds.GetCount(); i ++) // collapsed) item in a tree model. So it's not an error if we don't know
{ // about this item, just return without doing anything then.
if (nds[i]->GetItem() == item) if ( !node || node->GetChildren().Index(item.GetID()) == wxNOT_FOUND )
return false;
int sub = -1;
node->GetChildren().Remove( item.GetID() );
// Manipolate selection
if( m_selection.GetCount() > 1 )
{ {
isContainer = true; m_selection.Empty();
break;
} }
} bool isContainer = false;
if( isContainer ) wxDataViewTreeNodes nds = node->GetNodes();
{ for (size_t i = 0; i < nds.GetCount(); i ++)
wxDataViewTreeNode * n = NULL;
wxDataViewTreeNodes nodes = node->GetNodes();
int len = nodes.GetCount();
for( int i = 0; i < len; i ++)
{ {
if( nodes[i]->GetItem() == item ) if (nds[i]->GetItem() == item)
{ {
n = nodes[i]; isContainer = true;
break; break;
} }
} }
if( isContainer )
{
wxDataViewTreeNode * n = NULL;
wxDataViewTreeNodes nodes = node->GetNodes();
int len = nodes.GetCount();
for( int i = 0; i < len; i ++)
{
if( nodes[i]->GetItem() == item )
{
n = nodes[i];
break;
}
}
wxCHECK_MSG( n != NULL, false, "item not found" ); wxCHECK_MSG( n != NULL, false, "item not found" );
node->GetNodes().Remove( n ); node->GetNodes().Remove( n );
sub -= n->GetSubTreeCount(); sub -= n->GetSubTreeCount();
::DestroyTreeHelper(n); ::DestroyTreeHelper(n);
}
// Make the row number invalid and get a new valid one when user call GetRowCount
m_count = -1;
node->ChangeSubTreeCount(sub);
} }
// Make the row number invalid and get a new valid one when user call GetRowCount
m_count = -1;
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() )