2001-11-13 Michael Meeks <michael@ximian.com>

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_component.c

diff --git a/cspi/spi_component.c b/cspi/spi_component.c
index c695fc4..a5fdc07 100644 (file)
--- a/cspi/spi_component.c
+++ b/cspi/spi_component.c
@@ -1,11 +1,11 @@
 /*
  *
- * AccessibleComponent function implementations
+ * SpiAccessibleComponent function implementations
  *
  */
 
 /**
- * AccessibleComponent_ref:
+ * SpiAccessibleComponent_ref:
  * @obj: a pointer to an object implementing #AccessibleComponent on which to operate.
  *
  * Increment the reference count for an #AccessibleComponent.
@@ -14,14 +14,14 @@
  *
  **/
 int
-AccessibleComponent_ref (AccessibleComponent *obj)
+SpiAccessibleComponent_ref (SpiAccessibleComponent *obj)
 {
   Accessibility_Component_ref (*obj, &ev);
   return 0;
 }
 
 /**
- * AccessibleComponent_unref:
+ * SpiAccessibleComponent_unref:
  * @obj: a pointer to the object implementing #AccessibleComponent on which to operate.
  *
  * Decrement the reference count for an #AccessibleComponent.
@@ -30,14 +30,14 @@ AccessibleComponent_ref (AccessibleComponent *obj)
  *
  **/
 int
-AccessibleComponent_unref (AccessibleComponent *obj)
+SpiAccessibleComponent_unref (SpiAccessibleComponent *obj)
 {
   Accessibility_Component_unref (*obj, &ev);
   return 0;
 }
 
 /**
- * AccessibleComponent_contains:
+ * SpiAccessibleComponent_contains:
  * @obj: a pointer to the #AccessibleComponent to query.
  * @x: a #long specifying the x coordinate in question.
  * @y: a #long specifying the y coordinate in question.
@@ -48,10 +48,10 @@ AccessibleComponent_unref (AccessibleComponent *obj)
  *
  **/
 boolean
-AccessibleComponent_contains (AccessibleComponent *obj,
+SpiAccessibleComponent_contains (SpiAccessibleComponent *obj,
                               long x,
                               long y,
-                              AccessibleCoordType ctype)
+                              SpiAccessibleCoordType ctype)
 {
   return Accessibility_Component_contains (*obj,
                                            (CORBA_long) x,
@@ -61,7 +61,7 @@ AccessibleComponent_contains (AccessibleComponent *obj,
 }
 
 /**
- * AccessibleComponent_getAccessibleAtPoint:
+ * SpiAccessibleComponent_getAccessibleAtPoint:
  * @obj: a pointer to the #AccessibleComponent to query.
  * @x: a #long specifying the x coordinate of the point in question.
  * @y: a #long specifying the y coordinate of the point in question.
@@ -73,13 +73,13 @@ AccessibleComponent_contains (AccessibleComponent *obj,
  * Returns: a pointer to an #Accessible child of the specified component which
  *          contains the point (@x, @y), or NULL of no child contains the point.
  **/
-Accessible *
-AccessibleComponent_getAccessibleAtPoint (AccessibleComponent *obj,
+SpiAccessible *
+SpiAccessibleComponent_getAccessibleAtPoint (SpiAccessibleComponent *obj,
                                           long x,
                                           long y,
-                                          AccessibleCoordType ctype)
+                                          SpiAccessibleCoordType ctype)
 {
-  Accessible child;
+  SpiAccessible child;
   child = Accessibility_Component_getAccessibleAtPoint(*obj,
                                                        (CORBA_long) x,
                                                        (CORBA_long) y,
@@ -89,7 +89,7 @@ AccessibleComponent_getAccessibleAtPoint (AccessibleComponent *obj,
 }
 
 /**
- * AccessibleComponent_getExtents:
+ * SpiAccessibleComponent_getExtents:
  * @obj: a pointer to the #AccessibleComponent to query.
  * @x: a pointer to a #long into which the minimum x coordinate will be returned.
  * @y: a pointer to a #long into which the minimum y coordinate will be returned.
@@ -102,25 +102,30 @@ AccessibleComponent_getAccessibleAtPoint (AccessibleComponent *obj,
  *
  **/
 void
-AccessibleComponent_getExtents (AccessibleComponent *obj,
+SpiAccessibleComponent_getExtents (SpiAccessibleComponent *obj,
                                 long *x,
                                 long *y,
                                 long *width,
                                 long *height,
-                                AccessibleCoordType ctype)
+                                SpiAccessibleCoordType ctype)
 {
-  /* TODO: remove assumption that CORBA_long == long in typecast */
+  CORBA_long cx, cy, cw, ch;   
   Accessibility_Component_getExtents (*obj,
-                                     (CORBA_long *) x,
-                                     (CORBA_long *) y,
-                                     (CORBA_long *) width,
-                                     (CORBA_long *) height,
-                                     ctype,
-                                     &ev);
+                                      &cx,
+                                      &cy,
+                                      &cw,
+                                      &ch,
+                                     ctype,
+                                     &ev);
+  spi_warn_ev (&ev, "SpiAccessibleComponent_getExtents");
+  *x = (long) cx;
+  *y = (long) cy;
+  *width = (long) cw;
+  *height = (long) ch;
 }
 
 /**
- * AccessibleComponent_getPosition:
+ * SpiAccessibleComponent_getPosition:
  * @obj: a pointer to the #AccessibleComponent to query.
  * @x: a pointer to a #long into which the minimum x coordinate will be returned.
  * @y: a pointer to a #long into which the minimum y coordinate will be returned.
@@ -131,10 +136,10 @@ AccessibleComponent_getExtents (AccessibleComponent *obj,
  *
  **/
 void
-AccessibleComponent_getPosition (AccessibleComponent *obj,
+SpiAccessibleComponent_getPosition (SpiAccessibleComponent *obj,
                                  long *x,
                                  long *y,
-                                 AccessibleCoordType ctype)
+                                 SpiAccessibleCoordType ctype)
 {
   Accessibility_Component_getPosition (*obj,
                                        (CORBA_long *) x,
@@ -144,7 +149,7 @@ AccessibleComponent_getPosition (AccessibleComponent *obj,
 }
 
 /**
- * AccessibleComponent_getSize:
+ * SpiAccessibleComponent_getSize:
  * @obj: a pointer to the #AccessibleComponent to query.
  * @width: a pointer to a #long into which the x extents (width) will be returned.
  * @height: a pointer to a #long into which the y extents (height) will be returned.
@@ -153,7 +158,7 @@ AccessibleComponent_getPosition (AccessibleComponent *obj,
  *
  **/
 void
-AccessibleComponent_getSize (AccessibleComponent *obj,
+SpiAccessibleComponent_getSize (SpiAccessibleComponent *obj,
                              long *width,
                              long *height)
 {
@@ -165,7 +170,7 @@ AccessibleComponent_getSize (AccessibleComponent *obj,
 
 /* Not Yet Implemented */
 void
-AccessibleComponent_grabFocus (AccessibleComponent *obj)
+SpiAccessibleComponent_grabFocus (SpiAccessibleComponent *obj)
 {
   ;
 }