diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-31 21:02:28 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2018-04-05 14:56:38 +0200 |
| commit | 169203951b1a338e0a7ef737238731619e5b8c4a (patch) | |
| tree | 61eebf0a1f0a4b777e3ce58e779b2aa5fda31f63 /gtk/gtktoolbar.c | |
| parent | fc6de135fe30ad285c50267bc9d24e10135bcc2c (diff) | |
| download | gtk+-169203951b1a338e0a7ef737238731619e5b8c4a.tar.gz | |
widget: Remove clip from size-allocate vfunc
As the clip is no longer needed, get rid of it.
Diffstat (limited to 'gtk/gtktoolbar.c')
| -rw-r--r-- | gtk/gtktoolbar.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 60dd8bfc6f..ffded91c29 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -194,8 +194,7 @@ static void gtk_toolbar_snapshot (GtkWidget *widget, GtkSnapshot *snapshot); static void gtk_toolbar_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip); + int baseline); static void gtk_toolbar_style_updated (GtkWidget *widget); static gboolean gtk_toolbar_focus (GtkWidget *widget, GtkDirectionType dir); @@ -1206,8 +1205,7 @@ rebuild_menu (GtkToolbar *toolbar) static void gtk_toolbar_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip) + int baseline) { GtkToolbar *toolbar = GTK_TOOLBAR (widget); GtkToolbarPrivate *priv = toolbar->priv; @@ -1512,7 +1510,7 @@ gtk_toolbar_size_allocate (GtkWidget *widget, if (need_arrow) { - gtk_widget_size_allocate (GTK_WIDGET (priv->arrow_button), &arrow_allocation, -1, out_clip); + gtk_widget_size_allocate (GTK_WIDGET (priv->arrow_button), &arrow_allocation, -1); gtk_widget_show (GTK_WIDGET (priv->arrow_button)); } else @@ -2955,10 +2953,8 @@ static void toolbar_content_size_allocate (ToolbarContent *content, GtkAllocation *allocation) { - GtkAllocation clip; - content->allocation = *allocation; - gtk_widget_size_allocate (GTK_WIDGET (content->item), allocation, -1, &clip); + gtk_widget_size_allocate (GTK_WIDGET (content->item), allocation, -1); } static void |