diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /calendar/gui/e-cal-model-calendar.h | |
parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'calendar/gui/e-cal-model-calendar.h')
-rw-r--r-- | calendar/gui/e-cal-model-calendar.h | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/calendar/gui/e-cal-model-calendar.h b/calendar/gui/e-cal-model-calendar.h index abe536399f..f1027032cb 100644 --- a/calendar/gui/e-cal-model-calendar.h +++ b/calendar/gui/e-cal-model-calendar.h @@ -28,14 +28,29 @@ #include "e-cal-model.h" -G_BEGIN_DECLS +/* Standard GObject macros */ +#define E_TYPE_CAL_MODEL_CALENDAR \ + (e_cal_model_calendar_get_type ()) +#define E_CAL_MODEL_CALENDAR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendar)) +#define E_CAL_MODEL_CALENDAR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendarClass)) +#define E_IS_CAL_MODEL_CALENDAR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_CAL_MODEL_CALENDAR)) +#define E_IS_CAL_MODEL_CALENDAR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_CAL_MODEL_CALENDAR)) +#define E_CAL_MODEL_CALENDAR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendarClass)) -#define E_TYPE_CAL_MODEL_CALENDAR (e_cal_model_calendar_get_type ()) -#define E_CAL_MODEL_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendar)) -#define E_CAL_MODEL_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_MODEL_CALENDAR, ECalModelCalendarClass)) -#define E_IS_CAL_MODEL_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_MODEL_CALENDAR)) -#define E_IS_CAL_MODEL_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_MODEL_CALENDAR)) +G_BEGIN_DECLS +typedef struct _ECalModelCalendar ECalModelCalendar; +typedef struct _ECalModelCalendarClass ECalModelCalendarClass; typedef struct _ECalModelCalendarPrivate ECalModelCalendarPrivate; typedef enum { @@ -47,18 +62,18 @@ typedef enum { E_CAL_MODEL_CALENDAR_FIELD_LAST } ECalModelCalendarField; -typedef struct { - ECalModel model; +struct _ECalModelCalendar { + ECalModel parent; ECalModelCalendarPrivate *priv; -} ECalModelCalendar; +}; -typedef struct { +struct _ECalModelCalendarClass { ECalModelClass parent_class; -} ECalModelCalendarClass; +}; -GType e_cal_model_calendar_get_type (void); -ECalModelCalendar *e_cal_model_calendar_new (void); +GType e_cal_model_calendar_get_type (void); +ECalModel * e_cal_model_calendar_new (EShellSettings *shell_settings); G_END_DECLS -#endif +#endif /* E_CAL_MODEL_CALENDAR_H */ |