From 33846dcf4df7443964150d6afe64a165adecc5e6 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 10 Oct 2011 15:48:43 +0100 Subject: [PATCH] Deprecate clutter_redraw() It's just a badly named proxy to clutter_stage_ensure_redraw(). --- clutter/clutter-main.c | 4 +++- clutter/clutter-main.h | 5 ++++- tests/interactive/test-stage-read-pixels.c | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c index 4bb150b93..7ef9edb7e 100644 --- a/clutter/clutter-main.c +++ b/clutter/clutter-main.c @@ -258,6 +258,8 @@ clutter_get_accessibility_enabled (void) * * This function should only be used by libraries integrating Clutter from * within another toolkit. + * + * Deprecated: 1.10: Use clutter_stage_ensure_redraw() instead. */ void clutter_redraw (ClutterStage *stage) @@ -2299,7 +2301,7 @@ _clutter_process_event_details (ClutterActor *stage, } } -/** +/* * _clutter_process_event * @event: a #ClutterEvent. * diff --git a/clutter/clutter-main.h b/clutter/clutter-main.h index a99a69400..3ddc26387 100644 --- a/clutter/clutter-main.h +++ b/clutter/clutter-main.h @@ -96,7 +96,10 @@ void clutter_main (void); void clutter_main_quit (void); gint clutter_main_level (void); -void clutter_redraw (ClutterStage *stage); +#ifndef CLUTTER_DISABLE_DEPRECATED +void clutter_redraw (ClutterStage *stage) + G_GNUC_DEPRECATED_FOR (clutter_stage_ensure_redraw); +#endif void clutter_do_event (ClutterEvent *event); diff --git a/tests/interactive/test-stage-read-pixels.c b/tests/interactive/test-stage-read-pixels.c index 783b22696..b49afc62e 100644 --- a/tests/interactive/test-stage-read-pixels.c +++ b/tests/interactive/test-stage-read-pixels.c @@ -79,9 +79,10 @@ on_motion_idle (gpointer user_data) x + TEX_SIZE / 2 - 1, y + TEX_SIZE / 2 - 1); clutter_actor_show (data->box); + /* Redraw so that the layouting will be done and the box will be drawn in the right position */ - clutter_redraw (CLUTTER_STAGE (data->stage)); + clutter_stage_ensure_redraw (CLUTTER_STAGE (data->stage)); pixels = clutter_stage_read_pixels (CLUTTER_STAGE (data->stage), x, y,