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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/testinput.c | 1 | ||||
| -rw-r--r-- | tests/testoverlaystyleclass.c | 5 | ||||
| -rw-r--r-- | tests/testwidgetfocus.c | 11 |
3 files changed, 8 insertions, 9 deletions
diff --git a/tests/testinput.c b/tests/testinput.c index a298f14168..9694e84bdf 100644 --- a/tests/testinput.c +++ b/tests/testinput.c @@ -36,7 +36,6 @@ static void size_allocate (GtkWidget *widget, GtkAllocation *allocation, int baseline, - GdkRectangle *clip, gpointer data) { if (surface) diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c index 6ed24b11d6..86437ee020 100644 --- a/tests/testoverlaystyleclass.c +++ b/tests/testoverlaystyleclass.c @@ -1,9 +1,10 @@ #include <gtk/gtk.h> static void -child_size_allocate (GtkWidget *child, +child_size_allocate (GtkWidget *child, GdkRectangle *allocation, - gpointer user_data) + gint baseline, + gpointer user_data) { GtkStyleContext *context; context = gtk_widget_get_style_context (child); diff --git a/tests/testwidgetfocus.c b/tests/testwidgetfocus.c index 5d33302bdc..a0a196a50a 100644 --- a/tests/testwidgetfocus.c +++ b/tests/testwidgetfocus.c @@ -90,8 +90,7 @@ G_DEFINE_TYPE(GtkFocusWidget, gtk_focus_widget, GTK_TYPE_WIDGET) static void gtk_focus_widget_size_allocate (GtkWidget *widget, const GtkAllocation *allocation, - int baseline, - GtkAllocation *out_clip) + int baseline) { GtkFocusWidget *self = GTK_FOCUS_WIDGET (widget); int child_width = (allocation->width) / 2; @@ -103,19 +102,19 @@ gtk_focus_widget_size_allocate (GtkWidget *widget, child_alloc.width = child_width; child_alloc.height = child_height; - gtk_widget_size_allocate (self->child1, &child_alloc, -1, out_clip); + gtk_widget_size_allocate (self->child1, &child_alloc, -1); child_alloc.x += child_width; - gtk_widget_size_allocate (self->child2, &child_alloc, -1, out_clip); + gtk_widget_size_allocate (self->child2, &child_alloc, -1); child_alloc.y += child_height; - gtk_widget_size_allocate (self->child4, &child_alloc, -1, out_clip); + gtk_widget_size_allocate (self->child4, &child_alloc, -1); child_alloc.x -= child_width; - gtk_widget_size_allocate (self->child3, &child_alloc, -1, out_clip); + gtk_widget_size_allocate (self->child3, &child_alloc, -1); } static void |