widget: Remove gtk_widget_set_allocation

This commit is contained in:
Timm Bäder
2017-05-05 19:27:50 +02:00
parent af255e6ef8
commit bde514b70f
3 changed files with 3 additions and 42 deletions

View File

@@ -4611,7 +4611,6 @@ gtk_cairo_transform_to_window
gtk_widget_get_allocated_width
gtk_widget_get_allocated_height
gtk_widget_get_allocation
gtk_widget_set_allocation
gtk_widget_get_allocated_baseline
gtk_widget_get_allocated_size
gtk_widget_get_clip

View File

@@ -5578,7 +5578,8 @@ gtk_widget_size_allocate_with_baseline (GtkWidget *widget,
/* Set the widget allocation to real_allocation now, pass the smaller allocation to the vfunc */
gtk_widget_set_allocation (widget, &real_allocation);
priv->allocation = real_allocation;
priv->clip = real_allocation;
style = gtk_css_node_get_style (priv->cssnode);
get_box_margin (style, &margin);
@@ -13430,8 +13431,6 @@ gtk_widget_get_clip (GtkWidget *widget,
*
* Sets the widgets clip. This must not be used directly,
* but from within a widgets size_allocate method.
* It must be called after gtk_widget_set_allocation() (or after chaining up
* to the parent class), because that function resets the clip.
*
* The clip set should be the area that @widget draws on. If @widget is a
* #GtkContainer, the area must contain all children's clips.
@@ -13501,8 +13500,7 @@ gtk_widget_set_clip (GtkWidget *widget,
* This is a convenience function for gtk_widget_set_clip(), if you
* just want to set the clip for @widget based on its allocation,
* CSS properties and - if the widget is a #GtkContainer - its
* children. gtk_widget_set_allocation() must have been called
* and all children must have been allocated with
* children. All children must have been allocated with
* gtk_widget_size_allocate() before calling this function.
* It is therefore a good idea to call this function last in
* your implementation of GtkWidget::size_allocate().
@@ -13692,39 +13690,6 @@ gtk_widget_get_margin_allocation (GtkWidget *widget,
allocation->height -= margin.top + margin.bottom;
}
/**
* gtk_widget_set_allocation:
* @widget: a #GtkWidget
* @allocation: a pointer to a #GtkAllocation to copy from
*
* Sets the widgets allocation. This should not be used
* directly, but from within a widgets size_allocate method.
*
* The allocation set should be the “adjusted” or actual
* allocation. If youre implementing a #GtkContainer, you want to use
* gtk_widget_size_allocate() instead of gtk_widget_set_allocation().
* The GtkWidgetClass::adjust_size_allocation virtual method adjusts the
* allocation inside gtk_widget_size_allocate() to create an adjusted
* allocation.
*
* Since: 2.18
*/
void
gtk_widget_set_allocation (GtkWidget *widget,
const GtkAllocation *allocation)
{
GtkWidgetPrivate *priv;
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (_gtk_widget_get_visible (widget) || _gtk_widget_is_toplevel (widget));
g_return_if_fail (allocation != NULL);
priv = widget->priv;
priv->allocation = *allocation;
priv->clip = *allocation;
}
/**
* gtk_widget_get_allocated_width:
* @widget: the widget to query

View File

@@ -759,9 +759,6 @@ void gtk_widget_get_allocated_size (GtkWidget *widget,
GDK_AVAILABLE_IN_ALL
void gtk_widget_get_allocation (GtkWidget *widget,
GtkAllocation *allocation);
GDK_AVAILABLE_IN_ALL
void gtk_widget_set_allocation (GtkWidget *widget,
const GtkAllocation *allocation);
GDK_AVAILABLE_IN_3_14
void gtk_widget_set_clip (GtkWidget *widget,
const GtkAllocation *clip);