From f41061b8dfbe972bbd58d802b4191cdf86a3c4b4 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 3 Jan 2012 14:36:32 +0000 Subject: [PATCH] actor: Deprecated push/pop internal methods The concept of "internal child" only meant anything when we had a separate API for containers and actors. Now that we plugged that particular hole, we can drop all the hacks we used to have in place to work around its design limitations. --- clutter/clutter-actor.c | 12 +++++++++++- clutter/clutter-actor.h | 3 --- clutter/deprecated/clutter-actor.h | 6 ++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index b56b18611..d21d36222 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -13294,6 +13294,11 @@ clutter_actor_get_text_direction (ClutterActor *self) * one must by followed by a clutter_actor_pop_internal() call. * * Since: 1.2 + * + * Deprecated: 1.10: All children of an actor are accessible through + * the #ClutterActor API, and #ClutterActor implements the + * #ClutterContainer interface, so this function is only useful + * for legacy containers overriding the default implementation. */ void clutter_actor_push_internal (ClutterActor *self) @@ -13307,9 +13312,14 @@ clutter_actor_push_internal (ClutterActor *self) * clutter_actor_pop_internal: * @self: a #ClutterActor * - * Disables the effects of clutter_actor_push_internal() + * Disables the effects of clutter_actor_push_internal(). * * Since: 1.2 + * + * Deprecated: 1.10: All children of an actor are accessible through + * the #ClutterActor API. This function is only useful for legacy + * containers overriding the default implementation of the + * #ClutterContainer interface. */ void clutter_actor_pop_internal (ClutterActor *self) diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h index 49beb2a23..2ff753e82 100644 --- a/clutter/clutter-actor.h +++ b/clutter/clutter-actor.h @@ -483,9 +483,6 @@ void clutter_actor_set_child_at_index (ClutterActor ClutterActor *child, gint index_); -void clutter_actor_push_internal (ClutterActor *self); -void clutter_actor_pop_internal (ClutterActor *self); - /* Transformations */ gboolean clutter_actor_is_rotated (ClutterActor *self); gboolean clutter_actor_is_scaled (ClutterActor *self); diff --git a/clutter/deprecated/clutter-actor.h b/clutter/deprecated/clutter-actor.h index d340d072f..545e7abb1 100644 --- a/clutter/deprecated/clutter-actor.h +++ b/clutter/deprecated/clutter-actor.h @@ -71,6 +71,12 @@ void clutter_actor_raise_top (ClutterActor *self); CLUTTER_DEPRECATED_FOR(clutter_actor_set_child_below_sibling() with NULL sibling) void clutter_actor_lower_bottom (ClutterActor *self); +CLUTTER_DEPRECATED +void clutter_actor_push_internal (ClutterActor *self); + +CLUTTER_DEPRECATED +void clutter_actor_pop_internal (ClutterActor *self); + G_END_DECLS #endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */