1 files changed, 7 insertions, 22 deletions
diff --git a/libgnomecanvas/gailcanvas.h b/libgnomecanvas/gailcanvas.h
index 84dfdb8299..58164da160 100644
--- a/libgnomecanvas/gailcanvas.h
+++ b/libgnomecanvas/gailcanvas.h
@@ -19,6 +19,7 @@
 #define __GAIL_CANVAS_H__
 
 #include <gtk/gtk.h>
+#include <gtk/gtk-a11y.h>
 
 /* This code provides the ATK implementation for gnome-canvas widgets. */
 
@@ -31,39 +32,23 @@ G_BEGIN_DECLS
 #define GAIL_IS_CANVAS_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_CANVAS))
 #define GAIL_CANVAS_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_CANVAS, GailCanvasClass))
 
-#define GAIL_TYPE_CANVAS_FACTORY            (gail_canvas_factory_get_type ())
-#define GAIL_CANVAS_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CANVAS_FACTORY, GailCanvasFactory))
-#define GAIL_CANVAS_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_CANVAS_FACTORY, GailCanvasFactoryClass))
-#define GAIL_IS_CANVAS_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_CANVAS_FACTORY))
-#define GAIL_IS_CANVAS_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_CANVAS_FACTORY))
-#define GAIL_CANVAS_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_CANVAS_FACTORY, GailCanvasFactoryClass))
-
 typedef struct _GailCanvas                 GailCanvas;
 typedef struct _GailCanvasClass            GailCanvasClass;
-typedef struct _GailCanvasFactory          GailCanvasFactory;
-typedef struct _GailCanvasFactoryClass     GailCanvasFactoryClass;
+GType gail_canvas_get_type (void);
 
-struct _GailCanvasFactory
+struct _GailCanvas
 {
-  AtkObjectFactory parent;
+  GtkContainerAccessible parent;
 };
 
-struct _GailCanvasFactoryClass
+struct _GailCanvasClass
 {
-  AtkObjectFactoryClass parent_class;
+  GtkContainerAccessibleClass parent_class;
 };
 
-GType gail_canvas_get_type (void);
-
-struct _GailCanvas;
-
-struct _GailCanvasClass;
-
 AtkObject * gail_canvas_new (GtkWidget *widget);
 
-void gail_canvas_init (void);
-
-GType gail_canvas_factory_get_type (void);
+void gail_canvas_a11y_init (void);
 
 G_END_DECLS