mirror of
https://github.com/brl/mutter.git
synced 2024-11-22 16:10:41 -05:00
clutter/actor: Remove depreceated macros
Nothing uses them outside of mutter, so hurry up and remove them! Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3379>
This commit is contained in:
parent
8c4d3d0516
commit
2b871765f0
@ -1458,7 +1458,7 @@ clutter_actor_real_map (ClutterActor *self)
|
||||
CLUTTER_NOTE (ACTOR, "Mapping actor '%s'",
|
||||
_clutter_actor_get_debug_name (self));
|
||||
|
||||
CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED);
|
||||
self->flags |= CLUTTER_ACTOR_MAPPED;
|
||||
|
||||
if (priv->unmapped_paint_branch_counter == 0)
|
||||
{
|
||||
@ -1599,7 +1599,7 @@ clutter_actor_real_unmap (ClutterActor *self)
|
||||
clutter_actor_unmap (iter);
|
||||
}
|
||||
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_MAPPED);
|
||||
self->flags &= ~CLUTTER_ACTOR_MAPPED;
|
||||
|
||||
if (priv->unmapped_paint_branch_counter == 0)
|
||||
{
|
||||
@ -1677,7 +1677,7 @@ clutter_actor_real_show (ClutterActor *self)
|
||||
if (clutter_actor_is_visible (self))
|
||||
return;
|
||||
|
||||
CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_VISIBLE);
|
||||
self->flags |= CLUTTER_ACTOR_VISIBLE;
|
||||
|
||||
/* we notify on the "visible" flag in the clutter_actor_show()
|
||||
* wrapper so the entire show signal emission completes first,
|
||||
@ -1815,7 +1815,7 @@ clutter_actor_real_hide (ClutterActor *self)
|
||||
if (!clutter_actor_is_visible (self))
|
||||
return;
|
||||
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_VISIBLE);
|
||||
self->flags &= ~CLUTTER_ACTOR_VISIBLE;
|
||||
|
||||
/* we notify on the "visible" flag in the clutter_actor_hide()
|
||||
* wrapper so the entire hide signal emission completes first,
|
||||
@ -1971,7 +1971,7 @@ clutter_actor_realize_internal (ClutterActor *self)
|
||||
|
||||
CLUTTER_NOTE (ACTOR, "Realizing actor '%s'", _clutter_actor_get_debug_name (self));
|
||||
|
||||
CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
|
||||
self->flags |= CLUTTER_ACTOR_REALIZED;
|
||||
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_REALIZED]);
|
||||
|
||||
g_signal_emit (self, actor_signals[REALIZE], 0);
|
||||
@ -2082,7 +2082,7 @@ unrealize_actor_after_children_cb (ClutterActor *self,
|
||||
/* We want to unset the realized flag only _after_
|
||||
* child actors are unrealized, to maintain invariants.
|
||||
*/
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
|
||||
self->flags &= ~CLUTTER_ACTOR_REALIZED;
|
||||
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_REALIZED]);
|
||||
|
||||
if (stage != NULL &&
|
||||
@ -11869,9 +11869,9 @@ clutter_actor_set_reactive (ClutterActor *actor,
|
||||
return;
|
||||
|
||||
if (reactive)
|
||||
CLUTTER_ACTOR_SET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE);
|
||||
actor->flags |= CLUTTER_ACTOR_REACTIVE;
|
||||
else
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (actor, CLUTTER_ACTOR_REACTIVE);
|
||||
actor->flags &= ~CLUTTER_ACTOR_REACTIVE;
|
||||
|
||||
g_object_notify_by_pspec (G_OBJECT (actor), obj_props[PROP_REACTIVE]);
|
||||
|
||||
|
@ -51,36 +51,6 @@ G_BEGIN_DECLS
|
||||
#define CLUTTER_IS_ACTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_ACTOR))
|
||||
#define CLUTTER_ACTOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_ACTOR, ClutterActorClass))
|
||||
|
||||
/**
|
||||
* CLUTTER_ACTOR_SET_FLAGS:
|
||||
* @a: a #ClutterActor
|
||||
* @f: the #ClutterActorFlags to set
|
||||
*
|
||||
* Sets the given flags on a #ClutterActor
|
||||
*
|
||||
* Deprecated: 1.24: Changing flags directly is heavily discouraged in
|
||||
* newly written code. #ClutterActor will take care of setting the
|
||||
* internal state.
|
||||
*/
|
||||
#define CLUTTER_ACTOR_SET_FLAGS(a,f) \
|
||||
CLUTTER_MACRO_DEPRECATED \
|
||||
(((ClutterActor*)(a))->flags |= (f))
|
||||
|
||||
/**
|
||||
* CLUTTER_ACTOR_UNSET_FLAGS:
|
||||
* @a: a #ClutterActor
|
||||
* @f: the #ClutterActorFlags to unset
|
||||
*
|
||||
* Unsets the given flags on a #ClutterActor
|
||||
*
|
||||
* Deprecated: 1.24: Changing flags directly is heavily discouraged in
|
||||
* newly written code. #ClutterActor will take care of unsetting the
|
||||
* internal state.
|
||||
*/
|
||||
#define CLUTTER_ACTOR_UNSET_FLAGS(a,f) \
|
||||
CLUTTER_MACRO_DEPRECATED \
|
||||
(((ClutterActor*)(a))->flags &= ~(f))
|
||||
|
||||
typedef struct _ClutterActorClass ClutterActorClass;
|
||||
typedef struct _ClutterActorPrivate ClutterActorPrivate;
|
||||
|
||||
|
@ -556,7 +556,7 @@ clutter_stage_realize (ClutterActor *self)
|
||||
is_realized = _clutter_stage_window_realize (priv->impl);
|
||||
|
||||
if (!is_realized)
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
|
||||
self->flags &= ~CLUTTER_ACTOR_REALIZED;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -568,7 +568,7 @@ clutter_stage_unrealize (ClutterActor *self)
|
||||
g_assert (priv->impl != NULL);
|
||||
_clutter_stage_window_unrealize (priv->impl);
|
||||
|
||||
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
|
||||
self->flags &= ~CLUTTER_ACTOR_REALIZED;
|
||||
}
|
||||
|
||||
static void
|
||||
|
Loading…
Reference in New Issue
Block a user