diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index ce699b50f..5a66c16ae 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -6289,6 +6289,9 @@ clutter_actor_allocate (ClutterActor *self, * size, in pixels. This means the untransformed actor will have the * given geometry. This is the same as calling clutter_actor_set_position() * and clutter_actor_set_size(). + * + * Deprecated: 1.10: Use clutter_actor_set_position() and + * clutter_actor_set_size() instead. */ void clutter_actor_set_geometry (ClutterActor *self, @@ -6305,12 +6308,16 @@ clutter_actor_set_geometry (ClutterActor *self, /** * clutter_actor_get_geometry: * @self: A #ClutterActor - * @geometry: (out): A location to store actors #ClutterGeometry + * @geometry: (out caller-allocates): A location to store actors #ClutterGeometry * * Gets the size and position of an actor relative to its parent * actor. This is the same as calling clutter_actor_get_position() and * clutter_actor_get_size(). It tries to "do what you mean" and get the * requested size and position if the actor's allocation is invalid. + * + * Deprecated: 1.10: Use clutter_actor_get_position() and + * clutter_actor_get_size(), or clutter_actor_get_allocation_geometry() + * instead. */ void clutter_actor_get_geometry (ClutterActor *self, diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h index 41ea9ab36..7adabf4ae 100644 --- a/clutter/clutter-actor.h +++ b/clutter/clutter-actor.h @@ -326,10 +326,6 @@ void clutter_actor_get_allocation_geometry (ClutterActor void clutter_actor_get_allocation_vertices (ClutterActor *self, ClutterActor *ancestor, ClutterVertex verts[]); -void clutter_actor_set_geometry (ClutterActor *self, - const ClutterGeometry *geometry); -void clutter_actor_get_geometry (ClutterActor *self, - ClutterGeometry *geometry); void clutter_actor_set_size (ClutterActor *self, gfloat width, gfloat height); diff --git a/clutter/deprecated/clutter-actor.h b/clutter/deprecated/clutter-actor.h index 9d9f001fa..c752e51bc 100644 --- a/clutter/deprecated/clutter-actor.h +++ b/clutter/deprecated/clutter-actor.h @@ -6,10 +6,17 @@ G_BEGIN_DECLS CLUTTER_DEPRECATED -guint32 clutter_actor_get_gid (ClutterActor *self); +void clutter_actor_set_geometry (ClutterActor *self, + const ClutterGeometry *geometry); + +CLUTTER_DEPRECATED_FOR(clutter_actor_get_allocation_geometry) +void clutter_actor_get_geometry (ClutterActor *self, + ClutterGeometry *geometry); +CLUTTER_DEPRECATED +guint32 clutter_actor_get_gid (ClutterActor *self); CLUTTER_DEPRECATED -ClutterActor * clutter_get_actor_by_gid (guint32 id_); +ClutterActor * clutter_get_actor_by_gid (guint32 id_); G_END_DECLS