summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
Diffstat (limited to 'demos')
-rw-r--r--demos/gtk-demo/listview_applauncher.c5
-rw-r--r--demos/gtk-demo/listview_clocks.c2
-rw-r--r--demos/gtk-demo/listview_colors.c13
-rw-r--r--demos/gtk-demo/listview_settings.c6
-rw-r--r--demos/gtk-demo/listview_weather.c5
-rw-r--r--demos/gtk-demo/listview_words.c6
-rw-r--r--demos/gtk-demo/main.c12
7 files changed, 27 insertions, 22 deletions
diff --git a/demos/gtk-demo/listview_applauncher.c b/demos/gtk-demo/listview_applauncher.c
index a6eb2f9863..5b5a507e3d 100644
--- a/demos/gtk-demo/listview_applauncher.c
+++ b/demos/gtk-demo/listview_applauncher.c
@@ -144,6 +144,7 @@ do_listview_applauncher (GtkWidget *do_widget)
{
GtkWidget *list, *sw;
GListModel *model;
+ GtkSelectionModel *selection;
GtkListItemFactory *factory;
/* Create a window and set a few defaults */
@@ -181,8 +182,10 @@ do_listview_applauncher (GtkWidget *do_widget)
* to create as many listitems as it needs to show itself to the user.
*/
model = create_application_list ();
- gtk_list_view_set_model (GTK_LIST_VIEW (list), model);
+ selection = GTK_SELECTION_MODEL (gtk_single_selection_new (model));
+ gtk_list_view_set_model (GTK_LIST_VIEW (list), selection);
g_object_unref (model);
+ g_object_unref (selection);
/* List widgets should always be contained in a #GtkScrolledWindow,
* because otherwise they might get too large or they might not
diff --git a/demos/gtk-demo/listview_clocks.c b/demos/gtk-demo/listview_clocks.c
index 4578c229cd..9d5b8d9f0b 100644
--- a/demos/gtk-demo/listview_clocks.c
+++ b/demos/gtk-demo/listview_clocks.c
@@ -491,7 +491,7 @@ do_listview_clocks (GtkWidget *do_widget)
model = create_clocks_model ();
selection = gtk_no_selection_new (model);
- gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
+ gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), GTK_SELECTION_MODEL (selection));
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
g_object_unref (selection);
g_object_unref (model);
diff --git a/demos/gtk-demo/listview_colors.c b/demos/gtk-demo/listview_colors.c
index af20292f4a..85e440213b 100644
--- a/demos/gtk-demo/listview_colors.c
+++ b/demos/gtk-demo/listview_colors.c
@@ -662,7 +662,8 @@ create_color_grid (void)
{
GtkWidget *gridview;
GtkListItemFactory *factory;
- GListModel *model, *selection;
+ GListModel *model;
+ GtkSelectionModel *selection;
gridview = gtk_grid_view_new ();
gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
@@ -678,7 +679,7 @@ create_color_grid (void)
model = G_LIST_MODEL (gtk_sort_list_model_new (gtk_color_list_new (0), NULL));
- selection = G_LIST_MODEL (gtk_multi_selection_new (model));
+ selection = GTK_SELECTION_MODEL (gtk_multi_selection_new (model));
gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
g_object_unref (selection);
g_object_unref (model);
@@ -857,7 +858,7 @@ do_listview_colors (GtkWidget *do_widget)
guint len;
GtkWidget *selection_view;
GListModel *selection_filter;
- GListModel *no_selection;
+ GtkSelectionModel *selection;
GtkWidget *grid;
GtkWidget *selection_size_label;
GtkWidget *selection_average_picture;
@@ -945,10 +946,10 @@ do_listview_colors (GtkWidget *do_widget)
g_signal_connect (selection_filter, "items-changed", G_CALLBACK (update_selection_count), selection_size_label);
g_signal_connect (selection_filter, "items-changed", G_CALLBACK (update_selection_average), selection_average_picture);
- no_selection = G_LIST_MODEL (gtk_no_selection_new (selection_filter));
- gtk_grid_view_set_model (GTK_GRID_VIEW (selection_view), no_selection);
+ selection = GTK_SELECTION_MODEL (gtk_no_selection_new (selection_filter));
+ gtk_grid_view_set_model (GTK_GRID_VIEW (selection_view), selection);
g_object_unref (selection_filter);
- g_object_unref (no_selection);
+ g_object_unref (selection);
model = gtk_multi_selection_get_model (GTK_MULTI_SELECTION (model));
g_object_ref (model);
diff --git a/demos/gtk-demo/listview_settings.c b/demos/gtk-demo/listview_settings.c
index 7dc55ada2f..4a5906fe41 100644
--- a/demos/gtk-demo/listview_settings.c
+++ b/demos/gtk-demo/listview_settings.c
@@ -345,7 +345,7 @@ do_listview_settings (GtkWidget *do_widget)
GtkWidget *listview, *columnview;
GListModel *model;
GtkTreeListModel *treemodel;
- GtkSingleSelection *selection;
+ GtkSelectionModel *selection;
GtkBuilderScope *scope;
GtkBuilder *builder;
GtkColumnViewColumn *name_column;
@@ -409,14 +409,14 @@ do_listview_settings (GtkWidget *do_widget)
create_settings_model,
NULL,
NULL);
- selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
+ selection = GTK_SELECTION_MODEL (gtk_single_selection_new (G_LIST_MODEL (treemodel)));
g_object_bind_property_full (selection, "selected-item",
columnview, "model",
G_BINDING_SYNC_CREATE,
transform_settings_to_keys,
NULL,
columnview, NULL);
- gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
+ gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
g_object_unref (selection);
g_object_unref (treemodel);
g_object_unref (model);
diff --git a/demos/gtk-demo/listview_weather.c b/demos/gtk-demo/listview_weather.c
index 535a9d179b..cfeb7c86a7 100644
--- a/demos/gtk-demo/listview_weather.c
+++ b/demos/gtk-demo/listview_weather.c
@@ -281,7 +281,8 @@ GtkWidget *
create_weather_view (void)
{
GtkWidget *listview;
- GListModel *model, *selection;
+ GListModel *model;
+ GtkSelectionModel *selection;
GtkListItemFactory *factory;
factory = gtk_signal_list_item_factory_new ();
@@ -291,7 +292,7 @@ create_weather_view (void)
gtk_orientable_set_orientation (GTK_ORIENTABLE (listview), GTK_ORIENTATION_HORIZONTAL);
gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
model = create_weather_model ();
- selection = G_LIST_MODEL (gtk_no_selection_new (model));
+ selection = GTK_SELECTION_MODEL (gtk_no_selection_new (model));
gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
g_object_unref (selection);
g_object_unref (model);
diff --git a/demos/gtk-demo/listview_words.c b/demos/gtk-demo/listview_words.c
index 95664ed279..f40bb54ae4 100644
--- a/demos/gtk-demo/listview_words.c
+++ b/demos/gtk-demo/listview_words.c
@@ -157,7 +157,7 @@ do_listview_words (GtkWidget *do_widget)
{
GtkWidget *header, *listview, *sw, *vbox, *search_entry, *open_button, *overlay;
GtkFilterListModel *filter_model;
- GtkNoSelection *selection;
+ GtkSelectionModel *selection;
GtkStringList *stringlist;
GtkFilter *filter;
GFile *file;
@@ -218,8 +218,8 @@ do_listview_words (GtkWidget *do_widget)
gtk_builder_list_item_factory_new_from_bytes (NULL,
g_bytes_new_static (factory_text, strlen (factory_text))));
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
- selection = gtk_no_selection_new (G_LIST_MODEL (filter_model));
- gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
+ selection = GTK_SELECTION_MODEL (gtk_no_selection_new (G_LIST_MODEL (filter_model)));
+ gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
g_object_unref (selection);
g_signal_connect (filter_model, "items-changed", G_CALLBACK (update_title_cb), progress);
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 0e3283aaa8..76085c9b7f 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -16,7 +16,7 @@ static GtkWidget *source_view;
static gchar *current_file = NULL;
static GtkWidget *notebook;
-static GtkSingleSelection *selection;
+static GtkSelectionModel *selection;
static GtkWidget *toplevel;
static char **search_needle;
@@ -220,7 +220,7 @@ activate_run (GSimpleAction *action,
GVariant *parameter,
gpointer window)
{
- GtkTreeListRow *row = gtk_single_selection_get_selected_item (selection);
+ GtkTreeListRow *row = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (selection));
GtkDemo *demo = gtk_tree_list_row_get_item (row);
gtk_demo_run (demo, window);
@@ -932,7 +932,7 @@ activate_cb (GtkWidget *widget,
guint position,
gpointer window)
{
- GtkTreeListRow *row = g_list_model_get_item (gtk_list_view_get_model (GTK_LIST_VIEW (widget)), position);
+ GtkTreeListRow *row = g_list_model_get_item (G_LIST_MODEL (gtk_list_view_get_model (GTK_LIST_VIEW (widget))), position);
GtkDemo *demo = gtk_tree_list_row_get_item (row);
gtk_demo_run (demo, window);
@@ -1152,11 +1152,11 @@ activate (GApplication *app)
search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);
- selection = gtk_single_selection_new (G_LIST_MODEL (filter_model));
+ selection = GTK_SELECTION_MODEL (gtk_single_selection_new (G_LIST_MODEL (filter_model)));
g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);
- gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
+ gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
- selection_cb (selection, NULL, NULL);
+ selection_cb (GTK_SINGLE_SELECTION (selection), NULL, NULL);
g_object_unref (builder);
}
View Lorry Controller Status