diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-07-26 18:27:23 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-07-26 18:27:23 -0400 |
commit | 43000abeff11caa481b21ebe102dff9d6b439e18 (patch) | |
tree | 5965c665e36c8d90dbb6373cdc6fe0335dbfbd4b /tests | |
parent | 72bb7fc701700d8b727010868256d9596c4a128b (diff) | |
download | gtk+-43000abeff11caa481b21ebe102dff9d6b439e18.tar.gz |
listview: Revise constructors
Make both gtk_list_view_new and gtk_list_view_new_with_factory
take a model as first argument, and make all arguments
allow-none and transfer full.
Update all callers.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/testcolumnview.c | 3 | ||||
-rw-r--r-- | tests/testlistdnd.c | 12 | ||||
-rw-r--r-- | tests/testlistview-animating.c | 2 | ||||
-rw-r--r-- | tests/testlistview.c | 2 |
4 files changed, 5 insertions, 14 deletions
diff --git a/tests/testcolumnview.c b/tests/testcolumnview.c index e60eab6746..58638b9adf 100644 --- a/tests/testcolumnview.c +++ b/tests/testcolumnview.c @@ -771,8 +771,8 @@ main (int argc, char *argv[]) g_object_unref (filter); list = gtk_list_view_new_with_factory ( + g_object_ref (gtk_column_view_get_columns (GTK_COLUMN_VIEW (view))), gtk_builder_list_item_factory_new_from_bytes (scope, g_bytes_new_static (factory_ui, strlen (factory_ui)))); - gtk_list_view_set_model (GTK_LIST_VIEW (list), gtk_column_view_get_columns (GTK_COLUMN_VIEW (view))); gtk_box_append (GTK_BOX (hbox), list); g_object_unref (scope); @@ -783,6 +783,5 @@ main (int argc, char *argv[]) while (g_list_model_get_n_items (toplevels)) g_main_context_iteration (NULL, TRUE); - return 0; } diff --git a/tests/testlistdnd.c b/tests/testlistdnd.c index 533f0a8d38..338b522842 100644 --- a/tests/testlistdnd.c +++ b/tests/testlistdnd.c @@ -365,13 +365,9 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_stack_add_titled (GTK_STACK (stack), sw, "list", "GtkListView"); - list = gtk_list_view_new (); + list = gtk_list_view_new (create_model (0, 400, 1, FALSE)); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list); - model = create_model (0, 400, 1, FALSE); - gtk_list_view_set_model (GTK_LIST_VIEW (list), model); - g_object_unref (model); - factory = gtk_signal_list_item_factory_new (); g_signal_connect (factory, "setup", G_CALLBACK (setup_item), NULL); g_signal_connect (factory, "bind", G_CALLBACK (bind_item), NULL); @@ -415,13 +411,9 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_stack_add_titled (GTK_STACK (stack), sw, "tree", "Tree"); - list = gtk_list_view_new (); + list = gtk_list_view_new (create_tree_model (20, 20)); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list); - model = create_tree_model (20, 20); - gtk_list_view_set_model (GTK_LIST_VIEW (list), model); - g_object_unref (model); - factory = gtk_signal_list_item_factory_new (); g_signal_connect (factory, "setup", G_CALLBACK (setup_tree_item), NULL); g_signal_connect (factory, "bind", G_CALLBACK (bind_tree_item), NULL); diff --git a/tests/testlistview-animating.c b/tests/testlistview-animating.c index 7902948ab2..1baac2a7b9 100644 --- a/tests/testlistview-animating.c +++ b/tests/testlistview-animating.c @@ -148,7 +148,7 @@ main (int argc, factory = gtk_signal_list_item_factory_new (); g_signal_connect (factory, "setup", G_CALLBACK (setup_list_item), NULL); g_signal_connect (factory, "bind", G_CALLBACK (bind_list_item), NULL); - listview = gtk_list_view_new_with_factory (factory); + listview = gtk_list_view_new_with_factory (NULL, factory); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview); diff --git a/tests/testlistview.c b/tests/testlistview.c index c0552d14af..567ab3224c 100644 --- a/tests/testlistview.c +++ b/tests/testlistview.c @@ -615,7 +615,7 @@ main (int argc, char *argv[]) factory = gtk_signal_list_item_factory_new (); g_signal_connect (factory, "setup", G_CALLBACK (setup_widget), NULL); - listview = gtk_list_view_new_with_factory (factory); + listview = gtk_list_view_new_with_factory (NULL, factory); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview); if (argc > 1) |