From 979feab18eb378b4623f2edc6a357407e95e3493 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 14 Oct 2004 14:56:18 +0000 Subject: convert to G_DEFINE_TYPE 2004-10-14 JP Rosevear * gui/e-week-view-config.c: convert to G_DEFINE_TYPE * gui/e-week-view-event-item.c: ditto * gui/e-week-view-main-item.c: ditto * gui/e-week-view-titles-item.c: ditto * gui/e-week-view.c: ditto svn path=/trunk/; revision=27578 --- calendar/gui/e-week-view-titles-item.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'calendar/gui/e-week-view-titles-item.c') diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index 733bec9a81..c688cb9025 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -26,13 +26,13 @@ * the Month calendar view. */ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include "e-week-view-titles-item.h" -static void e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class); -static void e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem); - static void e_week_view_titles_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); @@ -53,18 +53,13 @@ static double e_week_view_titles_item_point (GnomeCanvasItem *item, int cy, GnomeCanvasItem **actual_item); - -static GnomeCanvasItemClass *parent_class; - /* The arguments we take */ enum { ARG_0, ARG_WEEK_VIEW }; -E_MAKE_TYPE (e_week_view_titles_item, "EWeekViewTitlesItem", EWeekViewTitlesItem, - e_week_view_titles_item_class_init, e_week_view_titles_item_init, - GNOME_TYPE_CANVAS_ITEM); +G_DEFINE_TYPE (EWeekViewTitlesItem, e_week_view_titles_item, GNOME_TYPE_CANVAS_ITEM); static void e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class) @@ -72,8 +67,6 @@ e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class) GtkObjectClass *object_class; GnomeCanvasItemClass *item_class; - parent_class = g_type_class_peek_parent (class); - object_class = (GtkObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; @@ -120,8 +113,8 @@ e_week_view_titles_item_update (GnomeCanvasItem *item, ArtSVP *clip_path, int flags) { - if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update) - (* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags); + if (GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_parent_class)->update) + (* GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_parent_class)->update) (item, affine, clip_path, flags); /* The item covers the entire canvas area. */ item->x1 = 0; -- cgit v1.2.3