Added methods for Component Layer and MDI Z-Order information (see

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

diff --git a/cspi/spi_selection.c b/cspi/spi_selection.c
index 606edda..dd663ee 100644 (file)
--- a/cspi/spi_selection.c
+++ b/cspi/spi_selection.c
@@ -1,6 +1,8 @@
+#include <cspi/spi-private.h>
+
 /**
  * AccessibleSelection_ref:
- * @obj: a pointer to the #AccessibleSelecion implementor on which to operate.
+ * @obj: a pointer to the #AccessibleSelection implementor on which to operate.
  *
  * Increment the reference count for an #AccessibleSelection object.
  *
@@ -10,7 +12,7 @@
 int
 AccessibleSelection_ref (AccessibleSelection *obj)
 {
-  Accessibility_Selection_ref (*obj, &ev);
+  cspi_object_ref (obj);
   return 0;
 }
 
@@ -27,7 +29,7 @@ AccessibleSelection_ref (AccessibleSelection *obj)
 int
 AccessibleSelection_unref (AccessibleSelection *obj)
 {
-  Accessibility_Selection_unref (*obj, &ev);
+  cspi_object_unref (obj);
   return 0;
 }
 
@@ -48,7 +50,7 @@ long
 AccessibleSelection_getNSelectedChildren (AccessibleSelection *obj)
 {
   return (long)
-    Accessibility_Selection__get_nSelectedChildren (*obj, &ev);
+    Accessibility_Selection__get_nSelectedChildren (CSPI_OBJREF (obj), cspi_ev ());
 }
 
 
@@ -74,11 +76,11 @@ AccessibleSelection_getSelectedChild (AccessibleSelection *obj,
                                       long int selectedChildIndex)
 {
   Accessibility_Accessible child = 
-    Accessibility_Selection_getSelectedChild (*obj,
-                                             (CORBA_long) selectedChildIndex, &ev);
-  spi_warn_ev (&ev, "getSelectedChild");
+    Accessibility_Selection_getSelectedChild (CSPI_OBJREF (obj),
+                                             (CORBA_long) selectedChildIndex, cspi_ev ());
+  cspi_warn_ev (cspi_ev (), "getSelectedChild");
 
-  return (Accessible *) ((CORBA_Object_is_nil (child, &ev)) ? NULL : Obj_Add (child));
+  return (Accessible *) cspi_object_add (child);
 }
 
 /**
@@ -95,13 +97,13 @@ AccessibleSelection_getSelectedChild (AccessibleSelection *obj,
  * Returns: #TRUE if the child was successfully selected, #FALSE otherwise.
  *
  **/
-boolean
+SPIBoolean
 AccessibleSelection_selectChild (AccessibleSelection *obj,
                                  long int childIndex)
 {
-  return (boolean)
-    Accessibility_Selection_selectChild (*obj,
-                                        (CORBA_long) childIndex, &ev);
+  return (SPIBoolean)
+    Accessibility_Selection_selectChild (CSPI_OBJREF (obj),
+                                        (CORBA_long) childIndex, cspi_ev ());
 }
 
 
@@ -120,12 +122,12 @@ AccessibleSelection_selectChild (AccessibleSelection *obj,
  * Returns: #TRUE if the child was successfully deselected, #FALSE otherwise.
  *
  **/
-boolean
+SPIBoolean
 AccessibleSelection_deselectSelectedChild (AccessibleSelection *obj,
                                            long int selectedChildIndex)
 {
-  Accessibility_Selection_deselectSelectedChild (*obj,
-                                                (CORBA_long) selectedChildIndex, &ev);
+  return Accessibility_Selection_deselectSelectedChild (
+         CSPI_OBJREF (obj), (CORBA_long) selectedChildIndex, cspi_ev ());
 }
 
 
@@ -143,13 +145,13 @@ AccessibleSelection_deselectSelectedChild (AccessibleSelection *obj,
  *          #FALSE otherwise.
  *
  **/
-boolean
+SPIBoolean
 AccessibleSelection_isChildSelected (AccessibleSelection *obj,
                                      long int childIndex)
 {
-  return (boolean)
-    Accessibility_Selection_isChildSelected (*obj,
-                                            (CORBA_long) childIndex, &ev);
+  return (SPIBoolean)
+    Accessibility_Selection_isChildSelected (CSPI_OBJREF (obj),
+                                            (CORBA_long) childIndex, cspi_ev ());
 }
 
 
@@ -164,10 +166,10 @@ AccessibleSelection_isChildSelected (AccessibleSelection *obj,
  * Returns: #TRUE if successful, #FALSE otherwise.
  *
  **/
-boolean
+SPIBoolean
 AccessibleSelection_selectAll (AccessibleSelection *obj)
 {
-  Accessibility_Selection_selectAll (*obj, &ev);
+  Accessibility_Selection_selectAll (CSPI_OBJREF (obj), cspi_ev ());
   return TRUE; /* TODO: change the bonobo method to return boolean */
 }
 
@@ -184,7 +186,7 @@ AccessibleSelection_selectAll (AccessibleSelection *obj)
 void
 AccessibleSelection_clearSelection (AccessibleSelection *obj)
 {
-  Accessibility_Selection_clearSelection (*obj, &ev);
+  Accessibility_Selection_clearSelection (CSPI_OBJREF (obj), cspi_ev ());
 }