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

Fix for crash when opening empty node

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-07-20 08:23:53 +00:00
parent 25d6eb3a77
commit ee5aa9d44f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/dataview.cpp
View File

@@ -2313,6 +2313,9 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *
wxGtkTreeModelNode *parent_node = FindNode( parent ); wxGtkTreeModelNode *parent_node = FindNode( parent );
BuildBranch( parent_node ); BuildBranch( parent_node );
if (parent_node->GetChildren().GetCount() == 0)
return FALSE;
wxGtkTreeModelNode *first_child_node = parent_node->GetChildren().Item( 0 ); wxGtkTreeModelNode *first_child_node = parent_node->GetChildren().Item( 0 );
iter->stamp = m_gtk_model->stamp; iter->stamp = m_gtk_model->stamp;
@@ -2324,8 +2327,15 @@ gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *
gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter ) gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
{ {
wxDataViewItem item( (void*) iter->user_data ); wxDataViewItem item( (void*) iter->user_data );
bool res = m_wx_model->HasChildren( item );
return m_wx_model->HasChildren( item ); if (!res)
return FALSE;
wxGtkTreeModelNode *node = FindNode( iter );
BuildBranch( node );
return (node->GetChildren().GetCount() > 0);
} }
gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter ) gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )