Replace most remaining uses of container api

These are all on GtkBox or enumerating children.

5 files changed, 37 insertions, 37 deletions

diff --git a/testsuite/a11y/children.c b/testsuite/a11y/children.c
index f5c7d588a2..f024e8f5fa 100644
--- a/testsuite/a11y/children.c
+++ b/testsuite/a11y/children.c
@@ -98,7 +98,7 @@ remove_child (STATE *state,
         child = gtk_widget_get_parent (child);
     }
 
-  gtk_container_remove (GTK_CONTAINER (state->widget), child);
+  gtk_box_remove (GTK_BOX (state->widget), child);
 }
 
 static void
@@ -170,7 +170,7 @@ test_add_remove (GtkWidget *widget)
           child_accessible = gtk_widget_get_accessible (state.child[i]);
           g_signal_connect (child_accessible, "notify::accessible-parent",
                             G_CALLBACK (parent_notify), &(parent_data[i]));
-          gtk_container_add (GTK_CONTAINER (widget), state.child[i]);
+          gtk_box_append (GTK_BOX (widget), state.child[i]);
         }
       else
         child_accessible = atk_object_ref_accessible_child (accessible, i);
diff --git a/testsuite/gtk/action.c b/testsuite/gtk/action.c
index 768de600d3..8f348a3f39 100644
--- a/testsuite/gtk/action.c
+++ b/testsuite/gtk/action.c
@@ -59,7 +59,7 @@ test_action (void)
   button = gtk_button_new ();
 
   gtk_window_set_child (GTK_WINDOW (window), box);
-  gtk_container_add (GTK_CONTAINER (box), button);
+  gtk_box_append (GTK_BOX (box), button);
 
   win_actions = g_simple_action_group_new ();
   g_action_map_add_action_entries (G_ACTION_MAP (win_actions),
@@ -160,7 +160,7 @@ test_text (void)
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   text = gtk_text_new ();
 
-  gtk_container_add (GTK_CONTAINER (box), text);
+  gtk_box_append (GTK_BOX (box), text);
 
   clipboard_actions = g_simple_action_group_new ();
   g_action_map_add_action_entries (G_ACTION_MAP (clipboard_actions),
diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c
index 1a98400309..b9ab90b3e8 100644
--- a/testsuite/gtk/gestures.c
+++ b/testsuite/gtk/gestures.c
@@ -424,8 +424,8 @@ test_phases (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -476,8 +476,8 @@ test_mixed (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -535,8 +535,8 @@ test_early_exit (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -590,8 +590,8 @@ test_claim_capture (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -637,8 +637,8 @@ test_claim_target (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -684,8 +684,8 @@ test_claim_bubble (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -738,8 +738,8 @@ test_early_claim_capture (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -795,8 +795,8 @@ test_late_claim_capture (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -854,8 +854,8 @@ test_group (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -905,8 +905,8 @@ test_gestures_outside_grab (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -965,8 +965,8 @@ test_gestures_inside_grab (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -1025,8 +1025,8 @@ test_multitouch_on_single (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -1076,8 +1076,8 @@ test_multitouch_activation (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
@@ -1152,8 +1152,8 @@ test_multitouch_interaction (void)
   gtk_widget_set_vexpand (C, TRUE);
   gtk_widget_set_name (C, "C");
 
-  gtk_container_add (GTK_CONTAINER (A), B);
-  gtk_container_add (GTK_CONTAINER (B), C);
+  gtk_box_append (GTK_BOX (A), B);
+  gtk_box_append (GTK_BOX (B), C);
 
   gtk_widget_show (A);
 
diff --git a/testsuite/gtk/propertylookuplistmodel.c b/testsuite/gtk/propertylookuplistmodel.c
index a79d07cfe2..b151e15a62 100644
--- a/testsuite/gtk/propertylookuplistmodel.c
+++ b/testsuite/gtk/propertylookuplistmodel.c
@@ -115,7 +115,7 @@ create_widget_tree (void)
   gtk_window_set_child (GTK_WINDOW (window), box);
 
   grid = gtk_grid_new ();
-  gtk_container_add (GTK_CONTAINER (box), grid);
+  gtk_box_append (GTK_BOX (box), grid);
 
   label = gtk_label_new ("Hello World");
   gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
@@ -218,7 +218,7 @@ test_change_property (void)
   assert_model (model, "GtkLabel");
   assert_changes (model, "1-3");
 
-  gtk_container_add (GTK_CONTAINER (grandparent), widget);
+  gtk_box_append (GTK_BOX (grandparent), widget);
   assert_model (model, "GtkLabel GtkBox GtkWindow");
   assert_changes (model, "1+2");
 
diff --git a/testsuite/gtk/widgetorder.c b/testsuite/gtk/widgetorder.c
index c0ffafaeac..0603f2ad98 100644
--- a/testsuite/gtk/widgetorder.c
+++ b/testsuite/gtk/widgetorder.c
@@ -6,7 +6,7 @@ simple (void)
   GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   GtkWidget *l = gtk_label_new ("");
 
-  gtk_container_add (GTK_CONTAINER (box), l);
+  gtk_box_append (GTK_BOX (box), l);
 
   g_assert (gtk_widget_get_parent (l) == box);
   g_assert (gtk_widget_get_prev_sibling (l) == NULL);
@@ -25,8 +25,8 @@ two (void)
   GtkWidget *l1 = gtk_label_new ("");
   GtkWidget *l2 = gtk_label_new ("");
 
-  gtk_container_add (GTK_CONTAINER (box), l1);
-  gtk_container_add (GTK_CONTAINER (box), l2);
+  gtk_box_append (GTK_BOX (box), l1);
+  gtk_box_append (GTK_BOX (box), l2);
 
   g_assert (gtk_widget_get_parent (l1) == box);
   g_assert (gtk_widget_get_prev_sibling (l1) == NULL);