general: use new GtkScrollable interface

1 files changed, 16 insertions, 16 deletions

diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index 384970b2c..2332e3bdb 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -1835,11 +1835,11 @@ eel_canvas_accessible_initialize (AtkObject *obj,
 		ATK_OBJECT_CLASS (accessible_parent_class)->initialize (obj, data);
 
 	canvas = EEL_CANVAS (data);
-	g_signal_connect (gtk_layout_get_hadjustment (&canvas->layout),
+	g_signal_connect (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout)),
 			  "value_changed",
 			  G_CALLBACK (eel_canvas_accessible_adjustment_changed),
 			  obj);
-	g_signal_connect (gtk_layout_get_vadjustment (&canvas->layout),
+	g_signal_connect (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout)),
 			  "value_changed",
 			  G_CALLBACK (eel_canvas_accessible_adjustment_changed),
 			  obj);
@@ -2097,8 +2097,8 @@ eel_canvas_init (EelCanvas *canvas)
 	canvas->pick_event.crossing.x = 0;
 	canvas->pick_event.crossing.y = 0;
 
-	gtk_layout_set_hadjustment (GTK_LAYOUT (canvas), NULL);
-	gtk_layout_set_vadjustment (GTK_LAYOUT (canvas), NULL);
+	gtk_scrollable_set_hadjustment (GTK_SCROLLABLE (canvas), NULL);
+	gtk_scrollable_set_vadjustment (GTK_SCROLLABLE (canvas), NULL);
 
 	/* Create the root item as a special case */
 
@@ -2364,8 +2364,8 @@ scroll_to (EelCanvas *canvas, int cx, int cy)
 		gtk_widget_queue_draw (GTK_WIDGET (canvas));
 	}
 
-	hadjustment = gtk_layout_get_hadjustment (&canvas->layout);
-	vadjustment = gtk_layout_get_vadjustment (&canvas->layout);
+	hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
+	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
 
 	if (((int) gtk_adjustment_get_value (hadjustment)) != cx) {
 		gtk_adjustment_set_value (hadjustment, cx);
@@ -2406,8 +2406,8 @@ eel_canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 
 	/* Recenter the view, if appropriate */
 
-	hadjustment = gtk_layout_get_hadjustment (&canvas->layout);
-	vadjustment = gtk_layout_get_vadjustment (&canvas->layout);
+	hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
+	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
 
 	gtk_adjustment_set_page_size (hadjustment, allocation->width);
 	gtk_adjustment_set_page_increment (hadjustment, allocation->width / 2);
@@ -3092,8 +3092,8 @@ eel_canvas_set_scroll_region (EelCanvas *canvas, double x1, double y1, double x2
 	 * Set the new scrolling region.  If possible, do not move the visible contents of the
 	 * canvas.
 	 */
-	hadjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (canvas));
-	vadjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (canvas));
+	hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas));
+	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas));
 
 	eel_canvas_c2w (canvas,
 			  gtk_adjustment_get_value (hadjustment) + canvas->zoom_xofs,
@@ -3158,8 +3158,8 @@ eel_canvas_set_center_scroll_region (EelCanvas *canvas,
 
 	canvas->center_scroll_region = center_scroll_region != 0;
 
-	hadjustment = gtk_layout_get_hadjustment (&canvas->layout);
-	vadjustment = gtk_layout_get_vadjustment (&canvas->layout);
+	hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
+	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
 
 	scroll_to (canvas,
 		   gtk_adjustment_get_value (hadjustment),
@@ -3198,8 +3198,8 @@ eel_canvas_set_pixels_per_unit (EelCanvas *canvas, double n)
 	center_y = allocation.height / 2;
 
 	/* Find the coordinates of the screen center in units. */
-	hadjustment = gtk_layout_get_hadjustment (&canvas->layout);
-	vadjustment = gtk_layout_get_vadjustment (&canvas->layout);
+	hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
+	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
 	cx = (gtk_adjustment_get_value (hadjustment) + center_x) / canvas->pixels_per_unit + canvas->scroll_x1 + canvas->zoom_xofs;
 	cy = (gtk_adjustment_get_value (vadjustment) + center_y) / canvas->pixels_per_unit + canvas->scroll_y1 + canvas->zoom_yofs;
 
@@ -3295,8 +3295,8 @@ eel_canvas_get_scroll_offsets (EelCanvas *canvas, int *cx, int *cy)
 
 	g_return_if_fail (EEL_IS_CANVAS (canvas));
 
-	hadjustment = gtk_layout_get_hadjustment (&canvas->layout);
-	vadjustment = gtk_layout_get_vadjustment (&canvas->layout);
+	hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
+	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
 
 	if (cx)
 		*cx = gtk_adjustment_get_value (hadjustment);