Use gtk_button_set_child throughout

Replace all uses of gtk_container_add on buttons
by gtk_button_set_child.

23 files changed, 50 insertions, 70 deletions

diff --git a/demos/gtk-demo/flowbox.c b/demos/gtk-demo/flowbox.c
index c9e2f255b4..901b78cb6a 100644
--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -37,7 +37,7 @@ color_swatch_new (const gchar *color)
   gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (area), 24);
   gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (area), 24);
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (area), draw_color, (gpointer) color, NULL);
-  gtk_container_add (GTK_CONTAINER (button), area);
+  gtk_button_set_child (GTK_BUTTON (button), area);
 
   return button;
 }
diff --git a/demos/gtk-demo/headerbar.c b/demos/gtk-demo/headerbar.c
index 070bb8fa70..a1ddf97511 100644
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -36,16 +36,16 @@ do_headerbar (GtkWidget *do_widget)
       icon = g_themed_icon_new ("mail-send-receive-symbolic");
       image = gtk_image_new_from_gicon (icon);
       g_object_unref (icon);
-      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_button_set_child (GTK_BUTTON (button), image);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_add_css_class (box, "linked");
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
+      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
       gtk_container_add (GTK_CONTAINER (box), button);
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
+      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
       gtk_container_add (GTK_CONTAINER (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);
diff --git a/demos/gtk-demo/transparent.c b/demos/gtk-demo/transparent.c
index ae9873a4e9..5422cb14ea 100644
--- a/demos/gtk-demo/transparent.c
+++ b/demos/gtk-demo/transparent.c
@@ -32,7 +32,7 @@ do_transparent (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), overlay);
 
       button = gtk_button_new_with_label ("Don't click this button!");
-      label = gtk_bin_get_child (GTK_BIN (button));
+      label = gtk_button_get_child (GTK_BUTTON (button));
       gtk_widget_set_margin_start (label, 50);
       gtk_widget_set_margin_end (label, 50);
       gtk_widget_set_margin_top (label, 50);
@@ -45,7 +45,7 @@ do_transparent (GtkWidget *do_widget)
       blur_overlay_add_overlay (BLUR_OVERLAY (overlay), button, 5.0);
 
       button = gtk_button_new_with_label ("Maybe this one?");
-      label = gtk_bin_get_child (GTK_BIN (button));
+      label = gtk_button_get_child (GTK_BUTTON (button));
       gtk_widget_set_margin_start (label, 50);
       gtk_widget_set_margin_end (label, 50);
       gtk_widget_set_margin_top (label, 50);
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index c411460b4e..08f43062ce 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -1130,7 +1130,7 @@ create_headerbar (void)
   bar = gtk_header_bar_new ();
   gtk_window_set_titlebar (GTK_WINDOW (window), bar);
   button = gtk_button_new ();
-  gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("bookmark-new-symbolic"));
+  gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("bookmark-new-symbolic"));
   gtk_header_bar_pack_end (GTK_HEADER_BAR (bar), button);
 
   return new_widget_info ("headerbar", window, ASIS);
diff --git a/gtk/a11y/gtkbuttonaccessible.c b/gtk/a11y/gtkbuttonaccessible.c
index d296699ee2..6522f44c83 100644
--- a/gtk/a11y/gtkbuttonaccessible.c
+++ b/gtk/a11y/gtkbuttonaccessible.c
@@ -26,7 +26,7 @@
 static void atk_action_interface_init (AtkActionIface *iface);
 static void atk_image_interface_init  (AtkImageIface  *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, gtk_button_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
+G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, gtk_button_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
 
@@ -60,7 +60,7 @@ get_image_from_button (GtkWidget *button)
 {
   GtkWidget *image;
 
-  image = gtk_bin_get_child (GTK_BIN (button));
+  image = gtk_button_get_child (GTK_BUTTON (button));
   if (GTK_IS_IMAGE (image))
     return image;
 
@@ -99,7 +99,7 @@ get_label_from_button (GtkWidget *button)
 {
   GtkWidget *child;
 
-  child = gtk_bin_get_child (GTK_BIN (button));
+  child = gtk_button_get_child (GTK_BUTTON (button));
 
   if (GTK_IS_CONTAINER (child))
     child = find_label_child (GTK_CONTAINER (child));
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 9b5ef3180e..095b024d5d 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -458,7 +458,7 @@ setup_search (GtkAppChooserDialog *self)
       button = gtk_toggle_button_new ();
       gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
       image = gtk_image_new_from_icon_name ("edit-find-symbolic");
-      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_button_set_child (GTK_BUTTON (button), image);
       gtk_widget_add_css_class (button, "image-button");
       gtk_widget_remove_css_class (button, "text-button");
 
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index bbf75b0446..865c239abf 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -279,7 +279,7 @@ gtk_color_button_init (GtkColorButton *button)
 
   gtk_widget_set_size_request (button->swatch, rect.width, rect.height);
 
-  gtk_container_add (GTK_CONTAINER (button->button), button->swatch);
+  gtk_button_set_child (GTK_BUTTON (button->button), button->swatch);
 
   button->title = g_strdup (_("Pick a Color")); /* default title */
 
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 6f233c89c9..f7c522d428 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -561,7 +561,7 @@ gtk_file_chooser_button_init (GtkFileChooserButton *button)
   gtk_container_add (GTK_CONTAINER (box), button->label);
   gtk_widget_set_valign (icon, GTK_ALIGN_BASELINE);
   gtk_container_add (GTK_CONTAINER (box), icon);
-  gtk_container_add (GTK_CONTAINER (button->button), box);
+  gtk_button_set_child (GTK_BUTTON (button->button), box);
 
   gtk_widget_set_parent (button->button, GTK_WIDGET (button));
 
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 782f34f022..01fa0bf0c7 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -558,7 +558,7 @@ gtk_font_button_init (GtkFontButton *font_button)
   gtk_container_add (GTK_CONTAINER (font_button->font_size_box), font_button->size_label);
   gtk_container_add (GTK_CONTAINER (box), font_button->font_size_box);
 
-  gtk_container_add (GTK_CONTAINER (font_button->button), box);
+  gtk_button_set_child (GTK_BUTTON (font_button->button), box);
   gtk_widget_set_parent (font_button->button, GTK_WIDGET (font_button));
 
   /* Initialize fields */
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index dda9b0d558..5c101868ab 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -140,7 +140,7 @@
  *   // Pressing Alt+H will activate this button
  *   GtkWidget *button = gtk_button_new ();
  *   GtkWidget *label = gtk_label_new_with_mnemonic ("_Hello");
- *   gtk_container_add (GTK_CONTAINER (button), label);
+ *   gtk_button_set_child (GTK_BUTTON (button), label);
  * ]|
  *
  * There’s a convenience function to create buttons with a mnemonic label
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 7f36353236..464ee6a685 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -477,7 +477,7 @@ add_arrow (GtkMenuButton *self)
 
   arrow = gtk_image_new ();
   set_arrow_type (GTK_IMAGE (arrow), self->arrow_type);
-  gtk_container_add (GTK_CONTAINER (self->button), arrow);
+  gtk_button_set_child (GTK_BUTTON (self->button), arrow);
   self->arrow_widget = arrow;
 }
 
@@ -697,8 +697,6 @@ void
 gtk_menu_button_set_direction (GtkMenuButton *menu_button,
                                GtkArrowType   direction)
 {
-  GtkWidget *child;
-
   g_return_if_fail (GTK_IS_MENU_BUTTON (menu_button));
 
   if (menu_button->arrow_type == direction)
@@ -708,11 +706,10 @@ gtk_menu_button_set_direction (GtkMenuButton *menu_button,
   g_object_notify_by_pspec (G_OBJECT (menu_button), menu_button_props[PROP_DIRECTION]);
 
   /* Is it custom content? We don't change that */
-  child = gtk_bin_get_child (GTK_BIN (menu_button->button));
-  if (menu_button->arrow_widget != child)
+  if (menu_button->arrow_widget != gtk_button_get_child (GTK_BUTTON (menu_button->button)))
     return;
 
-  set_arrow_type (GTK_IMAGE (child), menu_button->arrow_type);
+  set_arrow_type (GTK_IMAGE (menu_button->arrow_widget), menu_button->arrow_type);
   update_popover_direction (menu_button);
 }
 
@@ -878,17 +875,12 @@ void
 gtk_menu_button_set_label (GtkMenuButton *menu_button,
                            const char    *label)
 {
-  GtkWidget *child;
   GtkWidget *box;
   GtkWidget *label_widget;
   GtkWidget *image;
 
   g_return_if_fail (GTK_IS_MENU_BUTTON (menu_button));
 
-  child = gtk_bin_get_child (GTK_BIN (menu_button->button));
-  if (child)
-    gtk_container_remove (GTK_CONTAINER (menu_button->button), child);
-
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   label_widget = gtk_label_new (label);
   g_return_if_fail (GTK_IS_MENU_BUTTON (menu_button));
@@ -899,7 +891,7 @@ gtk_menu_button_set_label (GtkMenuButton *menu_button,
   image = gtk_image_new_from_icon_name ("pan-down-symbolic");
   gtk_container_add (GTK_CONTAINER (box), label_widget);
   gtk_container_add (GTK_CONTAINER (box), image);
-  gtk_container_add (GTK_CONTAINER (menu_button->button), box);
+  gtk_button_set_child (GTK_BUTTON (menu_button->button), box);
   menu_button->label_widget = label_widget;
 
   g_object_notify_by_pspec (G_OBJECT (menu_button), menu_button_props[PROP_LABEL]);
@@ -920,7 +912,7 @@ gtk_menu_button_get_label (GtkMenuButton *menu_button)
 
   g_return_val_if_fail (GTK_IS_MENU_BUTTON (menu_button), NULL);
 
-  child = gtk_bin_get_child (GTK_BIN (menu_button->button));
+  child = gtk_button_get_child (GTK_BUTTON (menu_button->button));
   if (GTK_IS_BOX (child))
     {
       child = gtk_widget_get_first_child (child);
@@ -998,13 +990,7 @@ void
 gtk_menu_button_add_child (GtkMenuButton *menu_button,
                            GtkWidget     *new_child)
 {
-  GtkWidget *child;
-
-  child = gtk_bin_get_child (GTK_BIN (menu_button->button));
-  if (child)
-    gtk_container_remove (GTK_CONTAINER (menu_button->button), child);
-
-  gtk_container_add (GTK_CONTAINER (menu_button->button), new_child);
+  gtk_button_set_child (GTK_BUTTON (menu_button->button), new_child);
 }
 
 /**
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index c7b5597865..9b81bccd77 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -5547,7 +5547,7 @@ gtk_notebook_menu_item_create (GtkNotebook *notebook,
 
   menu_item = gtk_button_new ();
   gtk_button_set_has_frame (GTK_BUTTON (menu_item), FALSE);
-  gtk_container_add (GTK_CONTAINER (menu_item), page->menu_label);
+  gtk_button_set_child (GTK_BUTTON (menu_item), page->menu_label);
   gtk_container_add (GTK_CONTAINER (notebook->menu_box), menu_item);
   g_signal_connect (menu_item, "clicked",
                     G_CALLBACK (gtk_notebook_menu_switch_page), page);
@@ -5571,8 +5571,7 @@ static void
 gtk_notebook_menu_label_unparent (GtkWidget *widget,
                                   gpointer  data)
 {
-  gtk_widget_unparent (gtk_bin_get_child (GTK_BIN (widget)));
-  _gtk_bin_set_child (GTK_BIN (widget), NULL);
+  gtk_button_set_child (GTK_BUTTON (widget), NULL);
 }
 
 /* Public GtkNotebook Page Insert/Remove Methods :
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 6e1599b69e..c794f56dc2 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -1061,7 +1061,7 @@ make_directory_button (GtkPathBar  *path_bar,
   button_data->file = g_object_ref (file);
   button_data->file_is_hidden = file_is_hidden;
 
-  gtk_container_add (GTK_CONTAINER (button_data->button), child);
+  gtk_button_set_child (GTK_BUTTON (button_data->button), child);
 
   gtk_path_bar_update_button_appearance (path_bar, button_data, current_dir);
 
diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index 348889996a..433d09909e 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -739,7 +739,7 @@ gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self)
 
         gtk_widget_add_css_class (w, "circular");
 
-        label = gtk_bin_get_child (GTK_BIN (w));
+        label = gtk_button_get_child (GTK_BUTTON (w));
         gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
       }
 
diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index 4d9064260e..b8958f4703 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -128,10 +128,6 @@ rebuild_child (GtkWidget   *self,
 {
   GtkWidget *button_child;
 
-  button_child = gtk_bin_get_child (GTK_BIN (self));
-  if (button_child != NULL)
-    gtk_container_remove (GTK_CONTAINER (self), button_child);
-
   button_child = NULL;
 
   if (icon_name != NULL)
@@ -157,7 +153,7 @@ rebuild_child (GtkWidget   *self,
   if (button_child)
     {
       gtk_widget_set_halign (GTK_WIDGET (button_child), GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (self), button_child);
+      gtk_button_set_child (GTK_BUTTON (self), button_child);
     }
 }
 
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index a9dc35e2bd..923712126b 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -897,7 +897,7 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
     }
 
   gtk_container_add (GTK_CONTAINER (priv->frame), child);
-  gtk_container_add (GTK_CONTAINER (priv->button), hbox);
+  gtk_button_set_child (GTK_BUTTON (priv->button), hbox);
 }
 
 static void 
@@ -917,7 +917,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
   else
     model = NULL;
 
-  hbox = gtk_bin_get_child (GTK_BIN (priv->button));
+  hbox = gtk_button_get_child (GTK_BUTTON (priv->button));
   frame = priv->frame;
   arrow = priv->arrow;
   current_child = gtk_widget_get_first_child (frame);
diff --git a/gtk/gtkwindowcontrols.c b/gtk/gtkwindowcontrols.c
index 797a24cff3..8d6fce978f 100644
--- a/gtk/gtkwindowcontrols.c
+++ b/gtk/gtkwindowcontrols.c
@@ -301,7 +301,7 @@ update_window_buttons (GtkWindowControls *self)
           gtk_widget_add_css_class (button, "minimize");
           image = gtk_image_new_from_icon_name ("window-minimize-symbolic");
           g_object_set (image, "use-fallback", TRUE, NULL);
-          gtk_container_add (GTK_CONTAINER (button), image);
+          gtk_button_set_child (GTK_BUTTON (button), image);
           gtk_widget_set_can_focus (button, FALSE);
           gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
                                           "window.minimize");
@@ -322,7 +322,7 @@ update_window_buttons (GtkWindowControls *self)
           gtk_widget_add_css_class (button, "maximize");
           image = gtk_image_new_from_icon_name (icon_name);
           g_object_set (image, "use-fallback", TRUE, NULL);
-          gtk_container_add (GTK_CONTAINER (button), image);
+          gtk_button_set_child (GTK_BUTTON (button), image);
           gtk_widget_set_can_focus (button, FALSE);
           gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
                                           "window.toggle-maximized");
@@ -339,7 +339,7 @@ update_window_buttons (GtkWindowControls *self)
           image = gtk_image_new_from_icon_name ("window-close-symbolic");
           gtk_widget_add_css_class (button, "close");
           g_object_set (image, "use-fallback", TRUE, NULL);
-          gtk_container_add (GTK_CONTAINER (button), image);
+          gtk_button_set_child (GTK_BUTTON (button), image);
           gtk_widget_set_can_focus (button, FALSE);
           gtk_actionable_set_action_name (GTK_ACTIONABLE (button),
                                           "window.close");
diff --git a/gtk/inspector/action-editor.c b/gtk/inspector/action-editor.c
index ef6319cc96..b435fcee7f 100644
--- a/gtk/inspector/action-editor.c
+++ b/gtk/inspector/action-editor.c
@@ -133,10 +133,10 @@ variant_editor_set_value (GtkWidget *editor,
       GtkWidget *child;
 
       gtk_toggle_button_set_active (tb, g_variant_get_boolean (value));
-      child = gtk_bin_get_child (GTK_BIN (tb));
+      child = gtk_button_get_child (GTK_BUTTON (tb));
       gtk_label_set_text (GTK_LABEL (child),
-                          g_variant_get_boolean (value) ? "TRUE" : "FALSE");    
-    }   
+                          g_variant_get_boolean (value) ? "TRUE" : "FALSE");
+    }
   else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
     {
       GtkEntry *entry = GTK_ENTRY (editor);
diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c
index bc720a4b19..5676b3586e 100644
--- a/gtk/inspector/object-tree.c
+++ b/gtk/inspector/object-tree.c
@@ -1025,7 +1025,7 @@ gtk_inspector_object_tree_create_list_widget (gpointer row_item,
       gtk_container_add (GTK_CONTAINER (child), title);
 
       arrow = gtk_builtin_icon_new ("expander");
-      gtk_container_add (GTK_CONTAINER (title), arrow);
+      gtk_button_set_child (GTK_BUTTON (title), arrow);
     }
   else
     {
diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index 3c5a008772..7d9551ea3a 100644
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -194,7 +194,7 @@ main (int    argc,
 
           gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("│Xyj,Ö"));
           gtk_container_add (GTK_CONTAINER (box), gtk_image_new_from_icon_name ("face-sad"));
-          gtk_container_add (GTK_CONTAINER (button), box);
+          gtk_button_set_child (GTK_BUTTON (button), box);
 
           set_font_size (button, i);
 
@@ -286,7 +286,7 @@ main (int    argc,
 
           gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("│Xyj,Ö"));
           gtk_container_add (GTK_CONTAINER (box), gtk_image_new_from_icon_name ("face-sad"));
-          gtk_container_add (GTK_CONTAINER (button), box);
+          gtk_button_set_child (GTK_BUTTON (button), box);
 
           set_font_size (button, i);
 
@@ -377,7 +377,7 @@ main (int    argc,
           image = gtk_image_new_from_icon_name ("face-sad");
           gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
           gtk_container_add (GTK_CONTAINER (box), image);
-          gtk_container_add (GTK_CONTAINER (button), box);
+          gtk_button_set_child (GTK_BUTTON (button), box);
 
 	  if (i == 0)
 	    g_signal_connect (spin2, "value-changed", (GCallback)image_size_value_changed, image);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 432dc1d810..f123ed07b1 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1190,7 +1190,7 @@ create_rotated_text (GtkWidget *widget)
       g_signal_connect (drawing_area, "unrealize",
 			G_CALLBACK (on_rotated_text_unrealize), NULL);
 
-      gtk_widget_show (gtk_bin_get_child (GTK_BIN (window)));
+      gtk_widget_show (gtk_button_get_child (GTK_BUTTON (window)));
 
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (drawing_area), DEFAULT_TEXT_RADIUS * 2);
       gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (drawing_area), DEFAULT_TEXT_RADIUS * 2);
@@ -1251,7 +1251,7 @@ create_pixbuf (GtkWidget *widget)
       box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (box3), pixbufwid);
       gtk_container_add (GTK_CONTAINER (box3), label);
-      gtk_container_add (GTK_CONTAINER (button), box3);
+      gtk_button_set_child (GTK_BUTTON (button), box3);
 
       button = gtk_button_new ();
       gtk_container_add (GTK_CONTAINER (box2), button);
@@ -1262,7 +1262,7 @@ create_pixbuf (GtkWidget *widget)
       box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (box3), pixbufwid);
       gtk_container_add (GTK_CONTAINER (box3), label);
-      gtk_container_add (GTK_CONTAINER (button), box3);
+      gtk_button_set_child (GTK_BUTTON (button), box3);
 
       gtk_widget_set_sensitive (button, FALSE);
 
@@ -1629,8 +1629,7 @@ accel_button_new (const gchar *text,
 
   label = gtk_accel_label_new (text);
   gtk_accel_label_set_accel (GTK_ACCEL_LABEL (label), keyval, modifiers);
-  
-  gtk_container_add (GTK_CONTAINER (button), label);
+  gtk_button_set_child (GTK_BUTTON (button), label);
 
   return button;
 }
@@ -2159,7 +2158,7 @@ create_entry (GtkWidget *widget)
       gtk_combo_box_text_append_text (cb, "item8 item8 item8");
       gtk_combo_box_text_append_text (cb, "item9 item9");
 
-      cb_entry = gtk_bin_get_child (GTK_BIN (cb));
+      cb_entry = gtk_button_get_child (GTK_BUTTON (cb));
       gtk_editable_set_text (GTK_EDITABLE (cb_entry), "hello world \n\n\n foo");
       gtk_editable_select_region (GTK_EDITABLE (cb_entry), 0, -1);
       gtk_container_add (GTK_CONTAINER (box2), GTK_WIDGET (cb));
@@ -2255,7 +2254,7 @@ static void
 size_group_hsize_changed (GtkSpinButton *spin_button,
 			  GtkWidget     *button)
 {
-  gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (button)),
+  gtk_widget_set_size_request (gtk_button_get_child (GTK_BUTTON (button)),
 			       gtk_spin_button_get_value_as_int (spin_button),
 			       -1);
 }
@@ -2264,7 +2263,7 @@ static void
 size_group_vsize_changed (GtkSpinButton *spin_button,
 			  GtkWidget     *button)
 {
-  gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (button)),
+  gtk_widget_set_size_request (gtk_button_get_child (GTK_BUTTON (button)),
 			       -1,
 			       gtk_spin_button_get_value_as_int (spin_button));
 }
@@ -2323,7 +2322,7 @@ create_size_group_window (GdkDisplay   *display,
   gtk_size_group_add_widget (master_size_group, main_button);
   gtk_size_group_add_widget (hgroup1, main_button);
   gtk_size_group_add_widget (vgroup1, main_button);
-  gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (main_button)),
+  gtk_widget_set_size_request (gtk_button_get_child (GTK_BUTTON (main_button)),
 			       SIZE_GROUP_INITIAL_SIZE,
 			       SIZE_GROUP_INITIAL_SIZE);
 
@@ -3569,7 +3568,7 @@ create_display_screen (GtkWidget *widget)
   combo_dpy = gtk_combo_box_text_new_with_entry ();
   gtk_widget_set_hexpand (combo_dpy, TRUE);
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_dpy), "diabolo:0.0");
-  gtk_editable_set_text (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (combo_dpy))),
+  gtk_editable_set_text (GTK_EDITABLE (gtk_button_get_child (GTK_BUTTON (combo_dpy))),
                          "<hostname>:<X Server Num>.<Screen Num>");
 
   gtk_grid_attach (GTK_GRID (grid), label_dpy, 0, 0, 1, 1);
@@ -3587,7 +3586,7 @@ create_display_screen (GtkWidget *widget)
 
   scr_dpy_data = g_new0 (ScreenDisplaySelection, 1);
 
-  scr_dpy_data->entry = gtk_bin_get_child (GTK_BIN (combo_dpy));
+  scr_dpy_data->entry = gtk_button_get_child (GTK_BUTTON (combo_dpy));
   scr_dpy_data->toplevel = GTK_WIDGET (gtk_widget_get_root (widget));
   scr_dpy_data->dialog_window = window;
 
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index a065b01a23..8fea9d36ac 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -106,7 +106,7 @@ change_header (GtkButton *button, gpointer data)
       widget= gtk_button_new ();
       image = gtk_image_new_from_icon_name ("bookmark-new-symbolic");
       g_signal_connect (widget, "clicked", G_CALLBACK (on_bookmark_clicked), window);
-      gtk_container_add (GTK_CONTAINER (widget), image);
+      gtk_button_set_child (GTK_BUTTON (widget), image);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), widget);
     }
diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index a638131871..c39687c458 100644
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (vbox), hbox);
   button = gtk_button_new_with_mnemonic ("<b>_Futz!!</b>");
   gtk_container_add (GTK_CONTAINER (hbox), button);
-  gtk_label_set_use_markup (GTK_LABEL (gtk_bin_get_child (GTK_BIN (button))), TRUE);
+  gtk_label_set_use_markup (GTK_LABEL (gtk_button_get_child (GTK_BUTTON (button))), TRUE);
   g_signal_connect (button, "clicked", G_CALLBACK (futz), NULL);
   g_signal_connect (button, "realize", G_CALLBACK (gtk_widget_grab_focus), NULL);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);