From 81bc2b4cc7c755b825f55424be261a5120f4fc0c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 29 Jun 2009 16:34:49 +0100 Subject: [PATCH] [actor] Remove unused clutter_actor_pick() The clutter_actor_pick() function just emits the ::pick signal on the actor. Nobody should be using it, since the paint() method is already context sensitive and will result in a ::pick emission by itself. The clutter_actor_pick() is just confusing things. --- clutter/clutter-actor.c | 29 ---------------------- clutter/clutter-actor.h | 2 -- clutter/clutter-deprecated.h | 2 ++ doc/reference/clutter/clutter-sections.txt | 1 - 4 files changed, 2 insertions(+), 32 deletions(-) diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index b7462fa8e..7f8b1e997 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -1383,35 +1383,6 @@ clutter_actor_real_pick (ClutterActor *self, } } -/** - * clutter_actor_pick: - * @self: A #ClutterActor - * @color: A #ClutterColor - * - * Renders a silhouette of the actor using the supplied color. Used - * internally for mapping pointer events to actors. - * - * This function should never be called directly by applications. - * - * Subclasses overiding the ClutterActor::pick() method should call - * clutter_actor_should_pick_paint() to decide whether to render their - * silhouette. Containers should always recursively call pick for - * each child. - * - * This function will emit the #ClutterActor::pick signal. - * - * Since: 0.4 - */ -void -clutter_actor_pick (ClutterActor *self, - const ClutterColor *color) -{ - g_return_if_fail (CLUTTER_IS_ACTOR (self)); - g_return_if_fail (color != NULL); - - g_signal_emit (self, actor_signals[PICK], 0, color); -} - /** * clutter_actor_should_pick_paint: * @self: A #ClutterActor diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h index 88d77a83b..44bca03aa 100644 --- a/clutter/clutter-actor.h +++ b/clutter/clutter-actor.h @@ -284,8 +284,6 @@ void clutter_actor_unrealize (ClutterActor void clutter_actor_map (ClutterActor *self); void clutter_actor_unmap (ClutterActor *self); void clutter_actor_paint (ClutterActor *self); -void clutter_actor_pick (ClutterActor *self, - const ClutterColor *color); void clutter_actor_queue_redraw (ClutterActor *self); void clutter_actor_queue_relayout (ClutterActor *self); void clutter_actor_destroy (ClutterActor *self); diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h index 69a069e41..c817b4581 100644 --- a/clutter/clutter-deprecated.h +++ b/clutter/clutter-deprecated.h @@ -198,4 +198,6 @@ #define clutter_timeline_get_progressx clutter_timeline_get_progressx_DEPRECATED_BY_clutter_timeline_get_progress +#define clutter_actor_pick clutter_actor_pick_DEPRECATED_BY_clutter_actor_paint + #endif /* CLUTTER_DEPRECATED_H */ diff --git a/doc/reference/clutter/clutter-sections.txt b/doc/reference/clutter/clutter-sections.txt index 119ae1e3c..cdc3f8450 100644 --- a/doc/reference/clutter/clutter-sections.txt +++ b/doc/reference/clutter/clutter-sections.txt @@ -282,7 +282,6 @@ clutter_actor_queue_redraw clutter_actor_queue_relayout clutter_actor_destroy clutter_actor_event -clutter_actor_pick clutter_actor_should_pick_paint clutter_actor_map clutter_actor_unmap