From e195153870baa49b2188fc91acb44eea00203236 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 7 Nov 2010 09:13:59 +0100 Subject: [PATCH] Added skeleton files for Calendar, Catgory and Event. --- src/Makefile.am | 6 ++ src/gtkcalex.h | 15 +++++ src/gtkcalexcalendar.c | 123 +++++++++++++++++++++++++++++++++++++++++ src/gtkcalexcalendar.h | 58 +++++++++++++++++++ src/gtkcalexcategory.c | 123 +++++++++++++++++++++++++++++++++++++++++ src/gtkcalexcategory.h | 58 +++++++++++++++++++ src/gtkcalexevent.c | 123 +++++++++++++++++++++++++++++++++++++++++ src/gtkcalexevent.h | 61 ++++++++++++++++++++ src/libgtkcalendarex.h | 3 + tests/test.c | 5 +- tests/test.ui | 32 ++++++++++- 11 files changed, 604 insertions(+), 3 deletions(-) create mode 100644 src/gtkcalexcalendar.c create mode 100644 src/gtkcalexcalendar.h create mode 100644 src/gtkcalexcategory.c create mode 100644 src/gtkcalexcategory.h create mode 100644 src/gtkcalexevent.c create mode 100644 src/gtkcalexevent.h diff --git a/src/Makefile.am b/src/Makefile.am index ce6d4cf..b711d34 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,6 +9,9 @@ libgtkcalendarex_la_LDFLAGS = -no-undefined libgtkcalendarex_la_SOURCES = \ gtkcalex.c \ + gtkcalexcalendar.c \ + gtkcalexcategory.c \ + gtkcalexevent.c \ gtkcalexviewday.c \ gtkcalexviewmonth.c \ gtkcalexviewweek.c @@ -16,6 +19,9 @@ libgtkcalendarex_la_SOURCES = \ include_HEADERS = \ libgtkcalendarex.h \ gtkcalex.h \ + gtkcalexcalendar.h \ + gtkcalexcategory.h \ + gtkcalexevent.h \ gtkcalexviewday.h \ gtkcalexviewmonth.h \ gtkcalexviewweek.h diff --git a/src/gtkcalex.h b/src/gtkcalex.h index 14d3a0c..8f4acaf 100644 --- a/src/gtkcalex.h +++ b/src/gtkcalex.h @@ -23,6 +23,10 @@ #include #include +#include "gtkcalexcalendar.h" +#include "gtkcalexcategory.h" +#include "gtkcalexevent.h" + G_BEGIN_DECLS @@ -66,6 +70,17 @@ void gtk_calex_set_view_type (GtkCalEx *calex, GtkCalExViewType type); GDate *gtk_calex_get_date (GtkCalEx *calex); void gtk_calex_set_date (GtkCalEx *calex, GDate *date); +void gtk_calex_add_calendar (GtkCalEx *calex, GtkCalExCalendar *calendar); +void gtk_calex_remove_calendar (GtkCalEx *calex, GtkCalExCalendar *calendar); + +void gtk_calex_add_category (GtkCalEx *calex, GtkCalExCategory *category); +void gtk_calex_remove_category (GtkCalEx *calex, GtkCalExCategory *category); + +void gtk_calex_add_event (GtkCalEx *calex, GtkCalExEvent *event); +void gtk_calex_remove_event (GtkCalEx *calex, GtkCalExEvent *event); + +GList *gtk_calex_get_events (GtkCalEx *calex); + G_END_DECLS diff --git a/src/gtkcalexcalendar.c b/src/gtkcalexcalendar.c new file mode 100644 index 0000000..34c6e53 --- /dev/null +++ b/src/gtkcalexcalendar.c @@ -0,0 +1,123 @@ +/* + * 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 + +#include "gtkcalexcalendar.h" + +enum +{ + PROP_0 +}; + +static void gtk_calex_calendar_class_init (GtkCalExCalendarClass *klass); +static void gtk_calex_calendar_init (GtkCalExCalendar *gtk_calex_calendar); + +static void gtk_calex_calendar_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_calex_calendar_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static void gtk_calex_calendar_draw (GtkCalExCalendar *gtk_calex_calendar); + + +#define GTK_CALEX_CALENDAR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GTK_CALEX_CALENDAR, GtkCalExCalendarPrivate)) + +typedef struct _GtkCalExCalendarPrivate GtkCalExCalendarPrivate; +struct _GtkCalExCalendarPrivate + { + gchar *name; + GdkColor *color; + }; + +G_DEFINE_TYPE (GtkCalExCalendar, gtk_calex_calendar, G_TYPE_OBJECT) + +static void +gtk_calex_calendar_class_init (GtkCalExCalendarClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (GtkCalExCalendarPrivate)); + + object_class->set_property = gtk_calex_calendar_set_property; + object_class->get_property = gtk_calex_calendar_get_property; +} + +static void +gtk_calex_calendar_init (GtkCalExCalendar *gtk_calex_calendar) +{ + GtkCalExCalendarPrivate *priv = GTK_CALEX_CALENDAR_GET_PRIVATE (gtk_calex_calendar); +} + +static void +gtk_calex_calendar_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + GtkCalExCalendar *gtk_calex_calendar = GTK_CALEX_CALENDAR (object); + + GtkCalExCalendarPrivate *priv = GTK_CALEX_CALENDAR_GET_PRIVATE (gtk_calex_calendar); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +gtk_calex_calendar_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + GtkCalExCalendar *gtk_calex_calendar = GTK_CALEX_CALENDAR (object); + + GtkCalExCalendarPrivate *priv = GTK_CALEX_CALENDAR_GET_PRIVATE (gtk_calex_calendar); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +/** + * gtk_calex_calendar_new: + * @name: + * @color: + * + * Returns: the newly created #GtkCalExCalendar object. + */ +GtkCalExCalendar +*gtk_calex_calendar_new (const gchar *name, GdkColor *color) +{ + GtkCalExCalendar *gtk_calex_calendar = GTK_CALEX_CALENDAR (g_object_new (gtk_calex_calendar_get_type (), NULL)); + + GtkCalExCalendarPrivate *priv = GTK_CALEX_CALENDAR_GET_PRIVATE (gtk_calex_calendar); + + priv->name = g_strdup (name); + priv->color = g_memdup (color, sizeof (GdkColor)); + + return gtk_calex_calendar; +} diff --git a/src/gtkcalexcalendar.h b/src/gtkcalexcalendar.h new file mode 100644 index 0000000..7d61b27 --- /dev/null +++ b/src/gtkcalexcalendar.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2009-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_CALENDAR_H__ +#define __GTK_CALEX_CALENDAR_H__ + +#include +#include + +G_BEGIN_DECLS + + +#define TYPE_GTK_CALEX_CALENDAR (gtk_calex_calendar_get_type ()) +#define GTK_CALEX_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_CALEX_CALENDAR, GtkCalExCalendar)) +#define GTK_CALEX_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_CALEX_CALENDAR, GtkCalExCalendarClass)) +#define IS_GTK_CALEX_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_CALEX_CALENDAR)) +#define IS_GTK_CALEX_CALENDAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_CALEX_CALENDAR)) +#define GTK_CALEX_CALENDAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_CALEX_CALENDAR, GtkCalExCalendarClass)) + + +typedef struct _GtkCalExCalendar GtkCalExCalendar; +typedef struct _GtkCalExCalendarClass GtkCalExCalendarClass; + +struct _GtkCalExCalendar + { + GObject parent; + }; + +struct _GtkCalExCalendarClass + { + GObjectClass parent_class; + }; + +GType gtk_calex_calendar_get_type (void) G_GNUC_CONST; + + +GtkCalExCalendar *gtk_calex_calendar_new (const gchar *name, GdkColor *color); + + +G_END_DECLS + +#endif /* __GTK_CALEX_CALENDAR_H__ */ diff --git a/src/gtkcalexcategory.c b/src/gtkcalexcategory.c new file mode 100644 index 0000000..fcc6208 --- /dev/null +++ b/src/gtkcalexcategory.c @@ -0,0 +1,123 @@ +/* + * 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 + +#include "gtkcalexcategory.h" + +enum +{ + PROP_0 +}; + +static void gtk_calex_category_class_init (GtkCalExCategoryClass *klass); +static void gtk_calex_category_init (GtkCalExCategory *gtk_calex_category); + +static void gtk_calex_category_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_calex_category_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static void gtk_calex_category_draw (GtkCalExCategory *gtk_calex_category); + + +#define GTK_CALEX_CATEGORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GTK_CALEX_CATEGORY, GtkCalExCategoryPrivate)) + +typedef struct _GtkCalExCategoryPrivate GtkCalExCategoryPrivate; +struct _GtkCalExCategoryPrivate + { + gchar *name; + gchar *icon_filename; + }; + +G_DEFINE_TYPE (GtkCalExCategory, gtk_calex_category, G_TYPE_OBJECT) + +static void +gtk_calex_category_class_init (GtkCalExCategoryClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (GtkCalExCategoryPrivate)); + + object_class->set_property = gtk_calex_category_set_property; + object_class->get_property = gtk_calex_category_get_property; +} + +static void +gtk_calex_category_init (GtkCalExCategory *gtk_calex_category) +{ + GtkCalExCategoryPrivate *priv = GTK_CALEX_CATEGORY_GET_PRIVATE (gtk_calex_category); +} + +static void +gtk_calex_category_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + GtkCalExCategory *gtk_calex_category = GTK_CALEX_CATEGORY (object); + + GtkCalExCategoryPrivate *priv = GTK_CALEX_CATEGORY_GET_PRIVATE (gtk_calex_category); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +gtk_calex_category_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + GtkCalExCategory *gtk_calex_category = GTK_CALEX_CATEGORY (object); + + GtkCalExCategoryPrivate *priv = GTK_CALEX_CATEGORY_GET_PRIVATE (gtk_calex_category); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +/** + * gtk_calex_category_new: + * @name: + * @icon_filename: + * + * Returns: the newly created #GtkCalExCategory object. + */ +GtkCalExCategory +*gtk_calex_category_new (const gchar *name, const gchar *icon_filename) +{ + GtkCalExCategory *gtk_calex_category = GTK_CALEX_CATEGORY (g_object_new (gtk_calex_category_get_type (), NULL)); + + GtkCalExCategoryPrivate *priv = GTK_CALEX_CATEGORY_GET_PRIVATE (gtk_calex_category); + + priv->name = g_strdup (name); + priv->icon_filename = g_strdup (icon_filename); + + return gtk_calex_category; +} diff --git a/src/gtkcalexcategory.h b/src/gtkcalexcategory.h new file mode 100644 index 0000000..05760fc --- /dev/null +++ b/src/gtkcalexcategory.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2009-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_CATEGORY_H__ +#define __GTK_CALEX_CATEGORY_H__ + +#include +#include + +G_BEGIN_DECLS + + +#define TYPE_GTK_CALEX_CATEGORY (gtk_calex_category_get_type ()) +#define GTK_CALEX_CATEGORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_CALEX_CATEGORY, GtkCalExCategory)) +#define GTK_CALEX_CATEGORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_CALEX_CATEGORY, GtkCalExCategoryClass)) +#define IS_GTK_CALEX_CATEGORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_CALEX_CATEGORY)) +#define IS_GTK_CALEX_CATEGORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_CALEX_CATEGORY)) +#define GTK_CALEX_CATEGORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_CALEX_CATEGORY, GtkCalExCategoryClass)) + + +typedef struct _GtkCalExCategory GtkCalExCategory; +typedef struct _GtkCalExCategoryClass GtkCalExCategoryClass; + +struct _GtkCalExCategory + { + GObject parent; + }; + +struct _GtkCalExCategoryClass + { + GObjectClass parent_class; + }; + +GType gtk_calex_category_get_type (void) G_GNUC_CONST; + + +GtkCalExCategory *gtk_calex_category_new (const gchar *name, const gchar *icon_filename); + + +G_END_DECLS + +#endif /* __GTK_CALEX_CATEGORY_H__ */ diff --git a/src/gtkcalexevent.c b/src/gtkcalexevent.c new file mode 100644 index 0000000..7da5727 --- /dev/null +++ b/src/gtkcalexevent.c @@ -0,0 +1,123 @@ +/* + * 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 + +#include "gtkcalexevent.h" + +enum +{ + PROP_0 +}; + +static void gtk_calex_event_class_init (GtkCalExEventClass *klass); +static void gtk_calex_event_init (GtkCalExEvent *gtk_calex_event); + +static void gtk_calex_event_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_calex_event_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static void gtk_calex_event_draw (GtkCalExEvent *gtk_calex_event); + + +#define GTK_CALEX_EVENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_GTK_CALEX_EVENT, GtkCalExEventPrivate)) + +typedef struct _GtkCalExEventPrivate GtkCalExEventPrivate; +struct _GtkCalExEventPrivate + { + void *foo; + /* + from_date_time + to_date_time + calendar + categories + */ + }; + +G_DEFINE_TYPE (GtkCalExEvent, gtk_calex_event, G_TYPE_OBJECT) + +static void +gtk_calex_event_class_init (GtkCalExEventClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (GtkCalExEventPrivate)); + + object_class->set_property = gtk_calex_event_set_property; + object_class->get_property = gtk_calex_event_get_property; +} + +static void +gtk_calex_event_init (GtkCalExEvent *gtk_calex_event) +{ + GtkCalExEventPrivate *priv = GTK_CALEX_EVENT_GET_PRIVATE (gtk_calex_event); +} + +static void +gtk_calex_event_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + GtkCalExEvent *gtk_calex_event = GTK_CALEX_EVENT (object); + + GtkCalExEventPrivate *priv = GTK_CALEX_EVENT_GET_PRIVATE (gtk_calex_event); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +gtk_calex_event_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + GtkCalExEvent *gtk_calex_event = GTK_CALEX_EVENT (object); + + GtkCalExEventPrivate *priv = GTK_CALEX_EVENT_GET_PRIVATE (gtk_calex_event); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +/** + * gtk_calex_event_new: + * + * Returns: the newly created #GtkCalExEvent object. + */ +GtkCalExEvent +*gtk_calex_event_new () +{ + GtkCalExEvent *gtk_calex_event = GTK_CALEX_EVENT (g_object_new (gtk_calex_event_get_type (), NULL)); + + GtkCalExEventPrivate *priv = GTK_CALEX_EVENT_GET_PRIVATE (gtk_calex_event); + + return gtk_calex_event; +} diff --git a/src/gtkcalexevent.h b/src/gtkcalexevent.h new file mode 100644 index 0000000..b3d6222 --- /dev/null +++ b/src/gtkcalexevent.h @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2009-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_EVENT_H__ +#define __GTK_CALEX_EVENT_H__ + +#include +#include + +#include "gtkcalexcalendar.h" +#include "gtkcalexcategory.h" + +G_BEGIN_DECLS + + +#define TYPE_GTK_CALEX_EVENT (gtk_calex_event_get_type ()) +#define GTK_CALEX_EVENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_GTK_CALEX_EVENT, GtkCalExEvent)) +#define GTK_CALEX_EVENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_GTK_CALEX_EVENT, GtkCalExEventClass)) +#define IS_GTK_CALEX_EVENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_GTK_CALEX_EVENT)) +#define IS_GTK_CALEX_EVENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_GTK_CALEX_EVENT)) +#define GTK_CALEX_EVENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_GTK_CALEX_EVENT, GtkCalExEventClass)) + + +typedef struct _GtkCalExEvent GtkCalExEvent; +typedef struct _GtkCalExEventClass GtkCalExEventClass; + +struct _GtkCalExEvent + { + GObject parent; + }; + +struct _GtkCalExEventClass + { + GObjectClass parent_class; + }; + +GType gtk_calex_event_get_type (void) G_GNUC_CONST; + + +GtkCalExEvent *gtk_calex_event_new (void); + + +G_END_DECLS + +#endif /* __GTK_CALEX_EVENT_H__ */ diff --git a/src/libgtkcalendarex.h b/src/libgtkcalendarex.h index 70ee264..fea9997 100644 --- a/src/libgtkcalendarex.h +++ b/src/libgtkcalendarex.h @@ -22,6 +22,9 @@ #include +#include +#include +#include #endif /* __LIBGTKCALENDAREX_H__ */ diff --git a/tests/test.c b/tests/test.c index f04cf61..c76a1ed 100644 --- a/tests/test.c +++ b/tests/test.c @@ -71,12 +71,13 @@ main (int argc, char **argv) error = NULL; if (!gtk_builder_add_from_file (gtkbuilder, GUIDIR "/test.ui", &error)) { - g_error ("Error on opening gui: %s.", error != NULL && error->message != NULL ? error->message : "no details"); + g_error ("Error on opening gui: %s.", + error != NULL && error->message != NULL ? error->message : "no details"); return 0; } w = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "window1")); - vbox = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "vbox1")); + vbox = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "vbox2")); calex = gtk_calex_new (); gtk_box_pack_start (GTK_BOX (vbox), calex, TRUE, TRUE, 0); diff --git a/tests/test.ui b/tests/test.ui index 7fca5ff..d070330 100644 --- a/tests/test.ui +++ b/tests/test.ui @@ -87,7 +87,37 @@ - + + True + + + True + True + 2010 + 10 + 7 + + + False + 0 + + + + + True + vertical + + + + + + 1 + + + + + 1 + -- 2.49.0