* Boston, MA 02111-1307, USA.
*/
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* component.c : implements the Component interface */
+#include <config.h>
#include <stdio.h>
+#include <libspi/accessible.h>
+#include <libspi/component.h>
-/*
- * This pulls the CORBA definitions for the "Accessibility::SpiAccessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition for the BonoboObject (Gtk Type)
- */
-#include "component.h"
-#include "accessible.h"
+/* Our parent Gtk object type */
+#define PARENT_TYPE BONOBO_TYPE_OBJECT
-/*
- * Our parent Gtk object type
- */
-#define PARENT_TYPE BONOBO_OBJECT_TYPE
-
-/*
- * A pointer to our parent object class
- */
+/* A pointer to our parent object class */
static GObjectClass *spi_component_parent_class;
/*
* Implemented GObject::finalize
*/
static void
-accessibility_spi_component_object_finalize (GObject *object)
+accessibility_component_object_finalize (GObject *object)
{
SpiComponent *component = SPI_COMPONENT (object);
- printf("spi_accessible_spi_component_object_finalize called\n");
+ printf("spi_accessible_component_object_finalize called\n");
g_object_unref (component->atko);
component->atko = NULL;
}
/*
- * CORBA Accessibility::SpiComponent::contains method implementation
+ * CORBA Accessibility::Component::contains method implementation
*/
static CORBA_boolean
-impl_accessibility_spi_component_contains (PortableServer_Servant servant,
+impl_accessibility_component_contains (PortableServer_Servant servant,
const CORBA_long x,
const CORBA_long y,
CORBA_short coord_type,
}
/*
- * CORBA Accessibility::SpiComponent::getAccessibleAtPoint method implementation
+ * CORBA Accessibility::Component::getAccessibleAtPoint method implementation
*/
-static Accessibility_SpiAccessible
-impl_accessibility_spi_component_get_accessible_at_point (PortableServer_Servant servant,
+static Accessibility_Accessible
+impl_accessibility_component_get_accessible_at_point (PortableServer_Servant servant,
const CORBA_long x,
const CORBA_long y,
CORBA_short coord_type,
{
BonoboObject *obj;
SpiComponent *component;
- Accessibility_SpiAccessible retval;
+ Accessibility_Accessible retval;
AtkObject *child;
obj = bonobo_object_from_servant (servant);
}
/*
- * CORBA Accessibility::SpiComponent::getExtents method implementation
+ * CORBA Accessibility::Component::getExtents method implementation
*/
static void
-impl_accessibility_spi_component_get_extents (PortableServer_Servant servant,
+impl_accessibility_component_get_extents (PortableServer_Servant servant,
CORBA_long * x,
CORBA_long * y,
CORBA_long * width,
}
/*
- * CORBA Accessibility::SpiComponent::getPosition method implementation
+ * CORBA Accessibility::Component::getPosition method implementation
*/
static void
-impl_accessibility_spi_component_get_position (PortableServer_Servant servant,
+impl_accessibility_component_get_position (PortableServer_Servant servant,
CORBA_long * x,
CORBA_long * y,
const CORBA_short coord_type,
}
/*
- * CORBA Accessibility::SpiComponent::getSize method implementation
+ * CORBA Accessibility::Component::getSize method implementation
*/
static void
-impl_accessibility_spi_component_get_size (PortableServer_Servant servant,
+impl_accessibility_component_get_size (PortableServer_Servant servant,
CORBA_long * width,
CORBA_long * height,
CORBA_Environment *ev)
}
static void
-accessibility_spi_component_class_init (SpiComponentClass *klass)
+spi_component_class_init (SpiComponentClass *klass)
{
GObjectClass * object_class = (GObjectClass *) klass;
- POA_Accessibility_SpiComponent__epv *epv = &klass->epv;
+ POA_Accessibility_Component__epv *epv = &klass->epv;
spi_component_parent_class = g_type_class_peek_parent (klass);
- object_class->finalize = accessibility_spi_component_object_finalize;
+ object_class->finalize = accessibility_component_object_finalize;
- epv->contains = impl_accessibility_spi_component_contains;
- epv->getAccessibleAtPoint = impl_accessibility_spi_component_get_accessible_at_point;
- epv->getExtents = impl_accessibility_spi_component_get_extents;
- epv->getPosition = impl_accessibility_spi_component_get_position;
- epv->getSize = impl_accessibility_spi_component_get_size;
+ epv->contains = impl_accessibility_component_contains;
+ epv->getAccessibleAtPoint = impl_accessibility_component_get_accessible_at_point;
+ epv->getExtents = impl_accessibility_component_get_extents;
+ epv->getPosition = impl_accessibility_component_get_position;
+ epv->getSize = impl_accessibility_component_get_size;
}
static void
-accessibility_spi_component_init (SpiComponent *component)
+spi_component_init (SpiComponent *component)
{
}
-GType
-accessibility_spi_component_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (SpiComponentClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) accessibility_spi_component_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (SpiComponent),
- 0, /* n preallocs */
- (GInstanceInitFunc) accessibility_spi_component_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 (
- PARENT_TYPE,
- POA_Accessibility_SpiComponent__init,
- NULL,
- G_STRUCT_OFFSET (SpiComponentClass, epv),
- &tinfo,
- "SpiAccessibleComponent");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiComponent,
+ Accessibility_Component,
+ PARENT_TYPE,
+ spi_component);
SpiComponent *
spi_component_interface_new (AtkObject *o)
{
SpiComponent *retval =
- SPI_COMPONENT (g_object_new (accessibility_spi_component_get_type (), NULL));
+ SPI_COMPONENT (g_object_new (SPI_COMPONENT_TYPE, NULL));
retval->atko = o;
g_object_ref (o);
return retval;