2001-12-10 Michael Meeks <michael@ximian.com>

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

diff --git a/cspi/spi_hypertext.c b/cspi/spi_hypertext.c
index c9a65ff..23c86f5 100644 (file)
--- a/cspi/spi_hypertext.c
+++ b/cspi/spi_hypertext.c
@@ -1,3 +1,5 @@
+#include <cspi/spi-private.h>
+
 /**
  * AccessibleHypertext_ref:
  * @obj: a pointer to the #AccessibleHypertext object on which to operate.
@@ -9,14 +11,12 @@
  * Returns: (no return code implemented yet).
  *
  **/
-int
+void
 AccessibleHypertext_ref (AccessibleHypertext *obj)
 {
-  Accessibility_Hypertext_ref (*obj, &ev);
-  return 0;
+  cspi_object_ref (obj);
 }
 
-
 /**
  * AccessibleHypertext_unref:
  * @obj: a pointer to the #AccessibleHypertext object on which to operate.
@@ -28,15 +28,12 @@ AccessibleHypertext_ref (AccessibleHypertext *obj)
  * Returns: (no return code implemented yet).
  *
  **/
-int
+void
 AccessibleHypertext_unref (AccessibleHypertext *obj)
 {
-  Accessibility_Hypertext_unref (*obj, &ev);
-  return 0;
+  cspi_object_unref (obj);
 }
 
-
-
 /**
  * AccessibleHypertext_getNLinks:
  * @obj: a pointer to the #AccessibleHypertext implementor on which to operate.
@@ -55,7 +52,7 @@ long
 AccessibleHypertext_getNLinks (AccessibleHypertext *obj)
 {
   return (long)
-    Accessibility_Hypertext_getNLinks (*obj, &ev);
+    Accessibility_Hypertext_getNLinks (CSPI_OBJREF (obj), cspi_ev ());
 }
 
 
@@ -74,8 +71,8 @@ AccessibleHypertext_getLink (AccessibleHypertext *obj,
                              long int linkIndex)
 {
   return (AccessibleHyperlink *)
-    Accessibility_Hypertext_getLink (*obj,
-                                    (CORBA_long) linkIndex, &ev);
+    Accessibility_Hypertext_getLink (CSPI_OBJREF (obj),
+                                    (CORBA_long) linkIndex, cspi_ev ());
 }
 
 
@@ -97,8 +94,8 @@ AccessibleHypertext_getLinkIndex (AccessibleHypertext *obj,
                                   long int characterOffset)
 {
   return (long)
-    Accessibility_Hypertext_getLinkIndex (*obj,
-                                         (CORBA_long) characterOffset, &ev);
+    Accessibility_Hypertext_getLinkIndex (CSPI_OBJREF (obj),
+                                         (CORBA_long) characterOffset, cspi_ev ());
 }