};
-typedef struct
-{
- GObject object;
-} _AtkIfaceImplementor;
-
static void atk_object_class_init (AtkObjectClass *klass);
static void atk_object_init (AtkObject *accessible,
AtkObjectClass *klass);
}
GType
-atk_object_iface_get_type (void)
+atk_implementor_get_type (void)
{
static GType type = 0;
{
static const GTypeInfo typeInfo =
{
- sizeof (AtkObjectIface),
+ sizeof (AtkImplementorIface),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
} ;
- type = g_type_register_static (G_TYPE_INTERFACE, "AtkObjectIface", &typeInfo, 0) ;
+ type = g_type_register_static (G_TYPE_INTERFACE, "AtkImplementorIface", &typeInfo, 0) ;
}
return type;
{
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), NULL);
+ g_return_val_if_fail (accessible != NULL, NULL);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL);
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), NULL);
+ g_return_val_if_fail (accessible != NULL, NULL);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL);
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), NULL);
+ g_return_val_if_fail (accessible != NULL, NULL);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL);
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), 0);
+ g_return_val_if_fail (accessible != NULL, 0);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), 0);
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), NULL);
+ g_return_val_if_fail (accessible != NULL, NULL);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL);
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), NULL);
+ g_return_val_if_fail (accessible != NULL, NULL);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), NULL);
klass = ATK_OBJECT_GET_CLASS (accessible);
}
AtkRole
-atk_role_register (gchar *name)
+atk_role_register (const gchar *name)
{
/* TODO: associate name with new type */
static guint type = ATK_ROLE_LAST_DEFINED;
atk_object_get_role (AtkObject *accessible) {
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), ATK_ROLE_UNKNOWN);
+ g_return_val_if_fail (accessible != NULL, ATK_ROLE_UNKNOWN);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), ATK_ROLE_UNKNOWN);
klass = ATK_OBJECT_GET_CLASS (accessible);
}
AtkStateType
-atk_state_type_register (gchar *name)
+atk_state_type_register (const gchar *name)
{
/* TODO: associate name with new type */
static guint type = ATK_STATE_LAST_DEFINED;
atk_object_get_state (AtkObject *accessible) {
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), 0);
+ g_return_val_if_fail (accessible != NULL, 0);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), 0);
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), -1);
+ g_return_val_if_fail (accessible != NULL, -1);
g_return_val_if_fail (ATK_OBJECT (accessible), -1);
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_if_fail ((accessible != NULL));
+ g_return_if_fail (accessible != NULL);
g_return_if_fail (ATK_IS_OBJECT (accessible));
- g_return_if_fail ((name != NULL));
+ g_return_if_fail (name != NULL);
klass = ATK_OBJECT_GET_CLASS (accessible);
if (klass->set_name)
{
AtkObjectClass *klass;
- g_return_if_fail ((accessible != NULL));
+ g_return_if_fail (accessible != NULL);
g_return_if_fail (ATK_IS_OBJECT (accessible));
- g_return_if_fail ((description != NULL));
+ g_return_if_fail (description != NULL);
klass = ATK_OBJECT_GET_CLASS (accessible);
if (klass->set_description)
{
AtkObjectClass *klass;
- g_return_if_fail ((accessible != NULL));
+ g_return_if_fail (accessible != NULL);
g_return_if_fail (ATK_IS_OBJECT (accessible));
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_if_fail ((accessible != NULL));
+ g_return_if_fail (accessible != NULL);
g_return_if_fail (ATK_IS_OBJECT (accessible));
klass = ATK_OBJECT_GET_CLASS (accessible);
{
AtkObjectClass *klass;
- g_return_val_if_fail ((accessible != NULL), 0);
+ g_return_val_if_fail (accessible != NULL, 0);
g_return_val_if_fail (ATK_IS_OBJECT (accessible), 0);
g_return_val_if_fail ((handler != NULL), 0);
{
AtkObjectClass *klass;
- g_return_if_fail ((accessible != NULL));
+ g_return_if_fail (accessible != NULL);
g_return_if_fail (ATK_IS_OBJECT (accessible));
klass = ATK_OBJECT_GET_CLASS (accessible);
}
AtkRelationType
-atk_relation_type_register (gchar *name)
+atk_relation_type_register (const gchar *name)
{
/* TODO: associate name with new type */
static guint type = ATK_RELATION_LAST_DEFINED;
AtkRelationType relationship)
{
AtkRelation* relation;
- g_return_val_if_fail ((target != NULL), NULL);
+ g_return_val_if_fail (target != NULL, NULL);
relation = (AtkRelation *) g_malloc (sizeof (AtkRelation));
AtkRelation *item;
gint i;
- g_return_val_if_fail ((set != NULL), FALSE);
+ g_return_val_if_fail (set != NULL, FALSE);
array_item = set->relations;
if (array_item == NULL)
return relation->target;
}
-gchar*
+G_CONST_RETURN gchar*
atk_state_mask_get_name (AtkStateMask state)
{
gint n;
}
AtkStateMask
-atk_state_mask_for_name (gchar *name)
+atk_state_mask_for_name (const gchar *name)
{
gint i;
/**
* Return a reference to an object's AtkObject implementation, if
* the object implements AtkObjectIface.
- * @object: The GObject instance which should implement #AtkObjectIface
+ * @object: The GObject instance which should implement #AtkImplementorIface
* if a non-null return value is required.
*/
AtkObject *
-atk_object_ref_accessible (AtkIfaceImplementor *object)
+atk_implementor_ref_accessible (AtkImplementor *object)
{
- AtkObjectIface *iface;
- AtkObject *accessible = NULL;
+ AtkImplementorIface *iface;
+ AtkObject *accessible = NULL;
+
+ g_return_val_if_fail (object != NULL, NULL);
+ g_return_val_if_fail (ATK_IS_IMPLEMENTOR (object), NULL);
- g_return_val_if_fail ((object != NULL), NULL);
- g_return_val_if_fail ((iface = ATK_OBJECT_GET_IFACE (object)), NULL );
+ iface = ATK_IMPLEMENTOR_GET_IFACE (object);
- if (iface != NULL) accessible = (*(iface->ref_accessible)) (object) ;
+ if (iface != NULL)
+ accessible = iface->ref_accessible (object);
g_return_val_if_fail ((accessible != NULL), NULL);
- return ATK_OBJECT (accessible) ;
+ return accessible;
}
AtkRelationSet*
static void
atk_object_real_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
AtkObject *accessible;
ATK_ROLE_LAST_DEFINED
} AtkRole;
-AtkRole atk_role_register (gchar *name);
+AtkRole atk_role_register (const gchar *name);
typedef enum
{
ATK_STATE_LAST_DEFINED
} AtkStateType;
-AtkStateType atk_state_type_register (gchar *name);
+AtkStateType atk_state_type_register (const gchar *name);
#define ATK_TYPE_OBJECT (atk_object_get_type ())
#define ATK_IS_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ATK_TYPE_OBJECT))
#define ATK_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ATK_TYPE_OBJECT, AtkObjectClass))
-#define ATK_TYPE_OBJECT_IFACE (atk_object_iface_get_type ())
-#define ATK_OBJECT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_OBJECT_IFACE, AtkObjectIface))
+#define ATK_TYPE_IMPLEMENTOR (atk_implementor_get_type ())
+#define ATK_IS_IMPLEMENTOR(obj) G_TYPE_CHECK_INSTANCE_TYPE ((obj), ATK_TYPE_IMPLEMENTOR)
+#define ATK_IMPLEMENTOR(obj) G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementor)
+#define ATK_IMPLEMENTOR_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ATK_TYPE_IMPLEMENTOR, AtkImplementorIface))
-/* Forward declarations of interface structures */
+typedef struct _AtkImplementor AtkImplementor; /* dummy typedef */
+typedef struct _AtkImplementorIface AtkImplementorIface;
-typedef struct _AtkIfaceImplementor AtkIfaceImplementor;
-typedef struct _AtkObjectIface AtkObjectIface;
+typedef struct _AtkObject AtkObject;
+typedef struct _AtkObjectClass AtkObjectClass;
+typedef struct _AtkRelation AtkRelation;
+typedef struct _AtkRelationSet AtkRelationSet;
-typedef struct _AtkActionIface AtkActionIface;
-typedef struct _AtkComponentIface AtkComponentIface;
-typedef struct _AtkEditableTextIface AtkEditableTextIface;
-typedef struct _AtkHypertextIface AtkHypertextIface;
-typedef struct _AtkImageIface AtkImageIface;
-typedef struct _AtkSelectionIface AtkSelectionIface;
-typedef struct _AtkTableIface AtkTableIface;
-typedef struct _AtkTextIface AtkTextIface;
-typedef struct _AtkValueIface AtkValueIface;
+typedef guint64 AtkStateMask;
+typedef guint64 AtkState;
-
-typedef struct _AtkObject AtkObject;
-typedef struct _AtkObjectClass AtkObjectClass;
-typedef struct _AtkRelation AtkRelation;
-typedef struct _AtkRelationSet AtkRelationSet;
-
-typedef guint64 AtkStateMask;
-typedef guint64 AtkState;
-
-#define ATK_STATE(state_enum) ((AtkStateMask)(1 << ((guint64)(state_enum)%64)))
+#define ATK_STATE(state_enum) ((AtkStateMask)(1 << ((guint64)(state_enum)%64)))
struct _AtkPropertyValues
{
GValue new_value;
};
-typedef struct _AtkPropertyValues AtkPropertyValues;
+typedef struct _AtkPropertyValues AtkPropertyValues;
/*
* For most properties the old_value field of AtkPropertyValues will
};
GType atk_object_get_type (void);
-struct _AtkObjectIface
+struct _AtkImplementorIface
{
GTypeInterface parent;
- AtkObject* (*ref_accessible) (AtkIfaceImplementor *accessible);
+ AtkObject* (*ref_accessible) (AtkImplementor *implementor);
};
-GType atk_object_iface_get_type (void);
+GType atk_implementor_get_type (void);
/*
- * This method uses the ref_accessible method in AtkObjectIface,
- * if the object's class implements AtkObjectIface.
+ * This method uses the ref_accessible method in AtkImplementorIface,
+ * if the object's class implements AtkImplementorIface.
* Otherwise it returns %NULL.
*
* IMPORTANT:
* program to unreference the object when no longer needed.
* (c.f. gtk_widget_get_accessible() where this is not the case).
*/
-AtkObject* atk_object_ref_accessible (AtkIfaceImplementor *accessible);
+AtkObject* atk_implementor_ref_accessible (AtkImplementor *implementor);
/*
* Properties directly supported by AtkObject
ATK_RELATION_LAST_DEFINED
} AtkRelationType;
-AtkRelationType atk_relation_type_register (gchar *name);
+AtkRelationType atk_relation_type_register (const gchar *name);
/*
* Create a new relation for the specified key and the specified list
*/
GArray* atk_relation_get_target (AtkRelation *relation);
-gchar* atk_state_mask_get_name (AtkStateMask state);
-AtkStateMask atk_state_mask_for_name (gchar *name);
+G_CONST_RETURN gchar* atk_state_mask_get_name (AtkStateMask state);
+AtkStateMask atk_state_mask_for_name (const gchar *name);
#ifdef __cplusplus
}