[goocanvas] gtk4: Adapt to changed size_allocate signature.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goocanvas] gtk4: Adapt to changed size_allocate signature.
- Date: Wed, 1 Nov 2017 20:16:27 +0000 (UTC)
commit b6774677502fb94729f5d495304cc1982014f138
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Nov 1 21:14:24 2017 +0100
gtk4: Adapt to changed size_allocate signature.
src/goocanvas.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/src/goocanvas.c b/src/goocanvas.c
index 777a4a5..e1b8fe9 100644
--- a/src/goocanvas.c
+++ b/src/goocanvas.c
@@ -180,8 +180,10 @@ static void goo_canvas_measure (GtkWidget *widget,
gint *natural,
gint *minimum_baseline,
gint *natural_baseline);
-static void goo_canvas_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
+static void goo_canvas_size_allocate (GtkWidget *widget,
+ const GtkAllocation *allocation,
+ int baseline,
+ GtkAllocation *out_clip);
static void goo_canvas_set_hadjustment (GooCanvas *canvas,
GtkAdjustment *adjustment);
static void goo_canvas_set_vadjustment (GooCanvas *canvas,
@@ -1962,7 +1964,9 @@ goo_canvas_measure (GtkWidget *widget,
static void
goo_canvas_allocate_child_widget (GooCanvas *canvas,
- GooCanvasWidget *witem)
+ GooCanvasWidget *witem,
+ int baseline,
+ GtkAllocation *out_clip)
{
GooCanvasBounds bounds;
GtkRequisition minimum_size;
@@ -1983,13 +1987,15 @@ goo_canvas_allocate_child_widget (GooCanvas *canvas,
allocation.width = bounds.x2 - allocation.x;
allocation.height = bounds.y2 - allocation.y;
- gtk_widget_size_allocate (witem->widget, &allocation);
+ gtk_widget_size_allocate (witem->widget, &allocation, baseline, out_clip);
}
static void
goo_canvas_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+ const GtkAllocation *allocation,
+ int baseline,
+ GtkAllocation *out_clip)
{
GooCanvas *canvas;
GList *tmp_list;
@@ -2011,7 +2017,7 @@ goo_canvas_size_allocate (GtkWidget *widget,
tmp_list = tmp_list->next;
if (witem->widget)
- goo_canvas_allocate_child_widget (canvas, witem);
+ goo_canvas_allocate_child_widget (canvas, witem, baseline, out_clip);
}
gdk_window_move_resize (gtk_widget_get_window (widget),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]