2008-04-30 Mark Doffman <mark.doffman@codethink.co.uk>

[platform/core/uifw/at-spi2-atk.git] / libspi / base.h

diff --git a/libspi/base.h b/libspi/base.h
index dae8961..bfe5860 100644 (file)
--- a/libspi/base.h
+++ b/libspi/base.h
@@ -1,5 +1,9 @@
-/* AT-SPI : Assistive Technology Service Provider Interface
- * Copyright 2001 Ximian, Inc.
+/*
+ * AT-SPI - Assistive Technology Service Provider Interface
+ * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
+ *
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -16,35 +20,37 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #ifndef SPI_BASE_H_
 #define SPI_BASE_H_
 
 #include <glib/gmacros.h>
-#include <bonobo/bonobo-object.h>
 #include <atk/atkobject.h>
+#include <bonobo/bonobo-object.h>
+#include <libspi/Accessibility.h>
 
 G_BEGIN_DECLS
 
-#define SPI_ACCESSIBLE_TYPE        (spi_accessible_get_type ())
-#define SPI_ACCESSIBLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_ACCESSIBLE_TYPE, SpiAccessible))
-#define SPI_ACCESSIBLE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_ACCESSIBLE_TYPE, SpiAccessibleClass))
-#define IS_SPI_ACCESSIBLE(o)       (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_ACCESSIBLE_TYPE))
-#define IS_SPI_ACCESSIBLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_ACCESSIBLE_TYPE))
+#define SPI_TYPE_BASE        (spi_base_get_type ())
+#define SPI_BASE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_TYPE_BASE, SpiBase))
+#define SPI_BASE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_TYPE_BASE, SpiBaseClass))
+#define SPI_IS_BASE(o)       (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_TYPE_BASE))
+#define SPI_IS_BASE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_TYPE_BASE))
 
 typedef struct {
         BonoboObject parent;
-
-        AtkObject   *atko;
+        GObject *gobj;
 } SpiBase;
 
 typedef struct {
         BonoboObjectClass parent_class;
 } SpiBaseClass;
 
-GType      spi_base_get_type       (void);
-gpointer   spi_base_construct      (SpiBase   *base,
-                                   AtkObject *o);
-AtkObject *spi_base_get_atk_object (SpiBase   *base);
+GType      spi_base_get_type          (void);
+void       spi_base_construct         (SpiBase   *base,
+                                      GObject   *gobject);
+void       spi_base_construct_default (SpiBase   *base);
+GObject   *spi_base_get_gobject       (SpiBase   *base);
 
 G_END_DECLS