diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-01-14 01:50:49 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-15 00:55:49 +0800 |
| commit | fd8b55edaa88906b588aa07d9eadcacd34a7a774 (patch) | |
| tree | 14fe95f503fefe738465ff4a734671afec0efb57 /libgnomecanvas/gailcanvasitem.c | |
| parent | e8a1662875e3e957d96d4f60cb8b5664ee4f74b3 (diff) | |
| download | gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.tar.gz gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.tar.zst gsoc2013-evolution-fd8b55edaa88906b588aa07d9eadcacd34a7a774.zip | |
Fix all remaining GTK3 issues.
Work around the issue of GnomeCanvasItem amending its own flags to
GtkObject::flags (which is sealed) by giving it its own flags field.
This breaks libgnomecanvas ABI and API, but I see no other way.
Diffstat (limited to 'libgnomecanvas/gailcanvasitem.c')
| -rw-r--r-- | libgnomecanvas/gailcanvasitem.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c index f059e1909c..5ae7c8bee3 100644 --- a/libgnomecanvas/gailcanvasitem.c +++ b/libgnomecanvas/gailcanvasitem.c @@ -199,7 +199,7 @@ gail_canvas_item_ref_state_set (AtkObject *obj) { item = GNOME_CANVAS_ITEM (g_obj); - if (item->object.flags & GNOME_CANVAS_ITEM_VISIBLE) + if (item->flags & GNOME_CANVAS_ITEM_VISIBLE) { atk_state_set_add_state (state_set, ATK_STATE_VISIBLE); if (is_item_on_screen (item)) @@ -482,14 +482,16 @@ is_item_in_window (GnomeCanvasItem *item, gint height) { GtkWidget *widget; + GdkWindow *window; gboolean retval; widget = GTK_WIDGET (item->canvas); - if (widget->window) + window = gtk_widget_get_window (widget); + if (window) { int window_width, window_height; - gdk_window_get_geometry (widget->window, NULL, NULL, + gdk_window_get_geometry (window, NULL, NULL, &window_width, &window_height, NULL); /* * Check whether rectangles intersect |