{
SpiImage *new_image = g_object_new (SPI_IMAGE_TYPE, NULL);
- spi_base_construct (SPI_BASE (new_image), obj);
+ spi_base_construct (SPI_BASE (new_image), G_OBJECT(obj));
return new_image;
}
{
SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
- if (!object)
- {
- return NULL;
- }
-
- return ATK_IMAGE (object->atko);
+ g_return_val_if_fail (object, NULL);
+ g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL);
+ return ATK_IMAGE (object->gobj);
}
static void
CORBA_Environment *ev)
{
AtkImage *image = get_image_from_servant (servant);
+ gint ix, iy;
g_return_if_fail (image != NULL);
atk_image_get_image_position (image,
- (gint *) x, (gint *) y,
+ &ix, &iy,
(AtkCoordType) coordType);
+ *x = ix;
+ *y = iy;
}
static void
CORBA_Environment *ev)
{
AtkImage *image = get_image_from_servant (servant);
-
+ gint iw, ih;
+
g_return_if_fail (image != NULL);
atk_image_get_image_size (image,
- (gint *) width, (gint *) height);
+ &iw, &ih);
+ *width = iw;
+ *height = ih;
}
static Accessibility_BoundingBox
gint x, y, width, height;
Accessibility_BoundingBox bbox;
+ bbox.x = bbox.y = bbox.width = bbox.height = -1;
+
image = get_image_from_servant (servant);
- atk_image_get_image_size (image, &width, &height);
- atk_image_get_image_position (image, &x, &y, coordType);
+ if (image)
+ {
+ atk_image_get_image_size (image, &width, &height);
+ atk_image_get_image_position (image, &x, &y, coordType);
- bbox.x = x;
- bbox.y = y;
- bbox.width = width;
- bbox.height = height;
+ bbox.x = x;
+ bbox.y = y;
+ bbox.width = width;
+ bbox.height = height;
+ }
return bbox;
}