diff options
Diffstat (limited to 'calendar/gui/e-week-view-main-item.c')
| -rw-r--r-- | calendar/gui/e-week-view-main-item.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index 3dbeb3f5f5..e33ec66e3f 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -26,16 +26,15 @@ * Month calendar views. */ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif #include <glib.h> #include <libgnome/gnome-i18n.h> #include "e-week-view-main-item.h" #include "ea-calendar.h" -static void e_week_view_main_item_class_init (EWeekViewMainItemClass *class); -static void e_week_view_main_item_init (EWeekViewMainItem *wvmitem); - static void e_week_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id); @@ -64,18 +63,13 @@ static double e_week_view_main_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_main_item, "EWeekViewMainItem", EWeekViewMainItem, - e_week_view_main_item_class_init, e_week_view_main_item_init, - GNOME_TYPE_CANVAS_ITEM); +G_DEFINE_TYPE (EWeekViewMainItem, e_week_view_main_item, GNOME_TYPE_CANVAS_ITEM); static void e_week_view_main_item_class_init (EWeekViewMainItemClass *class) @@ -83,8 +77,6 @@ e_week_view_main_item_class_init (EWeekViewMainItemClass *class) GtkObjectClass *object_class; GnomeCanvasItemClass *item_class; - parent_class = g_type_class_peek_parent (class); - object_class = (GtkObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; @@ -134,8 +126,8 @@ e_week_view_main_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_main_item_parent_class)->update) + (* GNOME_CANVAS_ITEM_CLASS (e_week_view_main_item_parent_class)->update) (item, affine, clip_path, flags); /* The item covers the entire canvas area. */ item->x1 = 0; |