From: Bilal Elmoussaoui Date: Mon, 3 Apr 2023 16:55:04 +0000 (+0200) Subject: gtk: Fix *_get_tab_behaviour return type X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~441^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d56815e98e35e3e922eb4a53266bfdad740546e3;p=gtk4.git gtk: Fix *_get_tab_behaviour return type --- diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c index 5437d684c4..b6726707f8 100644 --- a/gtk/gtkcolumnview.c +++ b/gtk/gtkcolumnview.c @@ -2098,7 +2098,7 @@ gtk_column_view_set_tab_behavior (GtkColumnView *self, * * Since: 4.12 */ -gboolean +GtkListTabBehavior gtk_column_view_get_tab_behavior (GtkColumnView *self) { g_return_val_if_fail (GTK_IS_COLUMN_VIEW (self), FALSE); diff --git a/gtk/gtkcolumnview.h b/gtk/gtkcolumnview.h index afccfcfd9d..4d6d03d040 100644 --- a/gtk/gtkcolumnview.h +++ b/gtk/gtkcolumnview.h @@ -112,7 +112,8 @@ GDK_AVAILABLE_IN_4_12 void gtk_column_view_set_tab_behavior (GtkColumnView *self, GtkListTabBehavior tab_behavior); GDK_AVAILABLE_IN_4_12 -gboolean gtk_column_view_get_tab_behavior (GtkColumnView *self); +GtkListTabBehavior + gtk_column_view_get_tab_behavior (GtkColumnView *self); GDK_AVAILABLE_IN_4_12 void gtk_column_view_set_row_factory (GtkColumnView *self, diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c index 9983d4153a..ead43a8c8b 100644 --- a/gtk/gtkgridview.c +++ b/gtk/gtkgridview.c @@ -253,7 +253,7 @@ gtk_grid_view_split (GtkListBase *base, tile, column_end (self, xspacing, col + n_items - 1) - tile->area.x, tile->area.height); - + return split; } @@ -264,7 +264,7 @@ gtk_grid_view_is_inert (GtkGridView *self) GtkWidget *widget = GTK_WIDGET (self); return !gtk_widget_get_visible (widget) || - gtk_widget_get_root (widget) == NULL || + gtk_widget_get_root (widget) == NULL || self->factory == NULL; } @@ -679,7 +679,7 @@ gtk_grid_view_measure_list (GtkWidget *widget, row_height = MAX (row_height, child_nat); measured = TRUE; } - + i += tile->n_items; if (i >= n_columns) @@ -767,7 +767,7 @@ gtk_grid_view_size_allocate (GtkWidget *widget, /* step 1: determine width of the list */ gtk_grid_view_measure_column_size (self, &col_min, &col_nat); - self->n_columns = gtk_grid_view_compute_n_columns (self, + self->n_columns = gtk_grid_view_compute_n_columns (self, orientation == GTK_ORIENTATION_VERTICAL ? width : height, xspacing, col_min, col_nat); @@ -1024,7 +1024,7 @@ gtk_grid_view_set_property (GObject *object, case PROP_MIN_COLUMNS: gtk_grid_view_set_min_columns (self, g_value_get_uint (value)); break; - + case PROP_MODEL: gtk_grid_view_set_model (self, g_value_get_object (value)); break; @@ -1560,7 +1560,7 @@ gtk_grid_view_set_tab_behavior (GtkGridView *self, * * Since: 4.12 */ -gboolean +GtkListTabBehavior gtk_grid_view_get_tab_behavior (GtkGridView *self) { g_return_val_if_fail (GTK_IS_GRID_VIEW (self), FALSE); diff --git a/gtk/gtkgridview.h b/gtk/gtkgridview.h index 2d14e399e5..9525c07c7b 100644 --- a/gtk/gtkgridview.h +++ b/gtk/gtkgridview.h @@ -76,7 +76,8 @@ GDK_AVAILABLE_IN_4_12 void gtk_grid_view_set_tab_behavior (GtkGridView *self, GtkListTabBehavior tab_behavior); GDK_AVAILABLE_IN_4_12 -gboolean gtk_grid_view_get_tab_behavior (GtkGridView *self); +GtkListTabBehavior + gtk_grid_view_get_tab_behavior (GtkGridView *self); GDK_AVAILABLE_IN_ALL void gtk_grid_view_set_single_click_activate (GtkGridView *self, diff --git a/gtk/gtklistview.c b/gtk/gtklistview.c index 74ace1d2d7..f6709be181 100644 --- a/gtk/gtklistview.c +++ b/gtk/gtklistview.c @@ -222,7 +222,7 @@ gtk_list_view_is_inert (GtkListView *self) GtkWidget *widget = GTK_WIDGET (self); return !gtk_widget_get_visible (widget) || - gtk_widget_get_root (widget) == NULL || + gtk_widget_get_root (widget) == NULL || self->factory == NULL; } @@ -1233,7 +1233,7 @@ gtk_list_view_set_tab_behavior (GtkListView *self, * * Since: 4.12 */ -gboolean +GtkListTabBehavior gtk_list_view_get_tab_behavior (GtkListView *self) { g_return_val_if_fail (GTK_IS_LIST_VIEW (self), FALSE); diff --git a/gtk/gtklistview.h b/gtk/gtklistview.h index 0067bec200..b3e3afb60a 100644 --- a/gtk/gtklistview.h +++ b/gtk/gtklistview.h @@ -79,7 +79,8 @@ GDK_AVAILABLE_IN_4_12 void gtk_list_view_set_tab_behavior (GtkListView *self, GtkListTabBehavior tab_behavior); GDK_AVAILABLE_IN_4_12 -gboolean gtk_list_view_get_tab_behavior (GtkListView *self); +GtkListTabBehavior + gtk_list_view_get_tab_behavior (GtkListView *self); G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListView, g_object_unref)