diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c index 4980bed78d..e5a440f74a 100644 --- a/gtk/gtkgridview.c +++ b/gtk/gtkgridview.c @@ -813,9 +813,6 @@ gtk_grid_view_class_init (GtkGridViewClass *klass) list_base_class->list_item_name = "child"; list_base_class->list_item_role = GTK_ACCESSIBLE_ROLE_GRID_CELL; - list_base_class->list_item_size = sizeof (GtkListTile); - list_base_class->list_item_augment_size = sizeof (GtkListTileAugment); - list_base_class->list_item_augment_func = gtk_list_item_manager_augment_node; list_base_class->get_allocation_along = gtk_grid_view_get_allocation_along; list_base_class->get_allocation_across = gtk_grid_view_get_allocation_across; list_base_class->get_items_in_rect = gtk_grid_view_get_items_in_rect; diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c index 5b1af350c3..0392abd37b 100644 --- a/gtk/gtklistbase.c +++ b/gtk/gtklistbase.c @@ -1877,12 +1877,9 @@ gtk_list_base_init_real (GtkListBase *self, GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self); GtkEventController *controller; - priv->item_manager = gtk_list_item_manager_new_for_size (GTK_WIDGET (self), - g_class->list_item_name, - g_class->list_item_role, - g_class->list_item_size, - g_class->list_item_augment_size, - g_class->list_item_augment_func); + priv->item_manager = gtk_list_item_manager_new (GTK_WIDGET (self), + g_class->list_item_name, + g_class->list_item_role); priv->anchor = gtk_list_item_tracker_new (priv->item_manager); priv->anchor_side_along = GTK_PACK_START; priv->anchor_side_across = GTK_PACK_START; diff --git a/gtk/gtklistbaseprivate.h b/gtk/gtklistbaseprivate.h index 2d4fb23e1a..af70843c40 100644 --- a/gtk/gtklistbaseprivate.h +++ b/gtk/gtklistbaseprivate.h @@ -36,9 +36,6 @@ struct _GtkListBaseClass const char * list_item_name; GtkAccessibleRole list_item_role; - gsize list_item_size; - gsize list_item_augment_size; - GtkRbTreeAugmentFunc list_item_augment_func; void (* adjustment_value_changed) (GtkListBase *self, GtkOrientation orientation); diff --git a/gtk/gtklistitemmanager.c b/gtk/gtklistitemmanager.c index 608a9fd76f..a1e9e05595 100644 --- a/gtk/gtklistitemmanager.c +++ b/gtk/gtklistitemmanager.c @@ -90,7 +90,7 @@ potentially_empty_rectangle_union (cairo_rectangle_int_t *self, gdk_rectangle_union (self, area, self); } -void +static void gtk_list_item_manager_augment_node (GtkRbTree *tree, gpointer node_augment, gpointer node, @@ -129,18 +129,13 @@ gtk_list_item_manager_clear_node (gpointer _tile) } GtkListItemManager * -gtk_list_item_manager_new_for_size (GtkWidget *widget, - const char *item_css_name, - GtkAccessibleRole item_role, - gsize element_size, - gsize augment_size, - GtkRbTreeAugmentFunc augment_func) +gtk_list_item_manager_new (GtkWidget *widget, + const char *item_css_name, + GtkAccessibleRole item_role) { GtkListItemManager *self; g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - g_return_val_if_fail (element_size >= sizeof (GtkListTile), NULL); - g_return_val_if_fail (augment_size >= sizeof (GtkListTileAugment), NULL); self = g_object_new (GTK_TYPE_LIST_ITEM_MANAGER, NULL); @@ -149,9 +144,9 @@ gtk_list_item_manager_new_for_size (GtkWidget *widget, self->item_css_name = g_intern_string (item_css_name); self->item_role = item_role; - self->items = gtk_rb_tree_new_for_size (element_size, - augment_size, - augment_func, + self->items = gtk_rb_tree_new_for_size (sizeof (GtkListTile), + sizeof (GtkListTileAugment), + gtk_list_item_manager_augment_node, gtk_list_item_manager_clear_node, NULL); diff --git a/gtk/gtklistitemmanagerprivate.h b/gtk/gtklistitemmanagerprivate.h index d5ee20fc6a..14d058a377 100644 --- a/gtk/gtklistitemmanagerprivate.h +++ b/gtk/gtklistitemmanagerprivate.h @@ -61,20 +61,10 @@ struct _GtkListTileAugment GType gtk_list_item_manager_get_type (void) G_GNUC_CONST; -GtkListItemManager * gtk_list_item_manager_new_for_size (GtkWidget *widget, +GtkListItemManager * gtk_list_item_manager_new (GtkWidget *widget, const char *item_css_name, - GtkAccessibleRole item_role, - gsize element_size, - gsize augment_size, - GtkRbTreeAugmentFunc augment_func); -#define gtk_list_item_manager_new(widget, item_css_name, type, augment_type, augment_func) \ - gtk_list_item_manager_new_for_size (widget, item_css_name, sizeof (type), sizeof (augment_type), (augment_func)) + GtkAccessibleRole item_role); -void gtk_list_item_manager_augment_node (GtkRbTree *tree, - gpointer node_augment, - gpointer node, - gpointer left, - gpointer right); void gtk_list_item_manager_get_tile_bounds (GtkListItemManager *self, GdkRectangle *out_bounds); gpointer gtk_list_item_manager_get_root (GtkListItemManager *self); diff --git a/gtk/gtklistview.c b/gtk/gtklistview.c index 65fce34dbf..ee3a0bbc6a 100644 --- a/gtk/gtklistview.c +++ b/gtk/gtklistview.c @@ -663,9 +663,6 @@ gtk_list_view_class_init (GtkListViewClass *klass) list_base_class->list_item_name = "row"; list_base_class->list_item_role = GTK_ACCESSIBLE_ROLE_LIST_ITEM; - list_base_class->list_item_size = sizeof (GtkListTile); - list_base_class->list_item_augment_size = sizeof (GtkListTileAugment); - list_base_class->list_item_augment_func = gtk_list_item_manager_augment_node; list_base_class->get_allocation_along = gtk_list_view_get_allocation_along; list_base_class->get_allocation_across = gtk_list_view_get_allocation_across; list_base_class->get_items_in_rect = gtk_list_view_get_items_in_rect;