diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c index 875d488..8d33e31 100644 --- a/demos/gtk-demo/tree_store.c +++ b/demos/gtk-demo/tree_store.c @@ -69,13 +69,15 @@ static TreeItem A[] = {{ "C", C }, { "D", D }, { NULL }}; static TreeItem R[] = {{ "A", A }, { "B", B }, { NULL }}; static TreeItem O[] = {{ "R", R }, { NULL }}; // Artefact added for symetry +// iterate_node(model, item_0, item_1, &iter, &child_iter); static GtkTreeModel * iterate_node(GtkTreeStore *model, TreeItem *item_parent, TreeItem *item_children, - GtkTreeIter *iter_parent, GtkTreeIter *iter_children) -{ - printf("parent, children : %s -> %s %p -> %p %p -> %p\n",\ + GtkTreeIter iter_parent, GtkTreeIter iter_children) +{ printf("parent, children : %s -> %s %p -> %p %p -> %p %p -> %p %p -> %p\n",\ item_parent->label, item_children->label,\ + item_parent, item_children, + &item_parent, &item_children, iter_parent, iter_children, &iter_parent, &iter_children); /* gtk_tree_store_append (model, &iter_children, &iter_parent); */ @@ -91,21 +93,21 @@ create_model (void) TreeItem *item_0 = O->children; while (item_0->label) { GtkTreeIter iter; - iterate_node(model, O, item_0, model, &iter); + // iterate_node(model, O, item_0, (GtkTreeIter) model, iter); gtk_tree_store_append (model, &iter, NULL); gtk_tree_store_set (model, &iter, COLUMN_0, item_0->label, -1); TreeItem *item_1 = item_0->children; while (item_1->label) { GtkTreeIter child_iter; - iterate_node(model, item_0, item_1, &iter, &child_iter); + iterate_node(model, item_0, item_1, iter, child_iter); gtk_tree_store_append (model, &child_iter, &iter); gtk_tree_store_set (model, &child_iter, COLUMN_0, item_1->label, -1); TreeItem *item_2 = item_1->children; while (item_2->label) { GtkTreeIter child_child_iter; - iterate_node(model, item_1, item_2, &child_iter, &child_child_iter); + iterate_node(model, item_1, item_2, child_iter, child_child_iter); gtk_tree_store_append (model, &child_child_iter, &child_iter); gtk_tree_store_set (model, &child_child_iter, COLUMN_0, item_2->label, -1);