aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/ChangeLog5
-rw-r--r--widgets/misc/Makefile.am4
-rw-r--r--widgets/misc/e-calendar-item.c20
3 files changed, 28 insertions, 1 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index e69de29bb2..8dd3170c62 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -0,0 +1,5 @@
+2003-08-27 Bolian Yin <bolian.yin@sun.com>
+
+ * misc/Makefile.am: add dependency on a11y/widgets.
+ * misc/e-calendar-item.c (e_calendar_item_class_init): a11y init.
+ (e_calendar_item_bounds): new func, impl the bounds virtual func.
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index ece1cbc880..072a785162 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -4,6 +4,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets/shortcut-bar \
+ -I$(top_srcdir)/a11y/widgets/ \
-DMAP_DIR=\""$(imagesdir)"\" \
-DG_LOG_DOMAIN=__FILE__ \
-DG_DISABLE_DEPRECATED \
@@ -53,7 +54,8 @@ libemiscwidgets_la_SOURCES = \
MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
@EVO_MARSHAL_RULE@
-libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la
+libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la
noinst_LTLIBRARIES = libefilterbar.la
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index b900f331e2..1f430124d9 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -31,6 +31,7 @@
#endif
#include "e-calendar-item.h"
+#include "ea-widgets.h"
#include <time.h>
#include <string.h>
@@ -131,6 +132,9 @@ static double e_calendar_item_point (GnomeCanvasItem *item,
GnomeCanvasItem **actual_item);
static gint e_calendar_item_event (GnomeCanvasItem *item,
GdkEvent *event);
+static void e_calendar_item_bounds (GnomeCanvasItem *item, double *x1, double *y1,
+ double *x2, double *y2);
+
static gboolean e_calendar_item_button_press (ECalendarItem *calitem,
GdkEvent *event);
static gboolean e_calendar_item_button_release (ECalendarItem *calitem,
@@ -367,9 +371,12 @@ e_calendar_item_class_init (ECalendarItemClass *class)
item_class->draw = e_calendar_item_draw;
item_class->point = e_calendar_item_point;
item_class->event = e_calendar_item_event;
+ item_class->bounds = e_calendar_item_bounds;
class->date_range_changed = NULL;
class->selection_changed = NULL;
+
+ e_calendar_item_a11y_init ();
}
@@ -1601,7 +1608,20 @@ e_calendar_item_event (GnomeCanvasItem *item, GdkEvent *event)
return FALSE;
}
+static void
+e_calendar_item_bounds (GnomeCanvasItem *item, double *x1, double *y1,
+ double *x2, double *y2)
+{
+ ECalendarItem *calitem;
+
+ g_return_if_fail (E_IS_CALENDAR_ITEM (item));
+ calitem = E_CALENDAR_ITEM (item);
+ *x1 = calitem->x1;
+ *y1 = calitem->y1;
+ *x2 = calitem->x2;
+ *y2 = calitem->y2;
+}
/* This checks if any fonts have changed, and if so it recalculates the
text sizes and the minimum month size. */