isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

tests/cally: Remove last uses of clutter_group_add()

Browse Source
This commit is contained in:
Emmanuele Bassi 2011-06-16 17:11:39 +01:00
parent cb3999744f
commit daaa4c5b96
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/accessibility/cally-atkcomponent-example.c
View File

@ -84,16 +84,16 @@ main (int argc, char *argv[])
clutter_actor_set_geometry (group[i], &geom); clutter_actor_set_geometry (group[i], &geom);
if (i > 0) 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_actor_show_all (group[i]);
} }
clutter_group_add (CLUTTER_GROUP (stage), button1); clutter_container_add_actor (CLUTTER_CONTAINER (stage), button1);
clutter_group_add (CLUTTER_GROUP (stage), button2); clutter_container_add_actor (CLUTTER_CONTAINER (stage), button2);
clutter_group_add (CLUTTER_GROUP (stage), button3); clutter_container_add_actor (CLUTTER_CONTAINER (stage), button3);
clutter_group_add (CLUTTER_GROUP (stage), group[3]); clutter_container_add_actor (CLUTTER_CONTAINER (stage), group[3]);
clutter_group_add (CLUTTER_GROUP (group[0]), button4); clutter_container_add_actor (CLUTTER_CONTAINER (group[0]), button4);
clutter_actor_show_all (stage); clutter_actor_show_all (stage);

18
tests/accessibility/cally-atkeditabletext-example.c
View File

@ -157,8 +157,8 @@ _create_button (const gchar *text)
label = clutter_text_new_full ("Sans Bold 32px", label = clutter_text_new_full ("Sans Bold 32px",
text, &color_label); text, &color_label);
clutter_group_add (CLUTTER_GROUP (button), rectangle); clutter_container_add_actor (CLUTTER_CONTAINER (button), rectangle);
clutter_group_add (CLUTTER_GROUP (button), label); clutter_container_add_actor (CLUTTER_CONTAINER (button), label);
clutter_actor_set_reactive (button, TRUE); clutter_actor_set_reactive (button, TRUE);
return button; return button;
@ -180,7 +180,7 @@ make_ui (ClutterActor *stage)
text_actor = clutter_text_new_full ("Sans Bold 32px", text_actor = clutter_text_new_full ("Sans Bold 32px",
"Lorem ipsum dolor sit amet", "Lorem ipsum dolor sit amet",
&color_text); &color_text);
clutter_group_add (CLUTTER_GROUP (stage), text_actor); clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_actor);
/* text_editable */ /* text_editable */
text_editable_actor = clutter_text_new_full ("Sans Bold 32px", 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_grab_key_focus (text_editable_actor);
clutter_actor_set_reactive (text_editable_actor, TRUE); 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_signal_connect (text_editable_actor, "activate",
G_CALLBACK (activate_cb), NULL); G_CALLBACK (activate_cb), NULL);
@ -208,7 +208,7 @@ make_ui (ClutterActor *stage)
g_signal_connect_after (button, "button-press-event", g_signal_connect_after (button, "button-press-event",
G_CALLBACK (set_text_press_cb), NULL); 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"); button = _create_button ("Delete");
clutter_actor_set_position (button, 100, 250); clutter_actor_set_position (button, 100, 250);
@ -216,7 +216,7 @@ make_ui (ClutterActor *stage)
g_signal_connect_after (button, "button-press-event", g_signal_connect_after (button, "button-press-event",
G_CALLBACK (delete_text_press_cb), NULL); 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"); button = _create_button ("Insert");
clutter_actor_set_position (button, 100, 300); clutter_actor_set_position (button, 100, 300);
@ -224,7 +224,7 @@ make_ui (ClutterActor *stage)
g_signal_connect_after (button, "button-press-event", g_signal_connect_after (button, "button-press-event",
G_CALLBACK (insert_text_press_cb), NULL); 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"); button = _create_button ("Activate/Deactivate");
clutter_actor_set_position (button, 100, 350); clutter_actor_set_position (button, 100, 350);
@ -232,7 +232,7 @@ make_ui (ClutterActor *stage)
g_signal_connect_after (button, "button-press-event", g_signal_connect_after (button, "button-press-event",
G_CALLBACK (activate_deactivate_press_cb), NULL); 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"); button = _create_button ("Cursor position");
clutter_actor_set_position (button, 100, 450); clutter_actor_set_position (button, 100, 450);
@ -240,7 +240,7 @@ make_ui (ClutterActor *stage)
g_signal_connect_after (button, "button-press-event", g_signal_connect_after (button, "button-press-event",
G_CALLBACK (print_cursor_position_press_cb), NULL); G_CALLBACK (print_cursor_position_press_cb), NULL);
clutter_group_add (CLUTTER_GROUP (stage), button); clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
} }

6
tests/accessibility/cally-atkevents-example.c
View File

@ -123,9 +123,9 @@ make_ui (ClutterActor *stage)
rectangle = clutter_rectangle_new_with_color (&color_rect); rectangle = clutter_rectangle_new_with_color (&color_rect);
clutter_actor_set_geometry (rectangle, &editable_geom); clutter_actor_set_geometry (rectangle, &editable_geom);
clutter_group_add (CLUTTER_GROUP (stage), label); clutter_container_add_actor (CLUTTER_CONTAINER (stage), label);
clutter_group_add (CLUTTER_GROUP (stage), editable); clutter_container_add_actor (CLUTTER_CONTAINER (stage), editable);
clutter_group_add (CLUTTER_GROUP (stage), rectangle); clutter_container_add_actor (CLUTTER_CONTAINER (stage), rectangle);
label_geom.y += HEIGHT_STEP; label_geom.y += HEIGHT_STEP;
editable_geom.y += HEIGHT_STEP; editable_geom.y += HEIGHT_STEP;

10
tests/accessibility/cally-atktext-example.c
View File

@ -150,7 +150,7 @@ make_ui (ClutterActor *stage)
text_actor = clutter_text_new_full ("Sans Bold 32px", text_actor = clutter_text_new_full ("Sans Bold 32px",
"Lorem ipsum dolor sit amet", "Lorem ipsum dolor sit amet",
&color_text); &color_text);
clutter_group_add (CLUTTER_GROUP (stage), text_actor); clutter_container_add_actor (CLUTTER_CONTAINER (stage), text_actor);
/* text_editable */ /* text_editable */
text_editable_actor = clutter_text_new_full ("Sans Bold 32px", 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_grab_key_focus (text_editable_actor);
clutter_actor_set_reactive (text_editable_actor, TRUE); 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 */ /* test button */
button = clutter_group_new (); button = clutter_group_new ();
@ -175,14 +175,14 @@ make_ui (ClutterActor *stage)
label = clutter_text_new_full ("Sans Bold 32px", label = clutter_text_new_full ("Sans Bold 32px",
"Test", &color_label); "Test", &color_label);
clutter_actor_set_position (button, 100, 200); clutter_actor_set_position (button, 100, 200);
clutter_group_add (CLUTTER_GROUP (button), rectangle); clutter_container_add_actor (CLUTTER_CONTAINER (button), rectangle);
clutter_group_add (CLUTTER_GROUP (button), label); clutter_container_add_actor (CLUTTER_CONTAINER (button), label);
clutter_actor_set_reactive (button, TRUE); clutter_actor_set_reactive (button, TRUE);
g_signal_connect_after (button, "button-press-event", g_signal_connect_after (button, "button-press-event",
G_CALLBACK (button_press_cb), NULL); G_CALLBACK (button_press_cb), NULL);
clutter_group_add (CLUTTER_GROUP (stage), button); clutter_container_add_actor (CLUTTER_CONTAINER (stage), button);
} }

10
tests/accessibility/cally-clone-example.c
View File

@ -73,12 +73,12 @@ make_ui (ClutterActor *stage)
full_entry = clutter_group_new (); full_entry = clutter_group_new ();
clutter_actor_set_position (full_entry, 0, 50); clutter_actor_set_position (full_entry, 0, 50);
clutter_actor_set_size (full_entry, 100, 75); clutter_actor_set_size (full_entry, 100, 75);
clutter_group_add (CLUTTER_GROUP (full_entry), label); clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), label);
clutter_group_add (CLUTTER_GROUP (full_entry), editable); clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), editable);
clutter_group_add (CLUTTER_GROUP (full_entry), rectangle); clutter_container_add_actor (CLUTTER_CONTAINER (full_entry), rectangle);
clutter_actor_show_all (full_entry); clutter_actor_show_all (full_entry);
clutter_actor_set_scale (full_entry, 2, 1); 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! */ /* Cloning! */
cloned_entry = clutter_clone_new (full_entry); cloned_entry = clutter_clone_new (full_entry);
@ -87,7 +87,7 @@ make_ui (ClutterActor *stage)
clutter_actor_show_all (cloned_entry); clutter_actor_show_all (cloned_entry);
clutter_actor_set_reactive (cloned_entry, TRUE); 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 int