diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c index 954681bc5..a0acc009f 100644 --- a/clutter/clutter/clutter-stage.c +++ b/clutter/clutter/clutter-stage.c @@ -57,7 +57,6 @@ #include "clutter-actor-private.h" #include "clutter-backend-private.h" #include "clutter-cairo.h" -#include "clutter-color.h" #include "clutter-container.h" #include "clutter-debug.h" #include "clutter-enum-types.h" @@ -154,7 +153,6 @@ enum { PROP_0, - PROP_COLOR, PROP_PERSPECTIVE, PROP_TITLE, PROP_KEY_FOCUS, @@ -1722,11 +1720,6 @@ clutter_stage_set_property (GObject *object, switch (prop_id) { - case PROP_COLOR: - clutter_actor_set_background_color (CLUTTER_ACTOR (stage), - clutter_value_get_color (value)); - break; - case PROP_TITLE: clutter_stage_set_title (stage, g_value_get_string (value)); break; @@ -1751,16 +1744,6 @@ clutter_stage_get_property (GObject *gobject, switch (prop_id) { - case PROP_COLOR: - { - ClutterColor bg_color; - - clutter_actor_get_background_color (CLUTTER_ACTOR (gobject), - &bg_color); - clutter_value_set_color (value, &bg_color); - } - break; - case PROP_PERSPECTIVE: g_value_set_boxed (value, &priv->perspective); break; @@ -1876,22 +1859,6 @@ clutter_stage_class_init (ClutterStageClass *klass) klass->paint_view = clutter_stage_real_paint_view; - /** - * ClutterStage:color: - * - * The background color of the main stage. - * - * Deprecated: 1.10: Use the #ClutterActor:background-color property of - * #ClutterActor instead. - */ - obj_props[PROP_COLOR] = - clutter_param_spec_color ("color", - P_("Color"), - P_("The color of the stage"), - &default_stage_color, - CLUTTER_PARAM_READWRITE | - G_PARAM_DEPRECATED); - /** * ClutterStage:perspective: * @@ -2192,40 +2159,6 @@ clutter_stage_get_default (void) return CLUTTER_ACTOR (stage); } -/** - * clutter_stage_set_color: - * @stage: A #ClutterStage - * @color: A #ClutterColor - * - * Sets the stage color. - * - * Deprecated: 1.10: Use clutter_actor_set_background_color() instead. - */ -void -clutter_stage_set_color (ClutterStage *stage, - const ClutterColor *color) -{ - clutter_actor_set_background_color (CLUTTER_ACTOR (stage), color); - - g_object_notify_by_pspec (G_OBJECT (stage), obj_props[PROP_COLOR]); -} - -/** - * clutter_stage_get_color: - * @stage: A #ClutterStage - * @color: (out caller-allocates): return location for a #ClutterColor - * - * Retrieves the stage color. - * - * Deprecated: 1.10: Use clutter_actor_get_background_color() instead. - */ -void -clutter_stage_get_color (ClutterStage *stage, - ClutterColor *color) -{ - clutter_actor_get_background_color (CLUTTER_ACTOR (stage), color); -} - static void clutter_stage_set_perspective (ClutterStage *stage, ClutterPerspective *perspective) diff --git a/clutter/clutter/deprecated/clutter-stage.h b/clutter/clutter/deprecated/clutter-stage.h index 20b103cf0..34b6cede5 100644 --- a/clutter/clutter/deprecated/clutter-stage.h +++ b/clutter/clutter/deprecated/clutter-stage.h @@ -74,15 +74,6 @@ gboolean clutter_stage_is_default (ClutterStage *stage); CLUTTER_DEPRECATED_FOR(clutter_actor_queue_redraw) void clutter_stage_queue_redraw (ClutterStage *stage); - -CLUTTER_DEPRECATED_FOR(clutter_actor_set_background_color) -void clutter_stage_set_color (ClutterStage *stage, - const ClutterColor *color); - -CLUTTER_DEPRECATED_FOR(clutter_actor_get_background_color) -void clutter_stage_get_color (ClutterStage *stage, - ClutterColor *color); - CLUTTER_DEPRECATED void clutter_stage_ensure_current (ClutterStage *stage); diff --git a/cogl/tests/conform/test-fixtures.c b/cogl/tests/conform/test-fixtures.c index dfc20437d..218b36ff1 100644 --- a/cogl/tests/conform/test-fixtures.c +++ b/cogl/tests/conform/test-fixtures.c @@ -8,5 +8,5 @@ test_simple_rig (void) ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff }; stage = clutter_stage_get_default (); - clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); } diff --git a/cogl/tests/conform/test-multitexture.c b/cogl/tests/conform/test-multitexture.c index 4f43c1c6a..ba6033431 100644 --- a/cogl/tests/conform/test-multitexture.c +++ b/cogl/tests/conform/test-multitexture.c @@ -185,7 +185,7 @@ test_multitexture (TestUtilsGTestFixture *fixture, stage = clutter_stage_get_default (); - clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); group = clutter_actor_new (); clutter_container_add_actor (CLUTTER_CONTAINER (stage), group); diff --git a/cogl/tests/conform/test-readpixels.c b/cogl/tests/conform/test-readpixels.c index 4e861afc4..bf2fc7887 100644 --- a/cogl/tests/conform/test-readpixels.c +++ b/cogl/tests/conform/test-readpixels.c @@ -156,7 +156,7 @@ test_readpixels (TestUtilsGTestFixture *fixture, ClutterActor *stage; stage = clutter_stage_get_default (); - clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); /* We force continuous redrawing of the stage, since we need to skip * the first few frames, and we wont be doing anything else that diff --git a/cogl/tests/conform/test-texture-mipmaps.c b/cogl/tests/conform/test-texture-mipmaps.c index 3093a1909..afcc9d246 100644 --- a/cogl/tests/conform/test-texture-mipmaps.c +++ b/cogl/tests/conform/test-texture-mipmaps.c @@ -115,7 +115,7 @@ test_texture_mipmaps (TestUtilsGTestFixture *fixture, stage = clutter_stage_get_default (); - clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); group = clutter_actor_new (); clutter_container_add_actor (CLUTTER_CONTAINER (stage), group); diff --git a/cogl/tests/conform/test-texture-pixmap-x11.c b/cogl/tests/conform/test-texture-pixmap-x11.c index c43c0db74..89201c133 100644 --- a/cogl/tests/conform/test-texture-pixmap-x11.c +++ b/cogl/tests/conform/test-texture-pixmap-x11.c @@ -217,7 +217,7 @@ test_texture_pixmap_x11 (TestUtilsGTestFixture *fixture, state.pixmap = create_pixmap (&state); state.tfp = cogl_texture_pixmap_x11_new (state.pixmap, TRUE); - clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (state.stage), &stage_color); paint_handler = g_signal_connect_after (state.stage, "paint", G_CALLBACK (on_paint), &state); diff --git a/cogl/tests/conform/test-viewport.c b/cogl/tests/conform/test-viewport.c index 1b2582954..873b035c4 100644 --- a/cogl/tests/conform/test-viewport.c +++ b/cogl/tests/conform/test-viewport.c @@ -394,7 +394,7 @@ test_viewport (TestUtilsGTestFixture *fixture, ClutterActor *stage; stage = clutter_stage_get_default (); - clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); /* We force continuous redrawing of the stage, since we need to skip * the first few frames, and we wont be doing anything else that diff --git a/src/tests/clutter/accessibility/cally-atkcomponent-example.c b/src/tests/clutter/accessibility/cally-atkcomponent-example.c index 09848dc89..d27c5a884 100644 --- a/src/tests/clutter/accessibility/cally-atkcomponent-example.c +++ b/src/tests/clutter/accessibility/cally-atkcomponent-example.c @@ -48,7 +48,7 @@ main (int argc, char *argv[]) stage = clutter_stage_new (); clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkComponent Test"); - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_White); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_White); clutter_actor_set_size (stage, WIDTH, HEIGHT); g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL); diff --git a/src/tests/clutter/accessibility/cally-atkeditabletext-example.c b/src/tests/clutter/accessibility/cally-atkeditabletext-example.c index 4c4c16376..7cd8df72f 100644 --- a/src/tests/clutter/accessibility/cally-atkeditabletext-example.c +++ b/src/tests/clutter/accessibility/cally-atkeditabletext-example.c @@ -169,7 +169,7 @@ make_ui (ClutterActor *stage) ClutterActor *button = NULL; clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkEditable Test"); - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_White); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_White); clutter_actor_set_size (stage, WIDTH, HEIGHT); /* text */ diff --git a/src/tests/clutter/accessibility/cally-atkevents-example.c b/src/tests/clutter/accessibility/cally-atkevents-example.c index e7bf42550..1b8cd23d5 100644 --- a/src/tests/clutter/accessibility/cally-atkevents-example.c +++ b/src/tests/clutter/accessibility/cally-atkevents-example.c @@ -93,7 +93,7 @@ make_ui (ClutterActor *stage) ClutterColor color_rect = { 0x00, 0xff, 0xff, 0x55 }; float label_geom_y, editable_geom_y; - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_White); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_White); clutter_actor_set_size (stage, WIDTH, HEIGHT); label_geom_y = 50; diff --git a/src/tests/clutter/accessibility/cally-atktext-example.c b/src/tests/clutter/accessibility/cally-atktext-example.c index 5127e179c..3eae81056 100644 --- a/src/tests/clutter/accessibility/cally-atktext-example.c +++ b/src/tests/clutter/accessibility/cally-atktext-example.c @@ -180,7 +180,7 @@ make_ui (ClutterActor *stage) ClutterActor *rectangle = NULL; ClutterActor *label = NULL; - clutter_stage_set_color (CLUTTER_STAGE (stage), &color_stage); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &color_stage); clutter_actor_set_size (stage, WIDTH, HEIGHT); /* text */ diff --git a/src/tests/clutter/accessibility/cally-clone-example.c b/src/tests/clutter/accessibility/cally-clone-example.c index 9f6c916a2..2e88acbc0 100644 --- a/src/tests/clutter/accessibility/cally-clone-example.c +++ b/src/tests/clutter/accessibility/cally-clone-example.c @@ -45,7 +45,7 @@ make_ui (ClutterActor *stage) ClutterActor *cloned_entry = NULL; - clutter_stage_set_color (CLUTTER_STAGE (stage), &color_stage); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &color_stage); clutter_actor_set_size (stage, WIDTH, HEIGHT); label = clutter_text_new_full ("Sans Bold 32px", diff --git a/src/tests/clutter/conform/texture-fbo.c b/src/tests/clutter/conform/texture-fbo.c index d5ab1de42..ec07c77ec 100644 --- a/src/tests/clutter/conform/texture-fbo.c +++ b/src/tests/clutter/conform/texture-fbo.c @@ -169,7 +169,7 @@ texture_fbo (TestConformSimpleFixture *fixture, state.stage = clutter_stage_new (); - clutter_stage_set_color (CLUTTER_STAGE (state.stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (state.stage), &stage_color); /* Onscreen source with clone next to it */ actor = create_source (); diff --git a/src/tests/clutter/interactive/test-cogl-multitexture.c b/src/tests/clutter/interactive/test-cogl-multitexture.c index cd2684664..b60c8d432 100644 --- a/src/tests/clutter/interactive/test-cogl-multitexture.c +++ b/src/tests/clutter/interactive/test-cogl-multitexture.c @@ -130,7 +130,7 @@ test_cogl_multitexture_main (int argc, char *argv[]) clutter_actor_get_size (stage, &stage_w, &stage_h); clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl: Multi-texturing"); - clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL); diff --git a/src/tests/clutter/interactive/test-cogl-point-sprites.c b/src/tests/clutter/interactive/test-cogl-point-sprites.c index e89367083..4ee0615eb 100644 --- a/src/tests/clutter/interactive/test-cogl-point-sprites.c +++ b/src/tests/clutter/interactive/test-cogl-point-sprites.c @@ -254,7 +254,7 @@ test_cogl_point_sprites_main (int argc, char *argv[]) } stage = clutter_stage_new (); - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_Black); clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Point Sprites"); g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL); g_signal_connect_after (stage, "paint", G_CALLBACK (paint_cb), &data); diff --git a/src/tests/clutter/interactive/test-cogl-shader-glsl.c b/src/tests/clutter/interactive/test-cogl-shader-glsl.c index 84461d34d..ddea678ee 100644 --- a/src/tests/clutter/interactive/test-cogl-shader-glsl.c +++ b/src/tests/clutter/interactive/test-cogl-shader-glsl.c @@ -310,7 +310,7 @@ test_cogl_shader_glsl_main (int argc, char *argv[]) stage = clutter_stage_new (); clutter_stage_set_title (CLUTTER_STAGE (stage), "Assembly Shader Test"); - clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL); error = NULL; diff --git a/src/tests/clutter/interactive/test-cogl-tex-polygon.c b/src/tests/clutter/interactive/test-cogl-tex-polygon.c index e6235bacc..e190eeefc 100644 --- a/src/tests/clutter/interactive/test-cogl-tex-polygon.c +++ b/src/tests/clutter/interactive/test-cogl-tex-polygon.c @@ -399,7 +399,7 @@ test_cogl_tex_polygon_main (int argc, char *argv[]) /* Stage */ stage = clutter_stage_new (); - clutter_stage_set_color (CLUTTER_STAGE (stage), &blue); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &blue); clutter_actor_set_size (stage, 640, 480); clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Texture Polygon"); g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL); diff --git a/src/tests/clutter/micro-bench/test-cogl-perf.c b/src/tests/clutter/micro-bench/test-cogl-perf.c index 9bf8a4721..68b3802ff 100644 --- a/src/tests/clutter/micro-bench/test-cogl-perf.c +++ b/src/tests/clutter/micro-bench/test-cogl-perf.c @@ -153,7 +153,7 @@ main (int argc, char *argv[]) state.stage = stage = clutter_stage_new (); clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT); - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_White); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_White); clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Performance Test"); /* We want continuous redrawing of the stage... */ diff --git a/src/tests/clutter/micro-bench/test-picking.c b/src/tests/clutter/micro-bench/test-picking.c index 942e161f7..16d693491 100644 --- a/src/tests/clutter/micro-bench/test-picking.c +++ b/src/tests/clutter/micro-bench/test-picking.c @@ -91,7 +91,7 @@ main (int argc, char **argv) stage = clutter_stage_new (); clutter_actor_set_size (stage, 512, 512); - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_Black); clutter_stage_set_title (CLUTTER_STAGE (stage), "Picking"); printf ("Picking performance test with " diff --git a/src/tests/clutter/micro-bench/test-text-perf.c b/src/tests/clutter/micro-bench/test-text-perf.c index 3361ebf84..9e72656b2 100644 --- a/src/tests/clutter/micro-bench/test-text-perf.c +++ b/src/tests/clutter/micro-bench/test-text-perf.c @@ -131,7 +131,7 @@ main (int argc, char *argv[]) stage = clutter_stage_new (); clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT); - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_Black); clutter_stage_set_title (CLUTTER_STAGE (stage), "Text Performance"); g_signal_connect (stage, "paint", G_CALLBACK (on_paint), NULL); diff --git a/src/tests/clutter/micro-bench/test-text.c b/src/tests/clutter/micro-bench/test-text.c index fc7060565..d62967f09 100644 --- a/src/tests/clutter/micro-bench/test-text.c +++ b/src/tests/clutter/micro-bench/test-text.c @@ -55,7 +55,7 @@ main (int argc, char *argv[]) stage = clutter_stage_new (); clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT); - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_Black); clutter_stage_set_title (CLUTTER_STAGE (stage), "Text"); group = clutter_actor_new (); diff --git a/src/tests/clutter/performance/test-picking.c b/src/tests/clutter/performance/test-picking.c index af5960026..1cf40e365 100644 --- a/src/tests/clutter/performance/test-picking.c +++ b/src/tests/clutter/performance/test-picking.c @@ -85,7 +85,7 @@ main (int argc, char **argv) stage = clutter_stage_new (); clutter_actor_set_size (stage, 512, 512); - clutter_stage_set_color (CLUTTER_STAGE (stage), CLUTTER_COLOR_Black); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), CLUTTER_COLOR_Black); clutter_stage_set_title (CLUTTER_STAGE (stage), "Picking Performance"); g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL); diff --git a/src/tests/clutter/performance/test-text-perf.c b/src/tests/clutter/performance/test-text-perf.c index 89fc580c0..d947d430b 100644 --- a/src/tests/clutter/performance/test-text-perf.c +++ b/src/tests/clutter/performance/test-text-perf.c @@ -109,7 +109,7 @@ main (int argc, char *argv[]) stage = clutter_stage_new (); clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT); - clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color); + clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color); clutter_stage_set_title (CLUTTER_STAGE (stage), "Text Performance"); g_signal_connect (stage, "destroy", G_CALLBACK (clutter_main_quit), NULL);