clutter/actor: Remove has_accessible
Instead, the users of the API can check if get_accessible returns NULL which is more correct and avoids the extra vfunc that is not even used Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3917>
This commit is contained in:
parent
f7c828f012
commit
4eb46eb3d4
3 changed files with 2 additions and 17 deletions
|
@ -134,11 +134,10 @@ clutter_actor_accessible_remove_actor (ClutterActor *container,
|
|||
g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), 0);
|
||||
|
||||
atk_parent = clutter_actor_get_accessible (container);
|
||||
atk_child = clutter_actor_get_accessible (actor);
|
||||
|
||||
if (clutter_actor_has_accessible (actor))
|
||||
if (atk_child)
|
||||
{
|
||||
atk_child = clutter_actor_get_accessible (actor);
|
||||
|
||||
g_assert (ATK_IS_OBJECT (atk_child));
|
||||
g_object_ref (atk_child);
|
||||
|
||||
|
|
|
@ -18468,17 +18468,6 @@ clutter_actor_create_texture_paint_node (ClutterActor *self,
|
|||
return node;
|
||||
}
|
||||
|
||||
gboolean
|
||||
clutter_actor_has_accessible (ClutterActor *actor)
|
||||
{
|
||||
g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), FALSE);
|
||||
|
||||
if (CLUTTER_ACTOR_GET_CLASS (actor)->has_accessible)
|
||||
return CLUTTER_ACTOR_GET_CLASS (actor)->has_accessible (actor);
|
||||
|
||||
return actor->priv->accessible != NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_actor_set_accessible:
|
||||
* @self: A #ClutterActor
|
||||
|
|
|
@ -231,7 +231,6 @@ struct _ClutterActorClass
|
|||
|
||||
gboolean (* touch_event) (ClutterActor *self,
|
||||
ClutterEvent *event);
|
||||
gboolean (* has_accessible) (ClutterActor *self);
|
||||
void (* resource_scale_changed) (ClutterActor *self);
|
||||
float (* calculate_resource_scale) (ClutterActor *self,
|
||||
int phase);
|
||||
|
@ -322,8 +321,6 @@ const gchar * clutter_actor_get_accessible_name
|
|||
CLUTTER_EXPORT
|
||||
AtkObject * clutter_actor_get_accessible (ClutterActor *self);
|
||||
CLUTTER_EXPORT
|
||||
gboolean clutter_actor_has_accessible (ClutterActor *self);
|
||||
CLUTTER_EXPORT
|
||||
void clutter_actor_set_accessible (ClutterActor *self,
|
||||
AtkObject *accessible);
|
||||
CLUTTER_EXPORT
|
||||
|
|
Loading…
Reference in a new issue