summaryrefslogtreecommitdiff
path: root/eel
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2010-10-30 16:02:16 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2010-10-30 16:29:15 +0200
commit2260005986d8c620669e56c4b9f2fba12e8e0625 (patch)
treed1fcd9773e3784f31bba3f8a5a9973df85716c18 /eel
parentebee13eef39824ebe536d0e42a35337097a33942 (diff)
downloadnautilus-2260005986d8c620669e56c4b9f2fba12e8e0625.tar.gz
canvas: use GTK_LAYOUT casts instead of going through the parent struct
That's just confusing.
Diffstat (limited to 'eel')
-rw-r--r--eel/eel-canvas.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index 2332e3bdb..a3fe41699 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_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout)),
+ g_signal_connect (gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas)),
"value_changed",
G_CALLBACK (eel_canvas_accessible_adjustment_changed),
obj);
- g_signal_connect (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout)),
+ g_signal_connect (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas)),
"value_changed",
G_CALLBACK (eel_canvas_accessible_adjustment_changed),
obj);
@@ -2086,7 +2086,7 @@ eel_canvas_init (EelCanvas *canvas)
canvas->scroll_x1 = 0.0;
canvas->scroll_y1 = 0.0;
- gtk_layout_get_size (&canvas->layout,
+ gtk_layout_get_size (GTK_LAYOUT (canvas),
&width, &height);
canvas->scroll_x2 = width;
canvas->scroll_y2 = height;
@@ -2254,8 +2254,8 @@ eel_canvas_realize (GtkWidget *widget)
canvas = EEL_CANVAS (widget);
- gdk_window_set_events (gtk_layout_get_bin_window (&canvas->layout),
- (gdk_window_get_events (gtk_layout_get_bin_window (&canvas->layout))
+ gdk_window_set_events (gtk_layout_get_bin_window (GTK_LAYOUT (canvas)),
+ (gdk_window_get_events (gtk_layout_get_bin_window (GTK_LAYOUT (canvas)))
| GDK_EXPOSURE_MASK
| GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK
@@ -2364,8 +2364,8 @@ scroll_to (EelCanvas *canvas, int cx, int cy)
gtk_widget_queue_draw (GTK_WIDGET (canvas));
}
- hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
- vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
+ hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas));
+ vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas));
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_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
- vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
+ hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas));
+ vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas));
gtk_adjustment_set_page_size (hadjustment, allocation->width);
gtk_adjustment_set_page_increment (hadjustment, allocation->width / 2);
@@ -2721,7 +2721,7 @@ eel_canvas_button (GtkWidget *widget, GdkEventButton *event)
* dispatch normally regardless of the event's window if an item has
* has a pointer grab in effect
*/
- if (!canvas->grabbed_item && event->window != gtk_layout_get_bin_window (&canvas->layout))
+ if (!canvas->grabbed_item && event->window != gtk_layout_get_bin_window (GTK_LAYOUT (canvas)))
return retval;
switch (event->button) {
@@ -2787,7 +2787,7 @@ eel_canvas_motion (GtkWidget *widget, GdkEventMotion *event)
canvas = EEL_CANVAS (widget);
- if (event->window != gtk_layout_get_bin_window (&canvas->layout))
+ if (event->window != gtk_layout_get_bin_window (GTK_LAYOUT (canvas)))
return FALSE;
canvas->state = event->state;
@@ -2826,7 +2826,7 @@ eel_canvas_crossing (GtkWidget *widget, GdkEventCrossing *event)
canvas = EEL_CANVAS (widget);
- if (event->window != gtk_layout_get_bin_window (&canvas->layout))
+ if (event->window != gtk_layout_get_bin_window (GTK_LAYOUT (canvas)))
return FALSE;
canvas->state = event->state;
@@ -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_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
- vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
+ hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas));
+ vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas));
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_scrollable_get_hadjustment (GTK_SCROLLABLE (&canvas->layout));
- vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (&canvas->layout));
+ hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas));
+ vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas));
if (cx)
*cx = gtk_adjustment_get_value (hadjustment);
@@ -3396,7 +3396,7 @@ eel_canvas_request_redraw (EelCanvas *canvas, int x1, int y1, int x2, int y2)
bbox.width = x2 - x1;
bbox.height = y2 - y1;
- gdk_window_invalidate_rect (gtk_layout_get_bin_window (&canvas->layout),
+ gdk_window_invalidate_rect (gtk_layout_get_bin_window (GTK_LAYOUT (canvas)),
&bbox, FALSE);
}