1 files changed, 35 insertions, 28 deletions

diff --git a/calendar/gui/year-view.h b/calendar/gui/year-view.h
index f31d5ae4a3..0638698fb4 100644
--- a/calendar/gui/year-view.h
+++ b/calendar/gui/year-view.h
@@ -1,54 +1,61 @@
-/* Week view composite widget for gncal
+/* Year view display for gncal
  *
  * Copyright (C) 1998 The Free Software Foundation
  *
- * Author: Arturo Espinosa <arturo@nuclecu.unam.mx>
- * 
- * Heavily based on Federico Mena's week view.
- * 
+ * Authors: Arturo Espinosa <arturo@nuclecu.unam.mx>
+ *          Federico Mena <federico@nuclecu.unam.mx>
  */
 
 #ifndef YEAR_VIEW_H
 #define YEAR_VIEW_H
 
-#include <time.h>
-#include <gtk/gtktable.h>
 #include <libgnome/gnome-defs.h>
-#include <libgnomeui/gtkcalendar.h>
-
 #include "gnome-cal.h"
+#include "gnome-month-item.h"
+
 
 BEGIN_GNOME_DECLS
 
 
-#define GNCAL_YEAR_VIEW(obj)         GTK_CHECK_CAST (obj, gncal_year_view_get_type (), GncalYearView)
-#define GNCAL_YEAR_VIEW_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gncal_year_view_get_type (), GncalYearViewClass)
-#define GNCAL_IS_YEAR_VIEW(obj)      GTK_CHECK_TYPE (obj, gncal_year_view_get_type ())
+#define TYPE_YEAR_VIEW            (year_view_get_type ())
+#define YEAR_VIEW(obj)            (GTK_CHECK_CAST ((obj), TYPE_YEAR_VIEW, YearView))
+#define YEAR_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_YEAR_VIEW, YearViewClass))
+#define IS_YEAR_VIEW(obj)         (GTK_CHECK_TYPE ((obj), TYPE_YEAR_VIEW))
+#define IS_YEAR_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_YEAR_VIEW))
 
 
-typedef struct _GncalYearView GncalYearView;
-typedef struct _GncalYearViewClass GncalYearViewClass;
+typedef struct _YearView YearView;
+typedef struct _YearViewClass YearViewClass;
 
-struct _GncalYearView {
-	GtkTable table;
+struct _YearView {
+	GnomeCanvas canvas;
 
-	GnomeCalendar *gcal;        /* The calendar we are associated to */
-	GtkWidget *calendar[12];    /* one calendar per month */
-        guint       handler[12];    /* for (un)blocking the calendars */
-	
-	GtkWidget *year_label;
-	gint year;
+	GnomeCalendar *calendar;	/* The calendar we are associated to */
+
+	GnomeCanvasItem *heading;	/* Big heading with year */
+	GnomeCanvasItem *titles[12];	/* Titles for months */
+	GnomeCanvasItem *mitems[12];	/* Month items */
 };
 
-struct _GncalYearViewClass {
-	GtkTableClass parent_class;
+struct _YearViewClass {
+	GnomeCanvasClass parent_class;
 };
 
 
-guint      gncal_year_view_get_type       (void);
-GtkWidget *gncal_year_view_new            (GnomeCalendar *calendar, time_t date);
-void       gncal_year_view_set            (GncalYearView *yview,    time_t date);
-void       gncal_year_view_update         (GncalYearView *yview, iCalObject *ico, int flags);
+/* Standard Gtk function */
+GtkType year_view_get_type (void);
+
+/* Creates a new year view widget associated to the specified calendar */
+GtkWidget *year_view_new (GnomeCalendar *calendar, time_t year);
+
+/* Notifies the year view that a calendar object has changed */
+void year_view_update (YearView *yv, iCalObject *ico, int flags);
+
+/* Notifies the year view about a change of date */
+void year_view_set (YearView *yv, time_t year);
+
+/* Notifies the year view that the time format has changed */
+void year_view_time_format_changed (YearView *yv);
 
 
 END_GNOME_DECLS