* Boston, MA 02111-1307, USA.
*/
-/*
- * accessible.c: test for accessibility implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* accessible.c: the core of the accessibility implementation */
+#include <config.h>
#include <stdio.h>
+#include <libspi/libspi.h>
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition for the BonoboObject (Gtk Type)
- */
-#include "accessible.h"
-#include "component.h"
-#include "editabletext.h"
-#include "hyperlink.h"
-#include "hypertext.h"
-#include "image.h"
-#include "selection.h"
-#include "table.h"
-#include "text.h"
-#include "value.h"
-#include "action.h"
-#include "relation.h"
-
-/*
- * Our parent Gtk object type
- */
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
+/* Our parent Gtk object type */
+#define PARENT_TYPE BONOBO_TYPE_OBJECT
-/*
- * A pointer to our parent object class
- */
+/* A pointer to our parent object class */
static GObjectClass *spi_accessible_parent_class;
/*
SpiAccessible *
spi_accessible_new (AtkObject *o)
{
- SpiAccessible *retval =
- SPI_ACCESSIBLE (g_object_new (spi_accessible_get_type (), NULL));
+ SpiAccessible *retval = g_object_new (SPI_ACCESSIBLE_TYPE, NULL);
CORBA_Environment ev;
CORBA_exception_init (&ev);
g_object_ref (o);
retval->atko = ATK_OBJECT (o);
- /*
- * TODO: add interface containers/constructors for SPI_EDITABLE_TEXT, SPI_HYPERTEXT,
- * SPI_IMAGE, SPI_SELECTION, SPI_TABLE, SPI_TEXT, SPI_VALUE.
- */
-
- /* add appropriate ATK interfaces */
+ /* aggregate appropriate SPI interfaces based on ATK interfaces */
if (ATK_IS_ACTION (o))
{