Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gal/gal/a11y/e-table/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- Makefile.am	8 Jan 2003 19:16:14 -0000	1.2
+++ Makefile.am	9 Oct 2003 06:14:34 -0000
@@ -11,19 +11,25 @@
 noinst_LTLIBRARIES = libgal-a11y-etable.la
 
 libgal_a11y_etable_la_SOURCES =			\
+	gal-a11y-e-tree.c			\
+	gal-a11y-e-tree-factory.c		\
 	gal-a11y-e-cell.c			\
 	gal-a11y-e-cell-text.c			\
 	gal-a11y-e-cell-registry.c		\
 	gal-a11y-e-table.c			\
 	gal-a11y-e-table-item.c			\
+	gal-a11y-e-table-item-factory.c		\
 	gal-a11y-e-table-factory.c
 
 libgal_a11y_etableincludedir = $(includedir)/gal-$(GAL_API_VERSION)/gal/a11y/e-table
 
 libgal_a11y_etableinclude_HEADERS =		\
+	gal-a11y-e-tree.h			\
+	gal-a11y-e-tree-factory.h		\
 	gal-a11y-e-cell.h			\
 	gal-a11y-e-cell-text.h			\
 	gal-a11y-e-cell-registry.h		\
 	gal-a11y-e-table.h			\
 	gal-a11y-e-table-item.h			\
+	gal-a11y-e-table-item-factory.h		\
 	gal-a11y-e-table-factory.h
Index: gal-a11y-e-cell.c
===================================================================
RCS file: /cvs/gnome/gal/gal/a11y/e-table/gal-a11y-e-cell.c,v
retrieving revision 1.1
diff -u -r1.1 gal-a11y-e-cell.c
--- gal-a11y-e-cell.c	30 Nov 2002 07:54:15 -0000	1.1
+++ gal-a11y-e-cell.c	9 Oct 2003 06:14:34 -0000
@@ -222,6 +222,7 @@
 	a11y->model_col = model_col;
 	a11y->view_col  = view_col;
 	a11y->row       = row;
+	ATK_OBJECT (a11y) ->role	= ATK_ROLE_TABLE_CELL;
 
 #if 0
 	if (parent)
Index: gal-a11y-e-table-item-factory.c
===================================================================
RCS file: gal-a11y-e-table-item-factory.c
diff -N gal-a11y-e-table-item-factory.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gal-a11y-e-table-item-factory.c	9 Oct 2003 06:14:34 -0000
@@ -0,0 +1,96 @@
+/*
+ * Authors: Yuedong Du <yuedong.du@sun.com>
+ *
+ * Copyright (C) 2003 Ximian, Inc.
+ */
+
+#include <config.h>
+#include "gal-a11y-e-table-item-factory.h"
+#include "gal-a11y-e-table-item.h"
+#include "gal-a11y-e-table.h"
+#include <gal/e-table/e-table.h>
+#include <gal/e-table/e-tree.h>
+#include <atk/atk.h>
+
+
+#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETableItemFactoryClass))
+static AtkObjectFactoryClass *parent_class;
+#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
+
+/* Static functions */
+
+static GType
+gal_a11y_e_table_item_factory_get_accessible_type (void)
+{
+        return GAL_A11Y_TYPE_E_TABLE_ITEM;
+}
+
+static AtkObject*
+gal_a11y_e_table_item_factory_create_accessible (GObject *obj)
+{
+	AtkObject * accessible;
+	ETableItem * eti;
+	GnomeCanvas * gc;
+	GtkWidget * table;
+
+	g_return_if_fail (E_IS_TABLE_ITEM(obj));
+	eti = E_TABLE_ITEM(obj);
+	gc = GNOME_CANVAS_ITEM(eti)->canvas;
+
+	table = gtk_widget_get_parent(GTK_WIDGET(gc));
+
+	accessible = gtk_widget_get_accessible (table);
+	accessible = atk_object_ref_accessible_child (accessible, 0);
+
+	return accessible;
+}
+
+static void
+gal_a11y_e_table_item_factory_class_init (GalA11yETableItemFactoryClass *klass)
+{
+	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
+
+	parent_class = g_type_class_ref (PARENT_TYPE);
+
+	factory_class->create_accessible   = gal_a11y_e_table_item_factory_create_accessible;
+	factory_class->get_accessible_type = gal_a11y_e_table_item_factory_get_accessible_type;
+}
+
+static void
+gal_a11y_e_table_item_factory_init (GalA11yETableItemFactory *factory)
+{
+}
+
+/**
+ * gal_a11y_e_table_factory_get_type:
+ * @void: 
+ * 
+ * Registers the &GalA11yETableFactory class if necessary, and returns the type ID
+ * associated to it.
+ * 
+ * Return value: The type ID of the &GalA11yETableFactory class.
+ **/
+GType
+gal_a11y_e_table_item_factory_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		GTypeInfo info = {
+			sizeof (GalA11yETableItemFactoryClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) gal_a11y_e_table_item_factory_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL, /* class_data */
+			sizeof (GalA11yETableItemFactory),
+			0,
+			(GInstanceInitFunc) gal_a11y_e_table_item_factory_init,
+			NULL /* value_table */
+		};
+
+		type = g_type_register_static (PARENT_TYPE, "GalA11yETableItemFactory", &info, 0);
+	}
+
+	return type;
+}
Index: gal-a11y-e-table-item-factory.h
===================================================================
RCS file: gal-a11y-e-table-item-factory.h
diff -N gal-a11y-e-table-item-factory.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gal-a11y-e-table-item-factory.h	9 Oct 2003 06:14:34 -0000
@@ -0,0 +1,34 @@
+/*
+ * Authors: *   Yuedong Du <yuedong.du@sun.com>
+ *
+ * Copyright (C) 2003 Ximian, Inc.
+ */
+
+#ifndef __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
+#define __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
+
+#include <glib-object.h>
+#include <atk/atkobjectfactory.h>
+
+#define GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY            (gal_a11y_e_table_item_factory_get_type ())
+#define GAL_A11Y_E_TABLE_ITEM_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY, GalA11yETableItemFactory))
+#define GAL_A11Y_E_TABLE_ITEM_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY, GalA11yETableItemFactoryClass))
+#define GAL_A11Y_IS_E_TABLE_ITEM_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY))
+#define GAL_A11Y_IS_E_TABLE_ITEM_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY))
+
+typedef struct _GalA11yETableItemFactory GalA11yETableItemFactory;
+typedef struct _GalA11yETableItemFactoryClass GalA11yETableItemFactoryClass;
+
+struct _GalA11yETableItemFactory {
+	AtkObject object;
+};
+
+struct _GalA11yETableItemFactoryClass {
+	AtkObjectClass parent_class;
+};
+
+
+/* Standard Glib function */
+GType              gal_a11y_e_table_item_factory_get_type         (void);
+
+#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */
Index: gal-a11y-e-table.c
===================================================================
RCS file: /cvs/gnome/gal/gal/a11y/e-table/gal-a11y-e-table.c,v
retrieving revision 1.1
diff -u -r1.1 gal-a11y-e-table.c
--- gal-a11y-e-table.c	30 Nov 2002 07:54:15 -0000	1.1
+++ gal-a11y-e-table.c	9 Oct 2003 06:14:34 -0000
@@ -34,6 +34,7 @@
 	ETable *table = E_TABLE (GTK_ACCESSIBLE (a11y)->widget);
 	if (priv->child_item == NULL) {
 		priv->child_item = gal_a11y_e_table_item_new (ATK_OBJECT (a11y), E_TABLE_GROUP_LEAF (table->group)->item, 0);
+		priv->child_item->role = ATK_ROLE_TABLE;
 	}
 }
 
Index: gal-a11y-e-tree-factory.c
===================================================================
RCS file: gal-a11y-e-tree-factory.c
diff -N gal-a11y-e-tree-factory.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gal-a11y-e-tree-factory.c	9 Oct 2003 06:14:34 -0000
@@ -0,0 +1,81 @@
+/*
+ * Authors: Yuedong Du <yuedong.du@sun.com>
+ *
+ * Copyright (C) 2003 Ximian, Inc.
+ */
+
+#include <config.h>
+#include "gal-a11y-e-tree-factory.h"
+#include "gal-a11y-e-tree.h"
+
+#define CS_CLASS(factory) (G_TYPE_INSTANCE_GET_CLASS ((factory), C_TYPE_STREAM, GalA11yETreeFactoryClass))
+static AtkObjectFactoryClass *parent_class;
+#define PARENT_TYPE (ATK_TYPE_OBJECT_FACTORY)
+
+/* Static functions */
+
+static GType
+gal_a11y_e_tree_factory_get_accessible_type (void)
+{
+        return GAL_A11Y_TYPE_E_TREE;
+}
+
+static AtkObject*
+gal_a11y_e_tree_factory_create_accessible (GObject *obj)
+{
+	AtkObject *accessible;
+
+	accessible = gal_a11y_e_tree_new (obj);
+
+	return accessible;
+}
+
+static void
+gal_a11y_e_tree_factory_class_init (GalA11yETreeFactoryClass *klass)
+{
+	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
+
+	parent_class = g_type_class_ref (PARENT_TYPE);
+
+	factory_class->create_accessible   = gal_a11y_e_tree_factory_create_accessible;
+	factory_class->get_accessible_type = gal_a11y_e_tree_factory_get_accessible_type;
+}
+
+static void
+gal_a11y_e_tree_factory_init (GalA11yETreeFactory *factory)
+{
+}
+
+/**
+ * gal_a11y_e_tree_factory_get_type:
+ * @void: 
+ * 
+ * Registers the &GalA11yETreeFactory class if necessary, and returns the type ID
+ * associated to it.
+ * 
+ * Return value: The type ID of the &GalA11yETreeFactory class.
+ **/
+GType
+gal_a11y_e_tree_factory_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		GTypeInfo info = {
+			sizeof (GalA11yETreeFactoryClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) gal_a11y_e_tree_factory_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL, /* class_data */
+			sizeof (GalA11yETreeFactory),
+			0,
+			(GInstanceInitFunc) gal_a11y_e_tree_factory_init,
+			NULL /* value_tree */
+		};
+
+		type = g_type_register_static (PARENT_TYPE, "GalA11yETreeFactory", &info, 0);
+	}
+
+	return type;
+}
Index: gal-a11y-e-tree-factory.h
===================================================================
RCS file: gal-a11y-e-tree-factory.h
diff -N gal-a11y-e-tree-factory.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gal-a11y-e-tree-factory.h	9 Oct 2003 06:14:34 -0000
@@ -0,0 +1,34 @@
+/*
+ * Authors: Yuedong Du <yuedong.du@ximian.com>
+ *
+ * Copyright (C) 2003 Ximian, Inc.
+ */
+
+#ifndef __GAL_A11Y_E_TREE_FACTORY_H__
+#define __GAL_A11Y_E_TREE_FACTORY_H__
+
+#include <glib-object.h>
+#include <atk/atkobjectfactory.h>
+
+#define GAL_A11Y_TYPE_E_TREE_FACTORY            (gal_a11y_e_table_factory_get_type ())
+#define GAL_A11Y_E_TREE_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE_FACTORY, GalA11yETreeFactory))
+#define GAL_A11Y_E_TREE_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TREE_FACTORY, GalA11yETreeFactoryClass))
+#define GAL_A11Y_IS_E_TREE_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TREE_FACTORY))
+#define GAL_A11Y_IS_E_TREE_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TREE_FACTORY))
+
+typedef struct _GalA11yETreeFactory GalA11yETreeFactory;
+typedef struct _GalA11yETreeFactoryClass GalA11yETreeFactoryClass;
+
+struct _GalA11yETreeFactory {
+	AtkObject object;
+};
+
+struct _GalA11yETreeFactoryClass {
+	AtkObjectClass parent_class;
+};
+
+
+/* Standard Glib function */
+GType              gal_a11y_e_tree_factory_get_type         (void);
+
+#endif /* ! __GAL_A11Y_E_TREE_FACTORY_H__ */
Index: gal-a11y-e-tree.c
===================================================================
RCS file: gal-a11y-e-tree.c
diff -N gal-a11y-e-tree.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gal-a11y-e-tree.c	9 Oct 2003 06:14:34 -0000
@@ -0,0 +1,158 @@
+/*
+ * Authors: Yuedong Du <yuedong.du@sun.com>
+ *
+ * Copyright (C) 2003 Ximian, Inc.
+ */
+
+#include <config.h>
+#include "gal-a11y-e-tree.h"
+#include "gal-a11y-util.h"
+#include <gal/e-table/e-tree.h>
+#include <gal/e-table/e-table-item.h>
+
+#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETreeClass))
+static AtkObjectClass *parent_class;
+static GType parent_type;
+static gint priv_offset;
+#define GET_PRIVATE(object) ((GalA11yETreePrivate *) (((char *) object) + priv_offset))
+#define PARENT_TYPE (parent_type)
+
+struct _GalA11yETreePrivate {
+	AtkObject *child_item;
+};
+
+/* Static functions */
+
+static void
+init_child_item (GalA11yETree *a11y)
+{
+	GalA11yETreePrivate *priv = GET_PRIVATE (a11y);
+	ETree *tree = E_TREE (GTK_ACCESSIBLE (a11y)->widget);
+	ETableItem * eti;
+
+	g_return_if_fail (tree);
+	eti = e_tree_get_item (tree);
+	if (priv->child_item == NULL) {
+		priv->child_item = gal_a11y_e_table_item_new (ATK_OBJECT (a11y),eti, 0);
+		priv->child_item->role = ATK_ROLE_TREE_TABLE;
+	}
+}
+
+static AtkObject*
+et_ref_accessible_at_point  (AtkComponent *component,
+			     gint x,
+			     gint y,
+			     AtkCoordType coord_type)
+{
+	GalA11yETree *a11y = GAL_A11Y_E_TREE (component);
+	init_child_item (a11y);
+	return GET_PRIVATE (a11y)->child_item;
+}
+
+static gint
+et_get_n_children (AtkObject *accessible)
+{
+	return 1;
+}
+
+static AtkObject*
+et_ref_child (AtkObject *accessible,
+	      gint i)
+{
+	GalA11yETree *a11y = GAL_A11Y_E_TREE (accessible);
+	if (i != 0)
+		return NULL;
+	init_child_item (a11y);
+	g_object_ref (GET_PRIVATE (a11y)->child_item);
+	return GET_PRIVATE (a11y)->child_item;
+}
+
+static void
+et_class_init (GalA11yETreeClass *klass)
+{
+	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
+
+	parent_class                              = g_type_class_ref (PARENT_TYPE);
+
+	atk_object_class->get_n_children          = et_get_n_children;
+	atk_object_class->ref_child               = et_ref_child;
+}
+
+static void
+et_atk_component_iface_init (AtkComponentIface *iface)
+{
+	iface->ref_accessible_at_point = et_ref_accessible_at_point;
+}
+
+static void
+et_init (GalA11yETree *a11y)
+{
+	GalA11yETreePrivate *priv;
+
+	priv = GET_PRIVATE (a11y);
+
+	priv->child_item = NULL;
+}
+
+/**
+ * gal_a11y_e_tree_get_type:
+ * @void: 
+ * 
+ * Registers the &GalA11yETree class if necessary, and returns the type ID
+ * associated to it.
+ * 
+ * Return value: The type ID of the &GalA11yETree class.
+ **/
+GType
+gal_a11y_e_tree_get_type (void)
+{
+	static GType type = 0;
+
+	if (!type) {
+		AtkObjectFactory *factory;
+
+		GTypeInfo info = {
+			sizeof (GalA11yETreeClass),
+			(GBaseInitFunc) NULL,
+			(GBaseFinalizeFunc) NULL,
+			(GClassInitFunc) et_class_init,
+			(GClassFinalizeFunc) NULL,
+			NULL, /* class_data */
+			sizeof (GalA11yETree),
+			0,
+			(GInstanceInitFunc) et_init,
+			NULL /* value_tree */
+		};
+
+		static const GInterfaceInfo atk_component_info = {
+			(GInterfaceInitFunc) et_atk_component_iface_init,
+			(GInterfaceFinalizeFunc) NULL,
+			NULL
+		};
+
+		factory = atk_registry_get_factory (atk_get_default_registry (), GTK_TYPE_WIDGET);
+		parent_type = atk_object_factory_get_accessible_type (factory);
+
+		type = gal_a11y_type_register_static_with_private (PARENT_TYPE, "GalA11yETree", &info, 0,
+								   sizeof (GalA11yETreePrivate), &priv_offset);
+		g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info);
+	}
+
+	return type;
+}
+
+AtkObject *
+gal_a11y_e_tree_new (GObject *widget)
+{
+	GalA11yETree *a11y;
+	ETree *tree;
+	AtkObject * item;
+
+	tree = E_TREE (widget);
+
+	a11y = g_object_new (gal_a11y_e_tree_get_type (), NULL);
+
+	GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);
+
+	return ATK_OBJECT (a11y);
+}
Index: gal-a11y-e-tree.h
===================================================================
RCS file: gal-a11y-e-tree.h
diff -N gal-a11y-e-tree.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gal-a11y-e-tree.h	9 Oct 2003 06:14:34 -0000
@@ -0,0 +1,41 @@
+/*
+ * Authors: Yuedong Du <yuedong.du@sun.com>
+ *
+ * Copyright (C) 2003 Ximian, Inc.
+ */
+
+#ifndef __GAL_A11Y_E_TREE_H__
+#define __GAL_A11Y_E_TREE_H__
+
+#include <glib-object.h>
+#include <atk/atkobject.h>
+#include <atk/atkcomponent.h>
+#include <gtk/gtkaccessible.h>
+
+#define GAL_A11Y_TYPE_E_TREE            (gal_a11y_e_tree_get_type ())
+#define GAL_A11Y_E_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TREE, GalA11yETree))
+#define GAL_A11Y_E_TREE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TREE, GalA11yETreeClass))
+#define GAL_A11Y_IS_E_TREE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TREE))
+#define GAL_A11Y_IS_E_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_TREE))
+
+typedef struct _GalA11yETree GalA11yETree;
+typedef struct _GalA11yETreeClass GalA11yETreeClass;
+typedef struct _GalA11yETreePrivate GalA11yETreePrivate;
+
+/* This struct should actually be larger as this isn't what we derive from.
+ * The GalA11yETablePrivate comes right after the parent class structure.
+ **/
+struct _GalA11yETree {
+	GtkAccessible object;
+};
+
+struct _GalA11yETreeClass {
+	GtkAccessibleClass parent_class;
+};
+
+
+/* Standard Glib function */
+GType      gal_a11y_e_tree_get_type  (void);
+AtkObject *gal_a11y_e_tree_new       (GObject *tree);
+
+#endif /* ! __GAL_A11Y_E_TREE_H__ */
