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

Properly implement Cleared() by calling row_deleted on every child of root, fixes #12327: wxDataViewListCtrl Crash

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2010-08-20 20:51:17 +00:00
parent f3b21e123e
commit c225708fd4
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gtk/dataview.cpp
View File

@@ -1619,6 +1619,20 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig
bool wxGtkDataViewModelNotifier::Cleared() bool wxGtkDataViewModelNotifier::Cleared()
{ {
// There is no call to tell the model that everything
// has been deleted so call row_deleted() for every
// child of root...
int count = m_owner->GtkGetInternal()->iter_n_children( NULL ); // number of children of root
GtkTreePath *path = gtk_tree_path_new_first(); // points to root
int i;
for (i = 0; i < count; i++)
gtk_tree_model_row_deleted( GTK_TREE_MODEL(m_wxgtk_model), path );
gtk_tree_path_free( path );
m_owner->GtkGetInternal()->Cleared(); m_owner->GtkGetInternal()->Cleared();
return true; return true;
@@ -3370,6 +3384,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node )
{ {
wxDataViewItemArray children; wxDataViewItemArray children;
unsigned int count = m_wx_model->GetChildren( node->GetItem(), children ); unsigned int count = m_wx_model->GetChildren( node->GetItem(), children );
unsigned int pos; unsigned int pos;
for (pos = 0; pos < count; pos++) for (pos = 0; pos < count; pos++)
{ {
@@ -3534,16 +3549,14 @@ wxDataViewCtrlInternal::row_drop_possible(GtkTreeDragDest *WXUNUSED(drag_dest),
bool wxDataViewCtrlInternal::Cleared() bool wxDataViewCtrlInternal::Cleared()
{ {
GtkWidget* tree_widget = GetOwner()->GtkGetTreeView();
gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), NULL );
gtk_tree_view_set_model( GTK_TREE_VIEW(tree_widget), GTK_TREE_MODEL(m_gtk_model) );
if (m_root) if (m_root)
{ {
delete m_root; delete m_root;
InitTree(); m_root = NULL;
} }
InitTree();
return true; return true;
} }