From f960fd2dff5358f0e13eba7041d35855bf48c22e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 Jun 2012 07:31:28 -0400 Subject: Reduce usage of g_type_class_peek_parent(). G_DEFINE_TYPE macros define a static "parent_class" variable. --- libgnomecanvas/gnome-canvas-widget.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libgnomecanvas/gnome-canvas-widget.c') diff --git a/libgnomecanvas/gnome-canvas-widget.c b/libgnomecanvas/gnome-canvas-widget.c index 84ffa80fe2..7632bb0ddf 100644 --- a/libgnomecanvas/gnome-canvas-widget.c +++ b/libgnomecanvas/gnome-canvas-widget.c @@ -80,8 +80,6 @@ static void gnome_canvas_widget_draw (GnomeCanvasItem *item, gint width, gint height); -static GnomeCanvasItemClass *parent_class; - G_DEFINE_TYPE ( GnomeCanvasWidget, gnome_canvas_widget, @@ -96,8 +94,6 @@ gnome_canvas_widget_class_init (GnomeCanvasWidgetClass *class) gobject_class = (GObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; - parent_class = g_type_class_peek_parent (class); - gobject_class->set_property = gnome_canvas_widget_set_property; gobject_class->get_property = gnome_canvas_widget_get_property; @@ -185,8 +181,8 @@ gnome_canvas_widget_dispose (GnomeCanvasItem *object) witem->widget = NULL; } - if (GNOME_CANVAS_ITEM_CLASS (parent_class)->dispose) - GNOME_CANVAS_ITEM_CLASS (parent_class)->dispose (object); + GNOME_CANVAS_ITEM_CLASS (gnome_canvas_widget_parent_class)-> + dispose (object); } static void @@ -365,8 +361,8 @@ gnome_canvas_widget_update (GnomeCanvasItem *item, witem = GNOME_CANVAS_WIDGET (item); - if (parent_class->update) - (* parent_class->update) (item, matrix, flags); + GNOME_CANVAS_ITEM_CLASS (gnome_canvas_widget_parent_class)-> + update (item, matrix, flags); if (witem->widget) { witem->cwidth = (gint) (witem->width + 0.5); -- cgit