[clutter] tests/cally: Remove last uses of clutter_group_add()

From: Emmanuele Bassi <ebassi src gnome org>
To: commits-list gnome org
Cc:
Subject: [clutter] tests/cally: Remove last uses of clutter_group_add()
Date: Thu, 16 Jun 2011 16:12:59 +0000 (UTC)
commit daaa4c5b969b43ee66d99c6a0aaa9f2e8256d780
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Thu Jun 16 17:11:39 2011 +0100

    tests/cally: Remove last uses of clutter_group_add()

 tests/accessibility/cally-atkcomponent-example.c   |   12 ++++++------
 .../accessibility/cally-atkeditabletext-example.c  |   18 +++++++++---------
 tests/accessibility/cally-atkevents-example.c      |    6 +++---
 tests/accessibility/cally-atktext-example.c        |   10 +++++-----
 tests/accessibility/cally-clone-example.c          |   10 +++++-----
 5 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/tests/accessibility/cally-atkcomponent-example.c b/tests/accessibility/cally-atkcomponent-example.c
index 6698d97..bce0cd2 100644
--- a/tests/accessibility/cally-atkcomponent-example.c
+++ b/tests/accessibility/cally-atkcomponent-example.c
@@ -84,16 +84,16 @@ main (int argc, char *argv[])
     clutter_actor_set_geometry (group[i], &geom);
 
     if (i > 0)
-      clutter_group_add (CLUTTER_GROUP (group[i]), group [i - 1]);
+      clutter_container_add_actor (CLUTTER_CONTAINER (group[i]), group [i - 1]);
 
     clutter_actor_show_all (group[i]);
   }
 
-  clutter_group_add (CLUTTER_GROUP (stage), button1);
-  clutter_group_add (CLUTTER_GROUP (stage), button2);
-  clutter_group_add (CLUTTER_GROUP (stage), button3);
-  clutter_group_add (CLUTTER_GROUP (stage), group[3]);
-  clutter_group_add (CLUTTER_GROUP (group[0]), button4);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button1);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button2);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button3);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), group[3]);
+  clutter_container_add_actor (CLUTTER_CONTAINER (group[0]), button4);
 
   clutter_actor_show_all (stage);
 
diff --git a/tests/accessibility/cally-atkeditabletext-example.c b/tests/accessibility/cally-atkeditabletext-example.c
index 4546302..d139138 100644
--- a/tests/accessibility/cally-atkeditabletext-example.c
+++ b/tests/accessibility/cally-atkeditabletext-example.c
@@ -157,8 +157,8 @@ _create_button (const gchar *text)
 
   label = clutter_text_new_full ("Sans Bold 32px",
                                  text, &color_label);
-  clutter_group_add (CLUTTER_GROUP (button), rectangle);
-  clutter_group_add (CLUTTER_GROUP (button), label);
+  clutter_container_add_actor (CLUTTER_CONTAINER (button), rectangle);
+  clutter_container_add_actor (CLUTTER_CONTAINER (button), label);
   clutter_actor_set_reactive (button, TRUE);
 
   return button;
@@ -180,7 +180,7 @@ make_ui (ClutterActor *stage)
   text_actor = clutter_text_new_full ("Sans Bold 32px",
                                       "Lorem ipsum dolor sit amet",
                                       &color_text);
-  clutter_group_add (CLUTTER_GROUP (stage), text_actor);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_actor);
 
   /* text_editable */
   text_editable_actor = clutter_text_new_full ("Sans Bold 32px",
@@ -197,7 +197,7 @@ make_ui (ClutterActor *stage)
   clutter_actor_grab_key_focus (text_editable_actor);
   clutter_actor_set_reactive (text_editable_actor, TRUE);
 
-  clutter_group_add (CLUTTER_GROUP (stage), text_editable_actor);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_editable_actor);
   g_signal_connect (text_editable_actor, "activate",
                     G_CALLBACK (activate_cb), NULL);
 
@@ -208,7 +208,7 @@ make_ui (ClutterActor *stage)
   g_signal_connect_after (button, "button-press-event",
                           G_CALLBACK (set_text_press_cb), NULL);
 
-  clutter_group_add (CLUTTER_GROUP (stage), button);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
 
   button = _create_button ("Delete");
   clutter_actor_set_position (button, 100, 250);
@@ -216,7 +216,7 @@ make_ui (ClutterActor *stage)
   g_signal_connect_after (button, "button-press-event",
                           G_CALLBACK (delete_text_press_cb), NULL);
 
-  clutter_group_add (CLUTTER_GROUP (stage), button);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
 
   button = _create_button ("Insert");
   clutter_actor_set_position (button, 100, 300);
@@ -224,7 +224,7 @@ make_ui (ClutterActor *stage)
   g_signal_connect_after (button, "button-press-event",
                           G_CALLBACK (insert_text_press_cb), NULL);
 
-  clutter_group_add (CLUTTER_GROUP (stage), button);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
 
   button = _create_button ("Activate/Deactivate");
   clutter_actor_set_position (button, 100, 350);
@@ -232,7 +232,7 @@ make_ui (ClutterActor *stage)
   g_signal_connect_after (button, "button-press-event",
                           G_CALLBACK (activate_deactivate_press_cb), NULL);
 
-  clutter_group_add (CLUTTER_GROUP (stage), button);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
 
   button = _create_button ("Cursor position");
   clutter_actor_set_position (button, 100, 450);
@@ -240,7 +240,7 @@ make_ui (ClutterActor *stage)
   g_signal_connect_after (button, "button-press-event",
                           G_CALLBACK (print_cursor_position_press_cb), NULL);
 
-  clutter_group_add (CLUTTER_GROUP (stage), button);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
 
 }
 
diff --git a/tests/accessibility/cally-atkevents-example.c b/tests/accessibility/cally-atkevents-example.c
index 85e1d61..fc23e6f 100644
--- a/tests/accessibility/cally-atkevents-example.c
+++ b/tests/accessibility/cally-atkevents-example.c
@@ -123,9 +123,9 @@ make_ui (ClutterActor *stage)
       rectangle = clutter_rectangle_new_with_color (&color_rect);
       clutter_actor_set_geometry (rectangle, &editable_geom);
 
-      clutter_group_add (CLUTTER_GROUP (stage), label);
-      clutter_group_add (CLUTTER_GROUP (stage), editable);
-      clutter_group_add (CLUTTER_GROUP (stage), rectangle);
+      clutter_container_add_actor (CLUTTER_CONTAINER (stage), label);
+      clutter_container_add_actor (CLUTTER_CONTAINER (stage), editable);
+      clutter_container_add_actor (CLUTTER_CONTAINER (stage), rectangle);
 
       label_geom.y += HEIGHT_STEP;
       editable_geom.y += HEIGHT_STEP;
diff --git a/tests/accessibility/cally-atktext-example.c b/tests/accessibility/cally-atktext-example.c
index 0543ed8..444883e 100644
--- a/tests/accessibility/cally-atktext-example.c
+++ b/tests/accessibility/cally-atktext-example.c
@@ -150,7 +150,7 @@ make_ui (ClutterActor *stage)
   text_actor = clutter_text_new_full ("Sans Bold 32px",
                                       "Lorem ipsum dolor sit amet",
                                       &color_text);
-  clutter_group_add (CLUTTER_GROUP (stage), text_actor);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_actor);
 
   /* text_editable */
   text_editable_actor = clutter_text_new_full ("Sans Bold 32px",
@@ -165,7 +165,7 @@ make_ui (ClutterActor *stage)
   clutter_actor_grab_key_focus (text_editable_actor);
   clutter_actor_set_reactive (text_editable_actor, TRUE);
 
-  clutter_group_add (CLUTTER_GROUP (stage), text_editable_actor);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_editable_actor);
 
   /* test button */
   button = clutter_group_new ();
@@ -175,14 +175,14 @@ make_ui (ClutterActor *stage)
   label = clutter_text_new_full ("Sans Bold 32px",
                                  "Test", &color_label);
   clutter_actor_set_position (button, 100, 200);
-  clutter_group_add (CLUTTER_GROUP (button), rectangle);
-  clutter_group_add (CLUTTER_GROUP (button), label);
+  clutter_container_add_actor (CLUTTER_CONTAINER (button), rectangle);
+  clutter_container_add_actor (CLUTTER_CONTAINER (button), label);
   clutter_actor_set_reactive (button, TRUE);
 
   g_signal_connect_after (button, "button-press-event",
                           G_CALLBACK (button_press_cb), NULL);
 
-  clutter_group_add (CLUTTER_GROUP (stage), button);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
 
 }
 
diff --git a/tests/accessibility/cally-clone-example.c b/tests/accessibility/cally-clone-example.c
index 72d3b06..6b0973a 100644
--- a/tests/accessibility/cally-clone-example.c
+++ b/tests/accessibility/cally-clone-example.c
@@ -73,12 +73,12 @@ make_ui (ClutterActor *stage)
   full_entry = clutter_group_new ();
   clutter_actor_set_position (full_entry, 0, 50);
   clutter_actor_set_size (full_entry, 100, 75);
-  clutter_group_add (CLUTTER_GROUP (full_entry), label);
-  clutter_group_add (CLUTTER_GROUP (full_entry), editable);
-  clutter_group_add (CLUTTER_GROUP (full_entry), rectangle);
+  clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), label);
+  clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), editable);
+  clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), rectangle);
   clutter_actor_show_all (full_entry);
   clutter_actor_set_scale (full_entry, 2, 1);
-  clutter_group_add (CLUTTER_GROUP (stage), full_entry);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), full_entry);
 
   /* Cloning! */
   cloned_entry = clutter_clone_new (full_entry);
@@ -87,7 +87,7 @@ make_ui (ClutterActor *stage)
   clutter_actor_show_all (cloned_entry);
   clutter_actor_set_reactive (cloned_entry, TRUE);
 
-  clutter_group_add (CLUTTER_GROUP (stage), cloned_entry);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), cloned_entry);
 }
 
 int
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]