diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-06-24 19:31:28 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-06-25 08:31:42 +0800 |
| commit | f960fd2dff5358f0e13eba7041d35855bf48c22e (patch) | |
| tree | 92859c8ba093fa15a3bd7b888332d6e61a704a51 /libgnomecanvas/gnome-canvas-text.c | |
| parent | 88db20f3e9ff38296c031671de963ae665fd8143 (diff) | |
| download | gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.gz gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.bz2 gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.lz gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.xz gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.zst gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.zip | |
Reduce usage of g_type_class_peek_parent().
G_DEFINE_TYPE macros define a static "parent_class" variable.
Diffstat (limited to 'libgnomecanvas/gnome-canvas-text.c')
| -rw-r--r-- | libgnomecanvas/gnome-canvas-text.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index 5a7e9c8136..6720ad42eb 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -129,8 +129,6 @@ static void gnome_canvas_text_apply_attributes (GnomeCanvasText *textitem); static void add_attr (PangoAttrList *attr_list, PangoAttribute *attr); -static GnomeCanvasItemClass *parent_class; - G_DEFINE_TYPE ( GnomeCanvasText, gnome_canvas_text, @@ -146,8 +144,6 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) gobject_class = (GObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; - parent_class = g_type_class_peek_parent (class); - gobject_class->set_property = gnome_canvas_text_set_property; gobject_class->get_property = gnome_canvas_text_get_property; @@ -512,8 +508,8 @@ gnome_canvas_text_dispose (GnomeCanvasItem *object) text->attr_list = NULL; } - if (GNOME_CANVAS_ITEM_CLASS (parent_class)->dispose) - GNOME_CANVAS_ITEM_CLASS (parent_class)->dispose (object); + GNOME_CANVAS_ITEM_CLASS (gnome_canvas_text_parent_class)-> + dispose (object); } static void @@ -1169,8 +1165,8 @@ gnome_canvas_text_update (GnomeCanvasItem *item, text = GNOME_CANVAS_TEXT (item); - if (parent_class->update) - (* parent_class->update) (item, matrix, flags); + GNOME_CANVAS_ITEM_CLASS (gnome_canvas_text_parent_class)-> + update (item, matrix, flags); get_bounds (text, &x1, &y1, &x2, &y2); |