* Boston, MA 02111-1307, USA.
*/
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* hyperlink.c : implements the Hyperlink interface */
+#include <config.h>
#include <stdio.h>
+#include <libspi/hyperlink.h>
+#include <libspi/accessible.h>
-/*
- * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition of the hyperlink bonobo object
- */
-#include "hyperlink.h"
-
-/*
- * Static function declarations
- */
+/* Static function declarations */
static void
spi_hyperlink_class_init (SpiHyperlinkClass *klass);
static CORBA_long
impl__get_endIndex (PortableServer_Servant _servant,
CORBA_Environment * ev);
-static Accessibility_SpiAccessible
+static Accessibility_Accessible
impl_getObject (PortableServer_Servant _servant,
const CORBA_long i,
CORBA_Environment * ev);
static GObjectClass *parent_class;
-GType
-spi_hyperlink_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiHyperlinkClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) spi_hyperlink_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiHyperlink),
- 0, /* n preallocs */
- (GInstanceInitFunc) spi_hyperlink_init,
- NULL /* value table */
- };
-
- /*
- * Bonobo_type_unique auto-generates a load of
- * CORBA structures for us. All derived types must
- * use bonobo_type_unique.
- */
- type = bonobo_type_unique (
- BONOBO_OBJECT_TYPE,
- POA_Accessibility_SpiHyperlink__init,
- NULL,
- G_STRUCT_OFFSET (SpiHyperlinkClass, epv),
- &tinfo,
- "SpiAccessibleHyperlink");
- }
-
- return type;
-}
+
+BONOBO_TYPE_FUNC_FULL (SpiHyperlink,
+ Accessibility_Hyperlink,
+ BONOBO_TYPE_OBJECT,
+ spi_hyperlink);
static void
spi_hyperlink_class_init (SpiHyperlinkClass *klass)
{
GObjectClass * object_class = (GObjectClass *) klass;
- POA_Accessibility_SpiHyperlink__epv *epv = &klass->epv;
+ POA_Accessibility_Hyperlink__epv *epv = &klass->epv;
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = spi_hyperlink_finalize;
spi_hyperlink_finalize (GObject *obj)
{
SpiHyperlink *hyperlink = SPI_HYPERLINK(obj);
- g_object_unref (hyperlink->atko);
- hyperlink->atko = NULL;
+ g_object_unref (hyperlink->hyperlink);
+ hyperlink->hyperlink = NULL;
parent_class->finalize (obj);
}
SpiHyperlink *
-spi_hyperlink_interface_new (AtkObject *obj)
+spi_hyperlink_new (AtkHyperlink *hyperlink)
{
SpiHyperlink *new_hyperlink =
SPI_HYPERLINK(g_object_new (SPI_HYPERLINK_TYPE, NULL));
- new_hyperlink->atko = obj;
- g_object_ref (obj);
+ g_object_ref (hyperlink);
+ new_hyperlink->hyperlink = hyperlink;
return new_hyperlink;
}
CORBA_Environment * ev)
{
SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->atko));
+ return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->hyperlink));
}
CORBA_Environment * ev)
{
SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->atko));
+ return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->hyperlink));
}
CORBA_Environment * ev)
{
SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->atko));
+ return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->hyperlink));
}
SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
gchar *uri;
CORBA_char *rv;
- uri = atk_hyperlink_get_uri (ATK_HYPERLINK(link->atko), (gint) i);
+ uri = atk_hyperlink_get_uri (ATK_HYPERLINK(link->hyperlink), (gint) i);
if (uri)
{
rv = CORBA_string_dup (uri);
-static Accessibility_SpiAccessible
+static Accessibility_Accessible
impl_getObject (PortableServer_Servant _servant,
const CORBA_long i,
CORBA_Environment * ev)
{
SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
AtkObject *atk_object;
- Accessibility_SpiAccessible rv;
- atk_object = atk_hyperlink_get_object (ATK_HYPERLINK(link->atko), (gint) i);
+ Accessibility_Accessible rv;
+ atk_object = atk_hyperlink_get_object (ATK_HYPERLINK(link->hyperlink), (gint) i);
rv = bonobo_object_corba_objref (BONOBO_OBJECT(spi_accessible_new(atk_object)));
return rv;
}
CORBA_Environment * ev)
{
SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
- return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->atko));
+ return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->hyperlink));
}
-
-