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/gtkcheckbutton.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/gtkcheckbutton.c')
| -rw-r--r-- | gtk/gtkcheckbutton.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index d5d1dcdd0e..083a0a7e26 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -78,8 +78,7 @@ static void gtk_check_button_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip); + int baseline); typedef struct { GtkWidget *indicator_widget; @@ -442,12 +441,10 @@ gtk_check_button_new_with_mnemonic (const gchar *label) static void gtk_check_button_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip) + int baseline) { GtkCheckButtonPrivate *priv = gtk_check_button_get_instance_private (GTK_CHECK_BUTTON (widget)); GtkAllocation child_alloc = { 0 }; - GdkRectangle child_clip; GtkWidget *child; gboolean is_rtl = _gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; int x = 0; @@ -471,8 +468,7 @@ gtk_check_button_size_allocate (GtkWidget *widget, child_alloc.x = allocation->x; } - gtk_widget_size_allocate (priv->indicator_widget, &child_alloc, baseline, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + gtk_widget_size_allocate (priv->indicator_widget, &child_alloc, baseline); } child = gtk_bin_get_child (GTK_BIN (widget)); @@ -483,8 +479,7 @@ gtk_check_button_size_allocate (GtkWidget *widget, child_alloc.width = allocation->width - child_alloc.width; /* Indicator width */ child_alloc.height = allocation->height; - gtk_widget_size_allocate (child, &child_alloc, baseline, &child_clip); - gdk_rectangle_union (out_clip, &child_clip, out_clip); + gtk_widget_size_allocate (child, &child_alloc, baseline); } } |