From 05b60f793cc6d7dff47b5980487f7ee1248d8f08 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 14 Oct 2004 14:44:41 +0000 Subject: convert to G_DEFINE_TYPE 2004-10-14 JP Rosevear * gui/e-day-view.c: convert to G_DEFINE_TYPE * gui/e-day-view-config.c: ditto * gui/e-day-view-main-item.c: ditto * gui/e-day-view-time-item.c: ditto * gui/e-day-view-top-item.c: ditto svn path=/trunk/; revision=27577 --- calendar/gui/e-day-view-time-item.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'calendar/gui/e-day-view-time-item.c') diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index d70b0fd861..db4b66e54b 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -27,7 +27,10 @@ * the EDayView. */ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include #include @@ -59,8 +62,6 @@ #define E_DVTMI_LARGE_HOUR_Y_PAD 1 #define E_DVTMI_SMALL_FONT_Y_PAD 1 -static void e_day_view_time_item_class_init (EDayViewTimeItemClass *class); -static void e_day_view_time_item_init (EDayViewTimeItem *dvtmitem); static void e_day_view_time_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); @@ -95,17 +96,13 @@ static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtm gint y); -static GnomeCanvasItemClass *parent_class; - - /* The arguments we take */ enum { ARG_0, ARG_DAY_VIEW }; -E_MAKE_TYPE (e_day_view_time_item, "EDayViewTimeItem", EDayViewTimeItem, - e_day_view_time_item_class_init, e_day_view_time_item_init, GNOME_TYPE_CANVAS_ITEM); +G_DEFINE_TYPE (EDayViewTimeItem, e_day_view_time_item, GNOME_TYPE_CANVAS_ITEM); static void e_day_view_time_item_class_init (EDayViewTimeItemClass *class) @@ -113,8 +110,6 @@ e_day_view_time_item_class_init (EDayViewTimeItemClass *class) GtkObjectClass *object_class; GnomeCanvasItemClass *item_class; - parent_class = g_type_class_peek_parent (class); - object_class = (GtkObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; @@ -162,8 +157,8 @@ e_day_view_time_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_day_view_time_item_parent_class)->update) + (* GNOME_CANVAS_ITEM_CLASS (e_day_view_time_item_parent_class)->update) (item, affine, clip_path, flags); /* The item covers the entire canvas area. */ item->x1 = 0; -- cgit v1.2.3