From: Robert Roebling Date: Sun, 16 May 2010 14:23:07 +0000 (+0000) Subject: Allow calling iter_children with parent being NULL, hopefully fixes #12035 (wxDataVi... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3556d648eb5f1882d6a422049cfbdb02ff665a62?ds=sidebyside Allow calling iter_children with parent being NULL, hopefully fixes #12035 (wxDataViewCtrl crashes when selecting item) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 02423c65eb..f62853a3db 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -623,7 +623,10 @@ wxgtk_tree_model_iter_children (GtkTreeModel *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 (wxtree_model->stamp == parent->stamp, FALSE); + if (parent) + { + g_return_val_if_fail (wxtree_model->stamp == parent->stamp, FALSE); + } return wxtree_model->internal->iter_children( iter, parent ); } @@ -3619,7 +3622,10 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter * return TRUE; } - wxDataViewItem item( (void*) parent->user_data ); + + wxDataViewItem item; + if (parent) + item = wxDataViewItem( (void*) parent->user_data ); if (!m_wx_model->IsContainer( item )) return FALSE;