From: Andrea Zagli Date: Sat, 4 Dec 2010 08:49:16 +0000 (+0100) Subject: Added interface GtkCalExView. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=2308a10cc5f9c0e17e08a6fcd187018c112734ab;p=libgtkcalendarex Added interface GtkCalExView. --- diff --git a/src/Makefile.am b/src/Makefile.am index b711d34..94961e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ libgtkcalendarex_la_SOURCES = \ gtkcalexcalendar.c \ gtkcalexcategory.c \ gtkcalexevent.c \ + gtkcalexview.c \ gtkcalexviewday.c \ gtkcalexviewmonth.c \ gtkcalexviewweek.c @@ -22,6 +23,7 @@ include_HEADERS = \ gtkcalexcalendar.h \ gtkcalexcategory.h \ gtkcalexevent.h \ + gtkcalexview.h \ gtkcalexviewday.h \ gtkcalexviewmonth.h \ gtkcalexviewweek.h diff --git a/src/gtkcalex.c b/src/gtkcalex.c index 7451adb..64f3f5a 100644 --- a/src/gtkcalex.c +++ b/src/gtkcalex.c @@ -21,6 +21,7 @@ #endif #include "gtkcalex.h" +#include "gtkcalexview.h" #include "gtkcalexviewday.h" #include "gtkcalexviewweek.h" #include "gtkcalexviewmonth.h" @@ -257,7 +258,7 @@ gtk_calex_set_date (GtkCalEx *calex, GDate *date) priv->date = NULL; } priv->date = g_date_new_dmy ((GDateDay)date->day, (GDateMonth)date->month, (GDateYear)date->year); - gtk_calex_view_day_set_date (GTK_CALEX_VIEW_DAY (priv->view), priv->date); + gtk_calex_view_set_date (GTK_CALEX_VIEW (priv->view), priv->date); } static void diff --git a/src/gtkcalexview.c b/src/gtkcalexview.c new file mode 100644 index 0000000..48cd0fa --- /dev/null +++ b/src/gtkcalexview.c @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2010 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H + #include +#endif + +#include "gtkcalexview.h" + +G_DEFINE_INTERFACE (GtkCalExView, gtk_calex_view, G_TYPE_OBJECT) + +static void +gtk_calex_view_default_init (GtkCalExViewInterface *iface) +{ +} + +void +gtk_calex_view_set_date (GtkCalExView *view, GDate *date) +{ + GtkCalExViewInterface *iface; + + g_return_if_fail (GTK_CALEX_IS_VIEW (view)); + + iface = GTK_CALEX_VIEW_GET_INTERFACE (view); + + if (iface->set_date) + { + (void)(*iface->set_date) (view, date); + } +} diff --git a/src/gtkcalexview.h b/src/gtkcalexview.h new file mode 100644 index 0000000..cb79f51 --- /dev/null +++ b/src/gtkcalexview.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2010 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __GTK_CALEX_VIEW_H__ +#define __GTK_CALEX_VIEW_H__ + +#include + + +G_BEGIN_DECLS + + +#define GTK_CALEX_TYPE_VIEW (gtk_calex_view_get_type ()) +#define GTK_CALEX_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_CALEX_TYPE_VIEW, GtkCalExView)) +#define GTK_CALEX_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_CALEX_TYPE_VIEW)) +#define GTK_CALEX_VIEW_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_CALEX_TYPE_VIEW, GtkCalExViewInterface)) + + +typedef struct _GtkCalExView GtkCalExView; +typedef struct _GtkCalExViewInterface GtkCalExViewInterface; + +struct _GtkCalExViewInterface + { + GTypeInterface parent_iface; + + void (*set_date) (GtkCalExView *view, GDate *date); + }; + +GType gtk_calex_view_get_type (void) G_GNUC_CONST; + + +G_END_DECLS + +#endif /* __GTK_CALEX_VIEW_H__ */ diff --git a/src/gtkcalexviewday.c b/src/gtkcalexviewday.c index b3e71ea..53940a3 100644 --- a/src/gtkcalexviewday.c +++ b/src/gtkcalexviewday.c @@ -22,6 +22,7 @@ #include +#include "gtkcalexview.h" #include "gtkcalexviewday.h" enum @@ -32,6 +33,8 @@ enum static void gtk_calex_view_day_class_init (GtkCalExViewDayClass *klass); static void gtk_calex_view_day_init (GtkCalExViewDay *gtk_calex_view_day); +static void gtk_calex_view_interface_init (GtkCalExViewInterface *iface); + static void gtk_calex_view_day_size_request (GtkWidget *widget, GtkRequisition *requisition); static void gtk_calex_view_day_size_allocate (GtkWidget *widget, @@ -68,7 +71,8 @@ struct _GtkCalExViewDayPrivate guint division; }; -G_DEFINE_TYPE (GtkCalExViewDay, gtk_calex_view_day, GTK_TYPE_BIN) +G_DEFINE_TYPE_WITH_CODE (GtkCalExViewDay, gtk_calex_view_day, GTK_TYPE_BIN, + G_IMPLEMENT_INTERFACE (GTK_CALEX_TYPE_VIEW, gtk_calex_view_interface_init)); static void gtk_calex_view_day_class_init (GtkCalExViewDayClass *klass) @@ -105,6 +109,12 @@ gtk_calex_view_day_init (GtkCalExViewDay *gtk_calex_view_day) priv->division = 30; } +static void +gtk_calex_view_interface_init (GtkCalExViewInterface *iface) +{ + iface->set_date = gtk_calex_view_day_set_date; +} + static void gtk_calex_view_day_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) {