]> git.saurik.com Git - wxWidgets.git/commitdiff
Allow calling iter_children with parent being NULL, hopefully fixes #12035 (wxDataVi...
authorRobert Roebling <robert@roebling.de>
Sun, 16 May 2010 14:23:07 +0000 (14:23 +0000)
committerRobert Roebling <robert@roebling.de>
Sun, 16 May 2010 14:23:07 +0000 (14:23 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk/dataview.cpp

index 02423c65eb32e6907df798133878a1e0bc2b1345..f62853a3dba76de184bea0d04199f375947efb1b 100644 (file)
@@ -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;