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

Allow calling iter_children with parent being NULL, hopefully fixes #12035 (wxDataViewCtrl crashes when selecting item)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2010-05-16 14:23:07 +00:00
parent 8c62319a81
commit 3556d648eb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/dataview.cpp
View File

@@ -623,7 +623,10 @@ wxgtk_tree_model_iter_children (GtkTreeModel *tree_model,
{ {
GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model; GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE); g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), FALSE);
if (parent)
{
g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE);
}
return wxtree_model->internal->iter_children( iter, parent ); return wxtree_model->internal->iter_children( iter, parent );
} }
@@ -3619,7 +3622,10 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *
return TRUE; return TRUE;
} }
wxDataViewItem item( (void*) parent->user_data );
wxDataViewItem item;
if (parent)
item = wxDataViewItem( (void*) parent->user_data );
if (!m_wx_model->IsContainer( item )) if (!m_wx_model->IsContainer( item ))
return FALSE; return FALSE;