-#define MAX_ROLES 100
+#include <stdlib.h> /* for malloc */
+#include <cspi/spi-private.h>
-static char *role_names [MAX_ROLES] =
+static const char *role_names [] =
{
- " ",
- "accelerator label",
+ "<invalid>",
"alert",
- "animation",
- "arrow",
- "calendar",
"canvas",
"check box",
- "menu item",
"color chooser",
"column header",
"combo box",
- "date editor",
"desktop icon",
"desktop frame",
- "dial",
"dialog",
"directory pane",
- "drawing area",
"file chooser",
"filler",
- "font chooser",
+ "focus traversable",
"frame",
"glass pane",
"HTML container",
"icon",
- "image",
"internal frame",
"label",
"layered pane",
"progress bar",
"pushbutton",
"radiobutton",
- "radio menu item",
"root pane",
"row header",
"scrollbar",
"separator",
"slider",
"split pane",
- "spin button",
- "status bar",
"table",
"table cell",
"table column header",
"table row header",
- "tearoff menu item",
"text",
"toggle button",
"toolbar",
"tooltip",
"tree",
- " ",
+ "<unknown>",
"viewport",
"window",
+
+ /* These have no equivalent AccessibleRole enum values */
+ "accelerator label",
+ "animation",
+ "arrow",
+ "calendar",
+ "menu item",
+ "date editor",
+ "dial",
+ "drawing area",
+ "font chooser",
+ "image",
+ "radio menu item",
+ "tearoff menu item",
+ "spin button",
+ "status bar",
};
+#define MAX_ROLES (sizeof (role_names) / sizeof (char *))
+
/**
* AccessibleRole_getName:
* @role: an #AccessibleRole object to query.
*
* Returns: a localizable string name for an #AccessibleRole enumerated type.
**/
-char*
+const char *
AccessibleRole_getName (AccessibleRole role)
{
- if (role < MAX_ROLES) return role_names [(int) role];
- else return "";
+ if (role < MAX_ROLES)
+ {
+ return role_names [(int) role];
+ }
+ else
+ {
+ return "";
+ }
+ /*
+ * TODO: replace with implementation linked to ATK, which
+ * now supports Role/Name mapping
+ */
}
-
-
/**
* Accessible_ref:
* @obj: a pointer to the #Accessible object on which to operate.
* Returns: (no return code implemented yet).
*
**/
-int
+void
Accessible_ref (Accessible *obj)
{
- Accessibility_Accessible_ref (*obj, &ev);
- spi_check_ev (&ev, "ref");
- return 0;
+ cspi_object_ref (obj);
}
-
/**
* Accessible_unref:
* @obj: a pointer to the #Accessible object on which to operate.
*
* Decrement the reference count for an #Accessible object.
*
- * Returns: (no return code implemented yet).
- *
**/
-int
+void
Accessible_unref (Accessible *obj)
{
- Accessibility_Accessible_unref (*obj, &ev);
- spi_check_ev (&ev, "unref");
- return 0;
+ cspi_object_unref (obj);
}
/**
* Get the name of an #Accessible object.
*
* Returns: a UTF-8 string indicating the name of the #Accessible object.
- *
+ * or NULL on exception
**/
char *
Accessible_getName (Accessible *obj)
{
- char *retval =
- (char *)
- Accessibility_Accessible__get_name (*obj, &ev);
- spi_check_ev (&ev, "getName");
+ char *retval;
+
+ cspi_return_val_if_fail (obj != NULL, NULL);
+
+ retval = (char *)
+ Accessibility_Accessible__get_name (CSPI_OBJREF (obj), cspi_ev ());
+
+ cspi_return_val_if_ev ("getName", NULL);
+
return retval;
}
* Get the description of an #Accessible object.
*
* Returns: a UTF-8 string describing the #Accessible object.
- *
+ * or NULL on exception
**/
char *
Accessible_getDescription (Accessible *obj)
{
- char *retval = (char *)
- Accessibility_Accessible__get_description (*obj, &ev);
- spi_check_ev (&ev, "getDescription");
+ char *retval;
+
+ cspi_return_val_if_fail (obj != NULL, NULL);
+
+ retval = (char *)
+ Accessibility_Accessible__get_description (CSPI_OBJREF (obj),
+ cspi_ev ());
+
+ cspi_return_val_if_ev ("getDescription", NULL);
+
return retval;
}
Accessible *
Accessible_getParent (Accessible *obj)
{
- Accessible *retval =
- Obj_Add (Accessibility_Accessible__get_parent (*obj, &ev));
- spi_check_ev (&ev, "getParent");
+ Accessible *retval;
+
+ cspi_return_val_if_fail (obj != NULL, NULL);
+
+ retval = cspi_object_add (
+ Accessibility_Accessible__get_parent (CSPI_OBJREF (obj),
+ cspi_ev ()));
+
+ cspi_return_val_if_ev ("getParent", NULL);
+
return retval;
}
* Get the number of children contained by an #Accessible object.
*
* Returns: a #long indicating the number of #Accessible children
- * contained by an #Accessible object.
+ * contained by an #Accessible object. or -1 on exception
*
**/
long
Accessible_getChildCount (Accessible *obj)
{
- long retval = (long) Accessibility_Accessible__get_childCount (*obj, &ev);
- spi_check_ev (&ev, "getChildCount");
+ long retval;
+
+ cspi_return_val_if_fail (obj != NULL, -1);
+
+ retval = (long)
+ Accessibility_Accessible__get_childCount (CSPI_OBJREF (obj),
+ cspi_ev ());
+
+ cspi_return_val_if_ev ("getChildCount", -1);
+
return retval;
}
* Get the #Accessible child of an #Accessible object at a given index.
*
* Returns: a pointer to the #Accessible child object at index
- * @childIndex.
- *
+ * @childIndex. or NULL on exception
**/
Accessible *
Accessible_getChildAtIndex (Accessible *obj,
- long int childIndex)
+ long int childIndex)
{
- Accessible *retval = Obj_Add (Accessibility_Accessible_getChildAtIndex (*obj, childIndex, &ev));
- spi_check_ev (&ev, "getChildAtIndex");
+ Accessible *retval;
+
+ cspi_return_val_if_fail (obj != NULL, NULL);
+
+ retval = cspi_object_add (
+ Accessibility_Accessible_getChildAtIndex (CSPI_OBJREF (obj),
+ childIndex, cspi_ev ()));
+
return retval;
}
*
* Returns: a #long indicating the index of the #Accessible object
* in its parent (i.e. containing) #Accessible instance,
- * or -1 if @obj has no containing parent.
- *
+ * or -1 if @obj has no containing parent or on exception.
**/
long
Accessible_getIndexInParent (Accessible *obj)
{
- long retval = (long) Accessibility_Accessible_getIndexInParent (*obj, &ev);
- spi_check_ev (&ev, "getIndexInParent");
+ long retval;
+
+ cspi_return_val_if_fail (obj != NULL, -1);
+
+ retval = (long)
+ Accessibility_Accessible_getIndexInParent (CSPI_OBJREF (obj), cspi_ev ());
+
+ cspi_return_val_if_ev ("getIndexInparent", -1);
return retval;
}
* Get the set of #AccessibleRelation objects which describe this #Accessible object's
* relationships with other #Accessible objects.
*
- * Returns: an array of #AccessibleRelation pointers.
- *
+ * Returns: an array of #AccessibleRelation pointers. or NULL on exception
**/
AccessibleRelation **
Accessible_getRelationSet (Accessible *obj)
{
- AccessibleRelation **relations;
- int n_relations;
int i;
- Accessibility_RelationSet *relation_set =
- Accessibility_Accessible_getRelationSet (*obj, &ev);
+ int n_relations;
+ AccessibleRelation **relations;
+ Accessibility_RelationSet *relation_set;
+
+ cspi_return_val_if_fail (obj != NULL, NULL);
+
+ relation_set =
+ Accessibility_Accessible_getRelationSet (CSPI_OBJREF (obj), cspi_ev ());
+
+ cspi_return_val_if_ev ("getRelationSet", NULL);
/* this looks hack-ish, but it's based on the CORBA C bindings spec */
n_relations = relation_set->_length;
relations = malloc (sizeof (AccessibleRelation *) * n_relations);
- for (i=0; i<n_relations; ++i)
+ for (i = 0; i < n_relations; ++i)
{
- relations[i] = Obj_Add (relation_set->_buffer[i]);
+ relations[i] = cspi_object_add (CORBA_Object_duplicate (
+ relation_set->_buffer[i], cspi_ev ()));
}
relations[i] = CORBA_OBJECT_NIL;
+ CORBA_free (relation_set);
+
return relations;
}
* Returns: a UTF-8 string indicating the UI role of the #Accessible object.
*
**/
-char *
+const char *
Accessible_getRole (Accessible *obj)
{
- char *retval = AccessibleRole_getName (
- Accessibility_Accessible_getRole (*obj, &ev));
- spi_check_ev (&ev, "getRole");
+ const char *retval;
+
+ cspi_return_val_if_fail (obj != NULL, NULL);
+
+ retval = AccessibleRole_getName (
+ Accessibility_Accessible_getRole (CSPI_OBJREF (obj), cspi_ev ()));
+
+ cspi_return_val_if_ev ("getRole", NULL);
+
return retval;
}
* Returns: #TRUE if @obj implements the #AccessibleAction interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isAction (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Action:1.0",
- &ev);
- spi_warn_ev (&ev, "isAction");
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Action:1.0");
+}
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+/**
+ * Accessible_isApplication:
+ * @obj: a pointer to the #Accessible instance to query.
+ *
+ * Query whether the specified #Accessible implements #AccessibleApplication.
+ *
+ * Returns: #TRUE if @obj implements the #AccessibleApplication interface,
+ * #FALSE otherwise.
+ **/
+SPIBoolean
+Accessible_isApplication (Accessible *obj)
+{
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Application:1.0");
}
/**
* Returns: #TRUE if @obj implements the #AccessibleComponent interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isComponent (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Component:1.0",
- &ev);
- spi_warn_ev (&ev, "isComponent");
-
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Component:1.0");
}
/**
* Returns: #TRUE if @obj implements the #AccessibleEditableText interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isEditableText (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/EditableText:1.0",
- &ev);
- spi_check_ev (&ev, "isEditableText");
-
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/EditableText:1.0");
}
/**
* Returns: #TRUE if @obj implements the #AccessibleHypertext interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isHypertext (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Hypertext:1.0",
- &ev);
-
- spi_check_ev (&ev, "isHypertext");
-
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Hypertext:1.0");
}
/**
* Returns: #TRUE if @obj implements the #AccessibleImage interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isImage (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Image:1.0",
- &ev);
- spi_check_ev (&ev, "isImage");
-
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Image:1.0");
}
/**
* Returns: #TRUE if @obj implements the #AccessibleSelection interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isSelection (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Selection:1.0",
- &ev);
- spi_warn_ev (&ev, "isSelection");
-
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
-
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Selection:1.0");
}
/**
* Returns: #TRUE if @obj implements the #AccessibleTable interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isTable (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Table:1.0",
- &ev);
- spi_check_ev (&ev, "isTable");
-
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
-
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Table:1.0");
}
/**
* Returns: #TRUE if @obj implements the #AccessibleText interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isText (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Text:1.0",
- &ev);
- spi_warn_ev (&ev, "isText");
-
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Text:1.0");
}
/**
* Returns: #TRUE if @obj implements the #AccessibleValue interface,
* #FALSE otherwise.
**/
-boolean
+SPIBoolean
Accessible_isValue (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Value:1.0",
- &ev);
- spi_check_ev (&ev, "isValue");
+ return cspi_accessible_is_a (obj,
+ "IDL:Accessibility/Value:1.0");
+}
- return (CORBA_Object_is_nil (iface, &ev)) ? FALSE : TRUE;
+/**
+ * Accessible_getApplication:
+ * @obj: a pointer to the #Accessible instance to query.
+ *
+ * Get the #AccessibleApplication interface for an #Accessible.
+ *
+ * Returns: a pointer to an #AccessibleApplication interface instance, or
+ * NULL if @obj does not implement #AccessibleApplication.
+ **/
+AccessibleApplication *
+Accessible_getApplication (Accessible *obj)
+{
+ return (AccessibleApplication *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Application:1.0");
}
/**
AccessibleAction *
Accessible_getAction (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Action:1.0",
- &ev);
- spi_check_ev (&ev, "getAction");
-
- return (AccessibleAction *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleAction *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Action:1.0");
}
/**
AccessibleComponent *
Accessible_getComponent (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Component:1.0",
- &ev);
- spi_check_ev (&ev, "getComponent");
-
- return (AccessibleComponent *) ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleComponent *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Component:1.0");
}
/**
AccessibleEditableText *
Accessible_getEditableText (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/EditableText:1.0",
- &ev);
- spi_check_ev (&ev, "getEditableText");
-
- return (AccessibleEditableText *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleEditableText *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/EditableText:1.0");
}
AccessibleHypertext *
Accessible_getHypertext (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Hypertext:1.0",
- &ev);
- spi_check_ev (&ev, "getHypertext");
-
- return (AccessibleHypertext *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleHypertext *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Hypertext:1.0");
}
AccessibleImage *
Accessible_getImage (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Image:1.0",
- &ev);
- spi_check_ev (&ev, "getImage");
-
- return (AccessibleImage *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleImage *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Image:1.0");
}
AccessibleSelection *
Accessible_getSelection (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Selection:1.0",
- &ev);
- spi_warn_ev (&ev, "getSelection");
-
- return (AccessibleSelection *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleSelection *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Selection:1.0");
}
AccessibleTable *
Accessible_getTable (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Table:1.0",
- &ev);
- spi_check_ev (&ev, "getTable");
-
- return (AccessibleTable *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleTable *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Table:1.0");
}
/**
AccessibleText *
Accessible_getText (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Text:1.0",
- &ev);
-
- spi_check_ev (&ev, "getText");
-
- return (AccessibleText *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleText *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Text:1.0");
}
AccessibleValue *
Accessible_getValue (Accessible *obj)
{
- Bonobo_Unknown iface =
- Accessibility_Accessible_queryInterface (*obj,
- "IDL:Accessibility/Value:1.0",
- &ev);
- return (AccessibleValue *)
- ((CORBA_Object_is_nil (iface, &ev)) ? 0 : Obj_Add (iface));
+ return (AccessibleValue *) Accessible_queryInterface (
+ obj, "IDL:Accessibility/Value:1.0");
}
*
**/
GenericInterface *
-Accessible_queryInterface (Accessible *obj, char *interface_name)
+Accessible_queryInterface (Accessible *obj,
+ const char *interface_name)
{
- GenericInterface iface;
- iface = Accessibility_Accessible_queryInterface (*obj,
- interface_name,
- &ev);
- return (iface != NULL) ? Obj_Add (iface) : NULL;
+ Bonobo_Unknown iface;
+
+ if (!obj)
+ {
+ return NULL;
+ }
+
+ iface = Accessibility_Accessible_queryInterface (CSPI_OBJREF (obj),
+ interface_name,
+ cspi_ev ());
+
+
+ cspi_return_val_if_ev ("queryInterface", NULL);
+
+ /*
+ * FIXME: we need to be fairly sure that references are going
+ * to mach up if we are going to expose QueryInterface, ie. we
+ * can't allow people to do:
+ * b = a.qi ("b"); b.unref, b.unref to release a's reference.
+ * this should be no real problem though for this level of API
+ * user.
+ */
+
+ return cspi_object_add (iface);
}
* Increment the reference count for an #AccessibleRelation object.
*
* Returns: (no return code implemented yet).
- *
**/
-int
+void
AccessibleRelation_ref (AccessibleRelation *obj)
{
- Accessibility_Relation_ref (*obj, &ev);
- spi_check_ev (&ev, "ref");
- return 0;
+ cspi_object_ref (obj);
}
/**
* Decrement the reference count for an #AccessibleRelation object.
*
* Returns: (no return code implemented yet).
- *
**/
-int
+void
AccessibleRelation_unref (AccessibleRelation *obj)
{
- Accessibility_Relation_unref (*obj, &ev);
- spi_check_ev (&ev, "unref");
- return 0;
+ cspi_object_unref (obj);
}
/**
AccessibleRelationType
AccessibleRelation_getRelationType (AccessibleRelation *obj)
{
+ cspi_return_val_if_fail (obj != NULL, -1);
return 0;
}
int
AccessibleRelation_getNTargets (AccessibleRelation *obj)
{
+ cspi_return_val_if_fail (obj != NULL, -1);
return 0;
}
Accessible *
AccessibleRelation_getTarget (AccessibleRelation *obj, int i)
{
+ cspi_return_val_if_fail (obj != NULL, NULL);
return NULL;
}
* Returns: (no return code implemented yet).
*
**/
-int
+void
AccessibleStateSet_ref (AccessibleStateSet *obj)
{
-/* Accessibility_StateSet_ref (*obj, &ev); */
- spi_check_ev (&ev, "ref");
- return 0;
+ cspi_object_ref (obj);
}
/**
* Returns: (no return code implemented yet).
*
**/
-int
+void
AccessibleStateSet_unref (AccessibleStateSet *obj)
{
-/* Accessibility_StateSet_unref (*obj, &ev); */
- spi_check_ev (&ev, "unref");
- return 0;
+ cspi_object_unref (obj);
}
-
/**
* AccessibleStateSet_contains:
* @obj: a pointer to the #AccessibleStateSet object on which to operate.
* otherwise #FALSE.
*
**/
-boolean
+SPIBoolean
AccessibleStateSet_contains (AccessibleStateSet *obj,
AccessibleState state)
{
- CORBA_boolean retval = Accessibility_StateSet_contains (*obj, state, &ev);
- spi_check_ev (&ev, "contains");
- return (boolean) retval;
+ CORBA_boolean retval;
+
+ cspi_return_val_if_fail (obj != NULL, FALSE);
+
+ retval = Accessibility_StateSet_contains (CSPI_OBJREF (obj),
+ state, cspi_ev ());
+
+ cspi_return_val_if_ev ("contains", FALSE);
+
+ return (SPIBoolean) retval;
}
/**
AccessibleStateSet_add (AccessibleStateSet *obj,
AccessibleState state)
{
- Accessibility_StateSet_add (*obj, state, &ev);
- spi_check_ev (&ev, "contains");
-}
+ cspi_return_if_fail (obj != NULL);
+ Accessibility_StateSet_add (CSPI_OBJREF (obj), state, cspi_ev ());
+ cspi_check_ev ("add");
+}
/**
* AccessibleStateSet_remove:
AccessibleStateSet_remove (AccessibleStateSet *obj,
AccessibleState state)
{
- Accessibility_StateSet_remove (*obj, state, &ev);
- spi_check_ev (&ev, "contains");
+ cspi_return_if_fail (obj != NULL);
+
+ Accessibility_StateSet_remove (CSPI_OBJREF (obj), state, cspi_ev ());
+ cspi_check_ev ("remove");
}
/**
* otherwise #FALSE.
*
**/
-boolean
+SPIBoolean
AccessibleStateSet_equals (AccessibleStateSet *obj,
AccessibleStateSet *obj2)
{
- return Accessibility_StateSet_equals (*obj, *obj2, &ev);
+ if (obj == obj2)
+ {
+ return TRUE;
+ }
+
+ cspi_return_val_if_fail (obj != NULL, FALSE);
+ cspi_return_val_if_fail (obj2 != NULL, FALSE);
+
+ return Accessibility_StateSet_equals (CSPI_OBJREF (obj),
+ CSPI_OBJREF (obj2), cspi_ev ());
}
/**
* AccessibleStateSet_compare:
* @obj: a pointer to the first #AccessibleStateSet object on which to operate.
* @obj2: a pointer to the second #AccessibleStateSet object on which to operate.
- * @differenceSet: a pointer to an array of #AccessibleStates, which is set when the
- * fuction returns to point to an array of states representing the states which
- * the two state sets do not have in common.
*
* Determine the differences between two instances of #AccessibleStateSet.
+ * Not Yet Implemented.
*.
* @see AccessibleStateSet_equals().
*
* the two sets but not the other.
*
**/
-void
+AccessibleStateSet *
AccessibleStateSet_compare (AccessibleStateSet *obj,
- AccessibleStateSet *obj2,
- AccessibleStateSet **differenceSet);
-
+ AccessibleStateSet *obj2)
+{
+ cspi_return_val_if_fail (obj != NULL, NULL);
+ cspi_return_val_if_fail (obj2 != NULL, NULL);
+ return NULL;
+}
/**
* AccessibleStateSet_isEmpty:
* otherwise #FALSE.
*
**/
-boolean
+SPIBoolean
AccessibleStateSet_isEmpty (AccessibleStateSet *obj)
{
+ cspi_return_val_if_fail (obj != NULL, FALSE);
return TRUE;
- /* return Accessibility_StateSet_isEmpty (*obj, &ev);*/
+ /* return Accessibility_StateSet_isEmpty (CSPI_OBJREF (obj), cspi_ev ());*/
}
-
-
projects / platform / core / uifw / at-spi2-atk.git / blobdiff