GNOME.org
 

[nautilus/gtk3-breakage: 7/7] general: use new GtkScrollable interface

commit 0ffb4eaee92d48a7e4601ced74dfb97c6c092982
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Oct 22 17:21:54 2010 +0200

    general: use new GtkScrollable interface

 eel/eel-canvas.c                                   |   32 +++++++-------
 libnautilus-private/nautilus-icon-container.c      |   46 ++++++++++----------
 libnautilus-private/nautilus-tree-view-drag-dest.c |    2 +-
 3 files changed, 40 insertions(+), 40 deletions(-)
---
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index 384970b..2332e3b 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);
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index e9ba675..db52e96 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -558,8 +558,8 @@ nautilus_icon_container_scroll (NautilusIconContainer *container,
 	GtkAdjustment *hadj, *vadj;
 	int old_h_value, old_v_value;
 
-	hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (container));
-	vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (container));
+	hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container));
+	vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container));
 
 	/* Store the old ajustment values so we can tell if we
 	 * ended up actually scrolling. We may not have in a case
@@ -712,8 +712,8 @@ reveal_icon (NautilusIconContainer *container,
 	details = container->details;
 	gtk_widget_get_allocation (GTK_WIDGET (container), &allocation);
 
-	hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (container));
-	vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (container));
+	hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container));
+	vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container));
 
 	if (nautilus_icon_container_is_auto_layout (container)) {
 		/* ensure that we reveal the entire row/column */
@@ -1008,8 +1008,8 @@ canvas_set_scroll_region_include_visible_area (EelCanvas *canvas,
 	width = (allocation.width) / canvas->pixels_per_unit;
 	height = (allocation.height) / canvas->pixels_per_unit;
 
-	old_scroll_x = gtk_adjustment_get_value (GTK_ADJUSTMENT (gtk_layout_get_hadjustment (GTK_LAYOUT (canvas))));
-	old_scroll_y = gtk_adjustment_get_value (GTK_ADJUSTMENT (gtk_layout_get_vadjustment (GTK_LAYOUT (canvas))));
+	old_scroll_x = gtk_adjustment_get_value (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas)));
+	old_scroll_y = gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas)));
 
 	x1 = MIN (x1, old_x1 + old_scroll_x);
 	y1 = MIN (y1, old_y1 + old_scroll_y);
@@ -1116,8 +1116,8 @@ nautilus_icon_container_update_scroll_region (NautilusIconContainer *container)
 			 x1, y1, x2, y2);
 	}
 
-	hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (container));
-	vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (container));
+	hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container));
+	vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container));
 
 	/* Scroll by 1/4 icon each time you click. */
 	step_increment = nautilus_get_icon_size_for_zoom_level
@@ -2547,13 +2547,13 @@ rubberband_timeout_callback (gpointer data)
 	adj_changed = FALSE;
 	gtk_widget_get_allocation (widget, &allocation);
 
-	adj_x = gtk_adjustment_get_value (gtk_layout_get_hadjustment (GTK_LAYOUT (container)));
+	adj_x = gtk_adjustment_get_value (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container)));
 	if (adj_x != band_info->last_adj_x) {
 		band_info->last_adj_x = adj_x;
 		adj_changed = TRUE;
 	}
 
-	adj_y = gtk_adjustment_get_value (gtk_layout_get_vadjustment (GTK_LAYOUT (container)));
+	adj_y = gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container)));
 	if (adj_y != band_info->last_adj_y) {
 		band_info->last_adj_y = adj_y;
 		adj_changed = TRUE;
@@ -2590,8 +2590,8 @@ rubberband_timeout_callback (gpointer data)
 
 	/* Remember to convert from widget to scrolled window coords */
 	eel_canvas_window_to_world (EEL_CANVAS (container),
-				    x + gtk_adjustment_get_value (gtk_layout_get_hadjustment (GTK_LAYOUT (container))),
-				    y + gtk_adjustment_get_value (gtk_layout_get_vadjustment (GTK_LAYOUT (container))),
+				    x + gtk_adjustment_get_value (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container))),
+				    y + gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container))),
 				    &world_x, &world_y);
 
 	if (world_x < band_info->start_x) {
@@ -2704,8 +2704,8 @@ start_rubberbanding (NautilusIconContainer *container,
 	atk_object_set_name (accessible, "selection");
 	atk_object_set_description (accessible, _("The selection rectangle"));
 
-	band_info->prev_x = event->x - gtk_adjustment_get_value (gtk_layout_get_hadjustment (GTK_LAYOUT (container)));
-	band_info->prev_y = event->y - gtk_adjustment_get_value (gtk_layout_get_vadjustment (GTK_LAYOUT (container)));
+	band_info->prev_x = event->x - gtk_adjustment_get_value (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container)));
+	band_info->prev_y = event->y - gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container)));
 
 	band_info->active = TRUE;
 
@@ -4186,11 +4186,11 @@ realize (GtkWidget *widget)
 	setup_background (container);
 	setup_label_gcs (container);
 
-	hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (widget));
+	hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget));
 	g_signal_connect (hadj, "value_changed",
 			  G_CALLBACK (handle_hadjustment_changed), widget);
 
-	vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (widget));
+	vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (widget));
 	g_signal_connect (vadj, "value_changed",
 			  G_CALLBACK (handle_vadjustment_changed), widget);
 
@@ -6582,9 +6582,9 @@ nautilus_icon_container_get_first_visible_icon (NautilusIconContainer *container
 	gboolean better_icon;
 	gboolean compare_lt;
 
-	hadj_v = gtk_adjustment_get_value (gtk_layout_get_hadjustment (GTK_LAYOUT (container)));
-	vadj_v = gtk_adjustment_get_value (gtk_layout_get_vadjustment (GTK_LAYOUT (container)));
-	h_page_size = gtk_adjustment_get_page_size (gtk_layout_get_hadjustment (GTK_LAYOUT (container)));
+	hadj_v = gtk_adjustment_get_value (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container)));
+	vadj_v = gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container)));
+	h_page_size = gtk_adjustment_get_page_size (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container)));
 
 	if (nautilus_icon_container_is_layout_rtl (container)) {
 		x = hadj_v + h_page_size - ICON_PAD_LEFT - 1;
@@ -6655,8 +6655,8 @@ nautilus_icon_container_scroll_to_icon (NautilusIconContainer  *container,
 	EelIRect bounds;
 	GtkAllocation allocation;
 
-	hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (container));
-	vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (container));
+	hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container));
+	vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container));
 	gtk_widget_get_allocation (GTK_WIDGET (container), &allocation);
 
 	/* We need to force a relayout now if there are updates queued
@@ -6957,8 +6957,8 @@ nautilus_icon_container_update_visible_icons (NautilusIconContainer *container)
 	gboolean visible;
 	GtkAllocation allocation;
 
-	hadj = gtk_layout_get_hadjustment (GTK_LAYOUT (container));
-	vadj = gtk_layout_get_vadjustment (GTK_LAYOUT (container));
+	hadj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (container));
+	vadj = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container));
 	gtk_widget_get_allocation (GTK_WIDGET (container), &allocation);
 
 	min_x = gtk_adjustment_get_value (hadj);
diff --git a/libnautilus-private/nautilus-tree-view-drag-dest.c b/libnautilus-private/nautilus-tree-view-drag-dest.c
index 96962ce..f11d075 100644
--- a/libnautilus-private/nautilus-tree-view-drag-dest.c
+++ b/libnautilus-private/nautilus-tree-view-drag-dest.c
@@ -104,7 +104,7 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
 	float value;
 	
 	window = gtk_tree_view_get_bin_window (tree_view);
-	vadjustment = gtk_tree_view_get_vadjustment (tree_view);
+	vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (tree_view));
 	
 	gdk_window_get_pointer (window, NULL, &y, NULL);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]