/*
* A pointer to our parent object class
*/
-static GObjectClass *component_parent_class;
+static GObjectClass *spi_component_parent_class;
/*
* Implemented GObject::finalize
static void
accessibility_component_object_finalize (GObject *object)
{
- Component *component = COMPONENT (object);
+ SpiComponent *component = SPI_COMPONENT (object);
- printf("accessible_component_object_finalize called\n");
+ printf("spi_accessible_component_object_finalize called\n");
g_object_unref (component->atko);
component->atko = NULL;
- printf("atko freed, calling parent finalize\n");
- component_parent_class->finalize (object);
+ printf("component atko freed, calling parent finalize\n");
+ spi_component_parent_class->finalize (object);
}
/*
{
CORBA_boolean retval;
BonoboObject *obj;
- Component *component;
+ SpiComponent *component;
obj = bonobo_object_from_servant (servant);
- g_return_val_if_fail (IS_COMPONENT(obj), FALSE);
- component = COMPONENT (obj);
+ g_return_val_if_fail (IS_SPI_COMPONENT(obj), FALSE);
+ component = SPI_COMPONENT (obj);
g_return_val_if_fail (ATK_IS_COMPONENT(component->atko), FALSE);
retval = atk_component_contains (ATK_COMPONENT (component->atko), (gint) x, (gint) y,
(AtkCoordType) coord_type);
CORBA_Environment *ev)
{
BonoboObject *obj;
- Component *component;
+ SpiComponent *component;
Accessibility_Accessible retval;
AtkObject *child;
obj = bonobo_object_from_servant (servant);
- g_return_val_if_fail (IS_COMPONENT(obj), CORBA_OBJECT_NIL);
- component = COMPONENT (obj);
+ g_return_val_if_fail (IS_SPI_COMPONENT(obj), CORBA_OBJECT_NIL);
+ component = SPI_COMPONENT (obj);
g_return_val_if_fail (ATK_IS_COMPONENT(component->atko), CORBA_OBJECT_NIL);
child = atk_component_ref_accessible_at_point (ATK_COMPONENT (component->atko),
(gint) x, (gint) y,
(AtkCoordType) coord_type);
- retval = bonobo_object_corba_objref (bonobo_object (accessible_new (child)));
- return retval;
+ retval = bonobo_object_corba_objref (bonobo_object (spi_accessible_new (child)));
+ return CORBA_Object_duplicate (retval, ev);
}
/*
CORBA_Environment *ev)
{
BonoboObject *obj;
- Component *component;
+ SpiComponent *component;
gint ix, iy, iw, ih;
obj = bonobo_object_from_servant (servant);
- g_return_if_fail (IS_COMPONENT(obj));
- component = COMPONENT (obj);
+ g_return_if_fail (IS_SPI_COMPONENT(obj));
+ component = SPI_COMPONENT (obj);
g_return_if_fail (ATK_IS_COMPONENT (component->atko));
atk_component_get_extents (ATK_COMPONENT (component->atko), &ix, &iy, &iw, &ih,
CORBA_Environment *ev)
{
BonoboObject *obj = bonobo_object_from_servant (servant);
- Component *component;
+ SpiComponent *component;
gint ix, iy;
- g_return_if_fail (IS_COMPONENT(obj));
- component = COMPONENT(obj);
+ g_return_if_fail (IS_SPI_COMPONENT(obj));
+ component = SPI_COMPONENT(obj);
g_return_if_fail (ATK_IS_COMPONENT(component->atko));
atk_component_get_position (ATK_COMPONENT (component->atko), &ix, &iy,
CORBA_long * height,
CORBA_Environment *ev)
{
- Component *component;
+ SpiComponent *component;
BonoboObject *obj = bonobo_object_from_servant (servant);
gint iw, ih;
- g_return_if_fail (IS_COMPONENT(obj));
- component = COMPONENT(obj);
+ g_return_if_fail (IS_SPI_COMPONENT(obj));
+ component = SPI_COMPONENT(obj);
g_return_if_fail (ATK_IS_COMPONENT(component->atko));
atk_component_get_size (ATK_COMPONENT (component->atko), &iw, &ih);
*width = (CORBA_long) iw;
}
static void
-accessibility_component_class_init (ComponentClass *klass)
+spi_component_class_init (SpiComponentClass *klass)
{
GObjectClass * object_class = (GObjectClass *) klass;
POA_Accessibility_Component__epv *epv = &klass->epv;
- component_parent_class = g_type_class_peek_parent (klass);
+ spi_component_parent_class = g_type_class_peek_parent (klass);
object_class->finalize = accessibility_component_object_finalize;
}
static void
-accessibility_component_init (Component *component)
+spi_component_init (SpiComponent *component)
{
}
-GType
-accessibility_component_get_type (void)
-{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo tinfo = {
- sizeof (ComponentClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) accessibility_component_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class data */
- sizeof (Component),
- 0, /* n preallocs */
- (GInstanceInitFunc) accessibility_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_Component__init,
- NULL,
- G_STRUCT_OFFSET (ComponentClass, epv),
- &tinfo,
- "AccessibleComponent");
- }
-
- return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiComponent,
+ Accessibility_Component,
+ PARENT_TYPE,
+ spi_component);
-Component *
-component_interface_new (AtkObject *o)
+SpiComponent *
+spi_component_interface_new (AtkObject *o)
{
- Component *retval =
- COMPONENT (g_object_new (accessibility_component_get_type (), NULL));
+ SpiComponent *retval =
+ SPI_COMPONENT (g_object_new (SPI_COMPONENT_TYPE, NULL));
retval->atko = o;
g_object_ref (o);
-return retval;
+ return retval;
}