Replace most remaining uses of container api

These are all on GtkBox or enumerating children.

12 files changed, 87 insertions, 87 deletions

diff --git a/gtk/inspector/action-editor.c b/gtk/inspector/action-editor.c
index fa74f2cfee..1f1606ba19 100644
--- a/gtk/inspector/action-editor.c
+++ b/gtk/inspector/action-editor.c
@@ -102,9 +102,9 @@ variant_editor_new (const GVariantType   *type,
     {
       editor = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (editor), entry);
+      gtk_box_append (GTK_BOX (editor), entry);
       label = gtk_label_new (g_variant_type_peek_string (type));
-      gtk_container_add (GTK_CONTAINER (editor), label);
+      gtk_box_append (GTK_BOX (editor), label);
       g_signal_connect (entry, "notify::text", G_CALLBACK (variant_editor_changed_cb), d);
     }
 
@@ -283,24 +283,24 @@ constructed (GObject *object)
 
   row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   activate = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  gtk_container_add (GTK_CONTAINER (row), activate);
+  gtk_box_append (GTK_BOX (row), activate);
   gtk_size_group_add_widget (r->priv->sg, activate);
 
   r->priv->activate_button = gtk_button_new_with_label (_("Activate"));
   g_signal_connect (r->priv->activate_button, "clicked", G_CALLBACK (activate_action), r);
 
   gtk_widget_set_sensitive (r->priv->activate_button, r->priv->enabled);
-  gtk_container_add (GTK_CONTAINER (activate), r->priv->activate_button);
+  gtk_box_append (GTK_BOX (activate), r->priv->activate_button);
 
   r->priv->parameter_type = g_action_group_get_action_parameter_type (r->priv->group, r->priv->name);
   if (r->priv->parameter_type)
     {
       r->priv->parameter_entry = variant_editor_new (r->priv->parameter_type, parameter_changed, r);
       gtk_widget_set_sensitive (r->priv->parameter_entry, r->priv->enabled);
-      gtk_container_add (GTK_CONTAINER (activate), r->priv->parameter_entry);
+      gtk_box_append (GTK_BOX (activate), r->priv->parameter_entry);
     }
 
-  gtk_container_add (GTK_CONTAINER (r), row);
+  gtk_box_append (GTK_BOX (r), row);
 
   if (state)
     {
@@ -308,11 +308,11 @@ constructed (GObject *object)
       row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       label = gtk_label_new (_("Set State"));
       gtk_size_group_add_widget (r->priv->sg, label);
-      gtk_container_add (GTK_CONTAINER (row), label);
+      gtk_box_append (GTK_BOX (row), label);
       r->priv->state_entry = variant_editor_new (r->priv->state_type, state_changed, r);
       variant_editor_set_value (r->priv->state_entry, state);
-      gtk_container_add (GTK_CONTAINER (row), r->priv->state_entry);
-      gtk_container_add (GTK_CONTAINER (r), row);
+      gtk_box_append (GTK_BOX (row), r->priv->state_entry);
+      gtk_box_append (GTK_BOX (r), row);
     }
 
   g_signal_connect (r->priv->group, "action-enabled-changed",
diff --git a/gtk/inspector/actions.c b/gtk/inspector/actions.c
index 78133cb456..327bcb0476 100644
--- a/gtk/inspector/actions.c
+++ b/gtk/inspector/actions.c
@@ -94,14 +94,14 @@ add_action (GtkInspectorActions *sl,
   gtk_widget_add_css_class (label, "cell");
   gtk_label_set_xalign (GTK_LABEL (label), 0);
   gtk_size_group_add_widget (sl->priv->name, label);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   label = gtk_label_new (enabled ? "+" : "-");
   gtk_widget_add_css_class (label, "cell");
   gtk_label_set_xalign (GTK_LABEL (label), 0);
   gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
   gtk_size_group_add_widget (sl->priv->enabled, label);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   g_object_set_data (G_OBJECT (row), "enabled", label);
 
@@ -109,18 +109,18 @@ add_action (GtkInspectorActions *sl,
   gtk_widget_add_css_class (label, "cell");
   gtk_label_set_xalign (GTK_LABEL (label), 0);
   gtk_size_group_add_widget (sl->priv->parameter, label);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   label = gtk_label_new (state_string);
   gtk_label_set_xalign (GTK_LABEL (label), 0);
   gtk_widget_add_css_class (label, "cell");
   gtk_size_group_add_widget (sl->priv->state, label);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
   g_object_set_data (G_OBJECT (row), "state", label);
 
   editor = gtk_inspector_action_editor_new (group, name, sl->priv->activate);
   gtk_widget_add_css_class (editor, "cell");
-  gtk_container_add (GTK_CONTAINER (box), editor);
+  gtk_box_append (GTK_BOX (box), editor);
   g_object_set_data (G_OBJECT (row), "editor", editor);
 
   gtk_list_box_insert (GTK_LIST_BOX (sl->priv->list), row, -1);
diff --git a/gtk/inspector/controllers.c b/gtk/inspector/controllers.c
index a36e1ee304..64063508a6 100644
--- a/gtk/inspector/controllers.c
+++ b/gtk/inspector/controllers.c
@@ -89,9 +89,9 @@ gtk_inspector_controllers_init (GtkInspectorControllers *sl)
   gtk_widget_set_halign (sl->priv->listbox, GTK_ALIGN_CENTER);
   g_signal_connect (sl->priv->listbox, "row-activated", G_CALLBACK (row_activated), sl);
   gtk_list_box_set_selection_mode (GTK_LIST_BOX (sl->priv->listbox), GTK_SELECTION_NONE);
-  gtk_container_add (GTK_CONTAINER (box), sl->priv->listbox);
+  gtk_box_append (GTK_BOX (box), sl->priv->listbox);
 
-  gtk_container_add (GTK_CONTAINER (sl), sw);
+  gtk_box_append (GTK_BOX (sl), sw);
 }
 
 static void
@@ -129,7 +129,7 @@ create_controller_widget (gpointer item,
   gtk_widget_set_margin_bottom (box, 10);
   label = gtk_label_new (G_OBJECT_TYPE_NAME (controller));
   g_object_set (label, "xalign", 0.0, NULL);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
   gtk_size_group_add_widget (sl->priv->sizegroup, label);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
@@ -140,7 +140,7 @@ create_controller_widget (gpointer item,
   gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_BUBBLE, C_("event phase", "Bubble"));
   gtk_combo_box_text_insert_text (GTK_COMBO_BOX_TEXT (combo), GTK_PHASE_TARGET, C_("event phase", "Target"));
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo), gtk_event_controller_get_propagation_phase (controller));
-  gtk_container_add (GTK_CONTAINER (box), combo);
+  gtk_box_append (GTK_BOX (box), combo);
   gtk_widget_set_halign (label, GTK_ALIGN_END);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
 
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 36b6ad0b9a..09afdbb271 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -175,13 +175,13 @@ add_check_row (GtkInspectorGeneral *gen,
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   gtk_widget_set_hexpand (label, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   check = gtk_image_new_from_icon_name ("object-select-symbolic");
   gtk_widget_set_halign (check, GTK_ALIGN_END);
   gtk_widget_set_valign (check, GTK_ALIGN_BASELINE);
   gtk_widget_set_opacity (check, value ? 1.0 : 0.0);
-  gtk_container_add (GTK_CONTAINER (box), check);
+  gtk_box_append (GTK_BOX (box), check);
 
   row = gtk_list_box_row_new ();
   gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
@@ -217,14 +217,14 @@ add_label_row (GtkInspectorGeneral *gen,
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   gtk_widget_set_hexpand (label, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   label = gtk_label_new (value);
   gtk_label_set_selectable (GTK_LABEL (label), TRUE);
   gtk_widget_set_halign (label, GTK_ALIGN_END);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
   gtk_label_set_xalign (GTK_LABEL (label), 1.0);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   row = gtk_list_box_row_new ();
   gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
diff --git a/gtk/inspector/misc-info.c b/gtk/inspector/misc-info.c
index 54d7e993bb..efd9e602bf 100644
--- a/gtk/inspector/misc-info.c
+++ b/gtk/inspector/misc-info.c
@@ -332,7 +332,7 @@ update_info (gpointer data)
       GList *list, *l;
 
        while ((child = gtk_widget_get_first_child (sl->priv->mnemonic_label)))
-         gtk_widget_unparent (child);
+         gtk_box_remove (GTK_BOX (sl->priv->mnemonic_label), child);
 
       list = gtk_widget_list_mnemonic_labels (GTK_WIDGET (sl->priv->object));
       for (l = list; l; l = l->next)
@@ -343,7 +343,7 @@ update_info (gpointer data)
           button = gtk_button_new_with_label (tmp);
           g_free (tmp);
           gtk_widget_show (button);
-          gtk_container_add (GTK_CONTAINER (sl->priv->mnemonic_label), button);
+          gtk_box_append (GTK_BOX (sl->priv->mnemonic_label), button);
           g_object_set_data (G_OBJECT (button), "mnemonic-label", l->data);
           g_signal_connect (button, "clicked", G_CALLBACK (show_mnemonic_label), sl);
         }
diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c
index 239f70358a..0de34cf583 100644
--- a/gtk/inspector/object-tree.c
+++ b/gtk/inspector/object-tree.c
@@ -1003,7 +1003,7 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item,
 
   column = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_size_group_add_widget (wt->priv->type_size_group, column);
-  gtk_container_add (GTK_CONTAINER (box), column);
+  gtk_box_append (GTK_BOX (box), column);
 
   /* expander */
   depth = gtk_tree_list_row_get_depth (row_item);
@@ -1011,7 +1011,7 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item,
     {
       child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_set_size_request (child, 16 * depth, 0);
-      gtk_container_add (GTK_CONTAINER (column), child);
+      gtk_box_append (GTK_BOX (column), child);
     }
   if (gtk_tree_list_row_is_expandable (row_item))
     {
@@ -1022,7 +1022,7 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item,
       title = g_object_new (GTK_TYPE_TOGGLE_BUTTON, "css-name", "title", NULL);
       gtk_button_set_has_frame (GTK_BUTTON (title), FALSE);
       g_object_bind_property (row_item, "expanded", title, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (child), title);
+      gtk_box_append (GTK_BOX (child), title);
 
       arrow = gtk_builtin_icon_new ("expander");
       gtk_button_set_child (GTK_BUTTON (title), arrow);
@@ -1031,20 +1031,20 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item,
     {
       child = gtk_image_new (); /* empty whatever */
     }
-  gtk_container_add (GTK_CONTAINER (column), child);
+  gtk_box_append (GTK_BOX (column), child);
 
   /* 1st column: type name */
   child = gtk_label_new (G_OBJECT_TYPE_NAME (item));
   gtk_label_set_width_chars (GTK_LABEL (child), 30);
   gtk_label_set_xalign (GTK_LABEL (child), 0.0);
-  gtk_container_add (GTK_CONTAINER (column), child);
+  gtk_box_append (GTK_BOX (column), child);
 
   /* 2nd column: name */
   child = gtk_label_new (gtk_inspector_get_object_name (item));
   gtk_label_set_width_chars (GTK_LABEL (child), 15);
   gtk_label_set_xalign (GTK_LABEL (child), 0.0);
   gtk_size_group_add_widget (wt->priv->name_size_group, child);
-  gtk_container_add (GTK_CONTAINER (box), child);
+  gtk_box_append (GTK_BOX (box), child);
 
   /* 3rd column: label */
   child = gtk_label_new (NULL);
@@ -1059,7 +1059,7 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item,
   gtk_label_set_width_chars (GTK_LABEL (child), 15);
   gtk_label_set_xalign (GTK_LABEL (child), 0.0);
   gtk_size_group_add_widget (wt->priv->label_size_group, child);
-  gtk_container_add (GTK_CONTAINER (box), child);
+  gtk_box_append (GTK_BOX (box), child);
 
   g_object_unref (item);
 
diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c
index ff8f18cc81..3504ec2383 100644
--- a/gtk/inspector/prop-editor.c
+++ b/gtk/inspector/prop-editor.c
@@ -794,8 +794,8 @@ create_row (gpointer item,
   g_signal_connect (button, "clicked", G_CALLBACK (item_properties), user_data);
 
   row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-  gtk_container_add (GTK_CONTAINER (row), label);
-  gtk_container_add (GTK_CONTAINER (row), button);
+  gtk_box_append (GTK_BOX (row), label);
+  gtk_box_append (GTK_BOX (row), button);
 
   return row;
 }
@@ -969,7 +969,7 @@ property_editor (GObject                *object,
             b = gtk_check_button_new_with_label (fclass->values[j].value_nick);
             g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j));
             gtk_widget_show (b);
-            gtk_container_add (GTK_CONTAINER (box), b);
+            gtk_box_append (GTK_BOX (box), b);
             connect_controller (G_OBJECT (b), "toggled",
                                 object, spec, G_CALLBACK (flags_modified));
           }
@@ -1048,8 +1048,8 @@ property_editor (GObject                *object,
       g_signal_connect_swapped (button, "clicked",
                                 G_CALLBACK (object_properties),
                                 editor);
-      gtk_container_add (GTK_CONTAINER (prop_edit), label);
-      gtk_container_add (GTK_CONTAINER (prop_edit), button);
+      gtk_box_append (GTK_BOX (prop_edit), label);
+      gtk_box_append (GTK_BOX (prop_edit), button);
       gtk_widget_show (label);
       gtk_widget_show (button);
 
@@ -1218,14 +1218,14 @@ attribute_editor (GObject                *object,
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
 
   label = gtk_label_new (_("Attribute:"));
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   button = gtk_button_new_with_label (_("Model"));
   g_object_set_data (G_OBJECT (button), "model", model);
   g_signal_connect (button, "clicked", G_CALLBACK (model_properties), editor);
-  gtk_container_add (GTK_CONTAINER (box), button);
+  gtk_box_append (GTK_BOX (box), button);
 
-  gtk_container_add (GTK_CONTAINER (box), gtk_label_new (_("Column:")));
+  gtk_box_append (GTK_BOX (box), gtk_label_new (_("Column:")));
   store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_BOOLEAN);
   combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
   renderer = gtk_cell_renderer_text_new ();
@@ -1249,7 +1249,7 @@ attribute_editor (GObject                *object,
   attribute_mapping_changed (GTK_COMBO_BOX (combo), editor);
   g_signal_connect (combo, "changed",
                     G_CALLBACK (attribute_mapping_changed), editor);
-  gtk_container_add (GTK_CONTAINER (box), combo);
+  gtk_box_append (GTK_BOX (box), combo);
 
   return box;
 }
@@ -1317,13 +1317,13 @@ action_editor (GObject                *object,
     {
       text = g_strdup_printf (_("Action from: %p (%s)"),
                               owner, g_type_name_from_instance ((GTypeInstance *)owner));
-      gtk_container_add (GTK_CONTAINER (box), gtk_label_new (text));
+      gtk_box_append (GTK_BOX (box), gtk_label_new (text));
       g_free (text);
       button = gtk_button_new_with_label (_("Properties"));
       g_object_set_data (G_OBJECT (button), "owner", owner);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (show_action_owner), editor);
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_box_append (GTK_BOX (box), button);
     }
 
   return box;
@@ -1379,7 +1379,7 @@ add_attribute_info (GtkInspectorPropEditor *editor,
                     GParamSpec             *spec)
 {
   if (GTK_IS_CELL_RENDERER (editor->priv->object))
-    gtk_container_add (GTK_CONTAINER (editor),
+    gtk_box_append (GTK_BOX (editor),
                        attribute_editor (editor->priv->object, spec, editor));
 }
 
@@ -1388,7 +1388,7 @@ add_actionable_info (GtkInspectorPropEditor *editor)
 {
   if (GTK_IS_ACTIONABLE (editor->priv->object) &&
       g_strcmp0 (editor->priv->name, "action-name") == 0)
-    gtk_container_add (GTK_CONTAINER (editor),
+    gtk_box_append (GTK_BOX (editor),
                        action_editor (editor->priv->object, editor));
 }
 
@@ -1437,20 +1437,20 @@ add_settings_info (GtkInspectorPropEditor *editor)
     }
 
   row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  gtk_container_add (GTK_CONTAINER (row), gtk_label_new (_("Setting:")));
+  gtk_box_append (GTK_BOX (row), gtk_label_new (_("Setting:")));
   label = gtk_label_new (direction);
   if (tip)
     gtk_widget_set_tooltip_text (label, tip);
-  gtk_container_add (GTK_CONTAINER (row), label);
+  gtk_box_append (GTK_BOX (row), label);
   
   str = g_strdup_printf ("%s %s",
                          g_settings_schema_get_id (binding->key.schema),
                          binding->key.name);
   label = gtk_label_new (str);
-  gtk_container_add (GTK_CONTAINER (row), label);
+  gtk_box_append (GTK_BOX (row), label);
   g_free (str);
 
-  gtk_container_add (GTK_CONTAINER (editor), row);
+  gtk_box_append (GTK_BOX (editor), row);
 }
 
 static void
@@ -1478,7 +1478,7 @@ add_gtk_settings_info (GtkInspectorPropEditor *editor)
   row = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
 
   button = gtk_button_new_with_label (_("Reset"));
-  gtk_container_add (GTK_CONTAINER (row), button);
+  gtk_box_append (GTK_BOX (row), button);
   gtk_widget_set_sensitive (button, FALSE);
   g_signal_connect_swapped (button, "clicked", G_CALLBACK (reset_setting), editor);
 
@@ -1501,10 +1501,10 @@ add_gtk_settings_info (GtkInspectorPropEditor *editor)
       source = _("Unknown");
       break;
     }
-  gtk_container_add (GTK_CONTAINER (row), gtk_label_new (_("Source:")));
-  gtk_container_add (GTK_CONTAINER (row), gtk_label_new (source));
+  gtk_box_append (GTK_BOX (row), gtk_label_new (_("Source:")));
+  gtk_box_append (GTK_BOX (row), gtk_label_new (source));
 
-  gtk_container_add (GTK_CONTAINER (editor), row);
+  gtk_box_append (GTK_BOX (editor), row);
 }
 
 static void
@@ -1553,7 +1553,7 @@ constructed (GObject *object)
   if (label)
     {
       gtk_widget_add_css_class (label, GTK_STYLE_CLASS_DIM_LABEL);
-      gtk_container_add (GTK_CONTAINER (box), label);
+      gtk_box_append (GTK_BOX (box), label);
     }
 
   /* By reaching this, we already know the property is readable.
@@ -1567,7 +1567,7 @@ constructed (GObject *object)
     {
       label = gtk_label_new ("");
       gtk_widget_add_css_class (label, GTK_STYLE_CLASS_DIM_LABEL);
-      gtk_container_add (GTK_CONTAINER (box), label);
+      gtk_box_append (GTK_BOX (box), label);
 
       readonly_changed (editor->priv->object, spec, label);
       g_object_connect_property (editor->priv->object, spec,
@@ -1576,15 +1576,15 @@ constructed (GObject *object)
 
       if (editor->priv->size_group)
         gtk_size_group_add_widget (editor->priv->size_group, box);
-      gtk_container_add (GTK_CONTAINER (editor), box);
+      gtk_box_append (GTK_BOX (editor), box);
       return;
     }
 
   editor->priv->editor = property_editor (editor->priv->object, spec, editor);
-  gtk_container_add (GTK_CONTAINER (box), editor->priv->editor);
+  gtk_box_append (GTK_BOX (box), editor->priv->editor);
   if (editor->priv->size_group)
     gtk_size_group_add_widget (editor->priv->size_group, box);
-  gtk_container_add (GTK_CONTAINER (editor), box);
+  gtk_box_append (GTK_BOX (editor), box);
 
   add_attribute_info (editor, spec);
   add_actionable_info (editor);
diff --git a/gtk/inspector/prop-list.c b/gtk/inspector/prop-list.c
index a0d1d76435..d143da83df 100644
--- a/gtk/inspector/prop-list.c
+++ b/gtk/inspector/prop-list.c
@@ -536,25 +536,25 @@ gtk_inspector_prop_list_create_row (GtkInspectorPropList *pl,
   gtk_widget_set_sensitive (label, writable);
   gtk_label_set_xalign (GTK_LABEL (label), 0);
   gtk_size_group_add_widget (pl->priv->names, label);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   label = gtk_label_new (type ? type : "");
   gtk_widget_add_css_class (label, "cell");
   gtk_widget_set_sensitive (label, writable);
   gtk_label_set_xalign (GTK_LABEL (label), 0);
   gtk_size_group_add_widget (pl->priv->types, label);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   label = gtk_label_new (g_type_name (prop->owner_type));
   gtk_widget_add_css_class (label, "cell");
   gtk_widget_set_sensitive (label, writable);
   gtk_label_set_xalign (GTK_LABEL (label), 0);
   gtk_size_group_add_widget (pl->priv->origins, label);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   widget = gtk_inspector_prop_editor_new (pl->priv->object, prop->name, pl->priv->values);
   gtk_widget_add_css_class (widget, "cell");
-  gtk_container_add (GTK_CONTAINER (box), widget);
+  gtk_box_append (GTK_BOX (box), widget);
   g_signal_connect (widget, "show-object", G_CALLBACK (show_object), pl);
 
   g_free (value);
@@ -601,7 +601,7 @@ gtk_inspector_prop_list_set_object (GtkInspectorPropList *pl,
   pl->priv->object = object;
 
   while ((w = gtk_widget_get_first_child (pl->priv->list2)))
-    gtk_container_remove (GTK_CONTAINER (pl->priv->list2), w);
+    gtk_list_box_remove (GTK_LIST_BOX (pl->priv->list2), w);
 
   for (i = 0; i < num_properties; i++)
     {
diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c
index 784e66b269..1717ddc587 100644
--- a/gtk/inspector/recorder.c
+++ b/gtk/inspector/recorder.c
@@ -316,7 +316,7 @@ create_widget_for_render_node (gpointer row_item,
     {
       child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_set_size_request (child, 16 * depth, 0);
-      gtk_container_add (GTK_CONTAINER (box), child);
+      gtk_box_append (GTK_BOX (box), child);
     }
   if (gtk_tree_list_row_is_expandable (row_item))
     {
@@ -327,7 +327,7 @@ create_widget_for_render_node (gpointer row_item,
       title = g_object_new (GTK_TYPE_TOGGLE_BUTTON, "css-name", "title", NULL);
       gtk_button_set_has_frame (GTK_BUTTON (title), FALSE);
       g_object_bind_property (row_item, "expanded", title, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (child), title);
+      gtk_box_append (GTK_BOX (child), title);
       g_object_set_data_full (G_OBJECT (row), "make-sure-its-not-unreffed", g_object_ref (row_item), g_object_unref);
 
       arrow = gtk_builtin_icon_new ("expander");
@@ -337,17 +337,17 @@ create_widget_for_render_node (gpointer row_item,
     {
       child = gtk_image_new (); /* empty whatever */
     }
-  gtk_container_add (GTK_CONTAINER (box), child);
+  gtk_box_append (GTK_BOX (box), child);
 
   /* icon */
   child = gtk_image_new_from_paintable (paintable);
-  gtk_container_add (GTK_CONTAINER (box), child);
+  gtk_box_append (GTK_BOX (box), child);
 
   /* name */
   name = node_name (node);
   child = gtk_label_new (name);
   g_free (name);
-  gtk_container_add (GTK_CONTAINER (box), child);
+  gtk_box_append (GTK_BOX (box), child);
 
   g_object_unref (paintable);
 
@@ -1074,7 +1074,7 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item,
       widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-      gtk_container_add (GTK_CONTAINER (widget), hbox);
+      gtk_box_append (GTK_BOX (widget), hbox);
 
       for (i = 0; i < g_list_model_get_n_items (priv->recordings); i++)
         {
@@ -1115,17 +1115,17 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item,
       label = gtk_label_new (str);
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       g_free (str);
-      gtk_container_add (GTK_CONTAINER (hbox), label);
+      gtk_box_append (GTK_BOX (hbox), label);
 
       button = gtk_toggle_button_new ();
       gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
       gtk_button_set_icon_name (GTK_BUTTON (button), "view-more-symbolic");
 
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);
 
       label = gtk_label_new (gtk_inspector_render_recording_get_profiler_info (GTK_INSPECTOR_RENDER_RECORDING (recording)));
       gtk_widget_hide (label);
-      gtk_container_add (GTK_CONTAINER (widget), label);
+      gtk_box_append (GTK_BOX (widget), label);
       g_object_bind_property (button, "active", label, "visible", 0);
     }
   else
diff --git a/gtk/inspector/shortcuts.c b/gtk/inspector/shortcuts.c
index 3f708371cd..4e4fa67855 100644
--- a/gtk/inspector/shortcuts.c
+++ b/gtk/inspector/shortcuts.c
@@ -67,14 +67,14 @@ create_row (gpointer item,
   label = gtk_label_new (s);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   g_free (s);
-  gtk_container_add (GTK_CONTAINER (row), label);
+  gtk_box_append (GTK_BOX (row), label);
   gtk_size_group_add_widget (sl->trigger, label);
 
   s = gtk_shortcut_action_to_string (action);
   label = gtk_label_new (s);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   g_free (s);
-  gtk_container_add (GTK_CONTAINER (row), label);
+  gtk_box_append (GTK_BOX (row), label);
   gtk_size_group_add_widget (sl->action, label);
 
   return row;
diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c
index 19946541ca..0e552fe063 100644
--- a/gtk/inspector/size-groups.c
+++ b/gtk/inspector/size-groups.c
@@ -86,7 +86,7 @@ size_group_row_widget_destroyed (GtkWidget *widget, SizeGroupRow *row)
 
   parent = gtk_widget_get_parent (GTK_WIDGET (row));
   if (parent)
-    gtk_container_remove (GTK_CONTAINER (parent), GTK_WIDGET (row));
+    gtk_box_remove (GTK_BOX (parent), GTK_WIDGET (row));
 }
 
 static void
@@ -186,7 +186,7 @@ clear_view (GtkInspectorSizeGroups *sl)
   GtkWidget *child;
 
   while ((child = gtk_widget_get_first_child (GTK_WIDGET (sl))))
-    gtk_container_remove (GTK_CONTAINER (sl), child);
+    gtk_box_remove (GTK_BOX (sl), child);
 }
 
 static void
@@ -222,13 +222,13 @@ add_size_group (GtkInspectorSizeGroups *sl,
   GtkWidget *listbox;
 
   frame = gtk_frame_new (NULL);
-  gtk_container_add (GTK_CONTAINER (sl), frame);
+  gtk_box_append (GTK_BOX (sl), frame);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_add_css_class (box, GTK_STYLE_CLASS_VIEW);
   gtk_frame_set_child (GTK_FRAME (frame), box);
 
   box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  gtk_container_add (GTK_CONTAINER (box), box2);
+  gtk_box_append (GTK_BOX (box), box2);
 
   label = gtk_label_new (_("Mode"));
   gtk_widget_set_margin_start (label, 10);
@@ -237,7 +237,7 @@ add_size_group (GtkInspectorSizeGroups *sl,
   gtk_widget_set_margin_bottom (label, 10);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-  gtk_container_add (GTK_CONTAINER (box2), label);
+  gtk_box_append (GTK_BOX (box2), label);
 
   combo = gtk_combo_box_text_new ();
   gtk_widget_set_margin_start (combo, 10);
@@ -253,10 +253,10 @@ add_size_group (GtkInspectorSizeGroups *sl,
   g_object_bind_property (group, "mode",
                           combo, "active",
                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-  gtk_container_add (GTK_CONTAINER (box2), combo);
+  gtk_box_append (GTK_BOX (box2), combo);
 
   listbox = gtk_list_box_new ();
-  gtk_container_add (GTK_CONTAINER (box), listbox);
+  gtk_box_append (GTK_BOX (box), listbox);
   gtk_list_box_set_selection_mode (GTK_LIST_BOX (listbox), GTK_SELECTION_NONE);
 
   widgets = gtk_size_group_get_widgets (group);
diff --git a/gtk/inspector/strv-editor.c b/gtk/inspector/strv-editor.c
index 77cb5551e8..c8b19d6dda 100644
--- a/gtk/inspector/strv-editor.c
+++ b/gtk/inspector/strv-editor.c
@@ -52,7 +52,7 @@ remove_string (GtkButton              *button,
   GtkWidget *row;
 
   row = gtk_widget_get_parent (GTK_WIDGET (button));
-  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (row)), row);
+  gtk_box_remove (GTK_BOX (gtk_widget_get_parent (row)), row);
   emit_changed (editor);
 }
 
@@ -71,17 +71,17 @@ add_string (GtkInspectorStrvEditor *editor,
   entry = gtk_entry_new ();
   gtk_editable_set_text (GTK_EDITABLE (entry), str);
   gtk_widget_show (entry);
-  gtk_container_add (GTK_CONTAINER (box), entry);
+  gtk_box_append (GTK_BOX (box), entry);
   g_object_set_data (G_OBJECT (box), "entry", entry);
   g_signal_connect_swapped (entry, "notify::text", G_CALLBACK (emit_changed), editor);
 
   button = gtk_button_new_from_icon_name ("user-trash-symbolic");
   gtk_widget_add_css_class (button, "image-button");
   gtk_widget_show (button);
-  gtk_container_add (GTK_CONTAINER (box), button);
+  gtk_box_append (GTK_BOX (box), button);
   g_signal_connect (button, "clicked", G_CALLBACK (remove_string), editor);
 
-  gtk_container_add (GTK_CONTAINER (editor->box), box);
+  gtk_box_append (GTK_BOX (editor->box), box);
 
   gtk_widget_grab_focus (entry);
 
@@ -110,8 +110,8 @@ gtk_inspector_strv_editor_init (GtkInspectorStrvEditor *editor)
   gtk_widget_show (editor->button);
   g_signal_connect (editor->button, "clicked", G_CALLBACK (add_cb), editor);
 
-  gtk_container_add (GTK_CONTAINER (editor), editor->box);
-  gtk_container_add (GTK_CONTAINER (editor), editor->button);
+  gtk_box_append (GTK_BOX (editor), editor->box);
+  gtk_box_append (GTK_BOX (editor), editor->button);
 }
 
 static void
@@ -137,7 +137,7 @@ gtk_inspector_strv_editor_set_strv (GtkInspectorStrvEditor  *editor,
   editor->blocked = TRUE;
 
   while ((child = gtk_widget_get_first_child (GTK_WIDGET (editor->box))))
-    gtk_container_remove (GTK_CONTAINER (editor->box), child);
+    gtk_box_remove (GTK_BOX (editor->box), child);
 
   if (strv)
     {