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

iter = NULL in iter_n_children() means root

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-01-21 14:53:50 +00:00
parent f946f8bb9c
commit 11f20f99ee
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gtk/dataview.cpp
View File

@@ -641,6 +641,8 @@ wxgtk_tree_model_iter_n_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 (iter != NULL)
g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0); g_return_val_if_fail (wxtree_model->stamp == iter->stamp, 0);
return wxtree_model->internal->iter_n_children( iter ); return wxtree_model->internal->iter_n_children( iter );
@@ -3343,6 +3345,9 @@ gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
} }
else else
{ {
if (iter == NULL)
return m_root->GetChildCount();
wxDataViewItem item( (void*) iter->user_data ); wxDataViewItem item( (void*) iter->user_data );
if (!m_wx_model->IsContainer( item )) if (!m_wx_model->IsContainer( item ))