checkbutton: Make the child expand

This is the proper behavior for check buttons -
the indicator is fixed size, and the child takes
all the remaining space.

.gitlab-ci.yml

@@ -104,7 +104,7 @@ release-build:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
   cache:
-    key: "$CI_JOB_NAME"
+    key: "${env:CI_JOB_NAME}"
     <<: *cache-paths
 
 msys2-mingw32:

.gitlab-ci/test-msys2.sh

@@ -37,9 +37,6 @@ pacman --noconfirm -S --needed \
 wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
 pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
 
-# https://github.com/msys2/MINGW-packages/pull/6465
-pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli
-
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
@@ -48,14 +45,11 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
-# FIXME: introspection disabled for now because of
-# https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/340
 meson \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \
     -Dvulkan=no \
-    -Dintrospection=false \
     --werror \
     _build
 unset CCACHE_DISABLE

CONTRIBUTING.md

@@ -22,7 +22,12 @@ Please, do not use the issue tracker for support questions. If you have
 questions on how to use GTK effectively, you can use:
 
  - the `#gtk` IRC channel on irc.gnome.org
- - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
+ - the [gtk](https://mail.gnome.org/mailman/listinfo/gtk-list) mailing list,
+   for general questions on GTK
+ - the [gtk-app-devel](https://mail.gnome.org/mailman/listinfo/gtk-app-devel-list)
+   mailing list, for questions on application development with GTK
+ - the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
+   mailing list, for questions on developing GTK itself
 
 You can also look at the GTK tag on [Stack
 Overflow](https://stackoverflow.com/questions/tagged/gtk).

NEWS

@@ -1,83 +1,3 @@
-Overview of Changes in GTK 3.98.4
-=================================
-
-* Themes
- - Refine menu styling
- - Add public colors to HighContrast
- - Fix scale borders in HighContrast
- - Tweak visible focus behavior
-
-* CSS:
- - Drop the nonstandard -gtk-icon-theme property
- - Add a system_setting_changed vfunc to propagate global changes
-
-* Untangle titlebars from windows:
- - Add a GtkWindowControls widget
- - Add a GtkWindowHandle widget
- - Add actions for window menu items
- - Remove app menu fallback from GtkHeaderBar
- - Remove title and subtitle properties from GtkHeaderBar,
-   rename custom-title to title-widget
-
-* GtkWidget
- - Add a focusable property
-
-* GtkPopover:
- -  Fix (re-)positioning issues
-
-* GtkStack:
- - Drop the homogeneous property
- - Add a use-underline property to stack pages
-
-* GtkTreeView:
- - Break reference cycles in unroot
-
-* Drop GtkBin and GtkContainer. All existing GtkBin subclasses
-  have grown a child property with setter and getter. All
-  existing GtkContainer subclasses have grown widget-specific
-  remove (and in some cases, add) functions. <child> in ui
-  files continues to work as before
-
-* Replace gtk_widget_destroy by gtk_window_destroy
-
-* Drop the ::size-allocate signal. Use a GtkWidgetPaintable
-  if you need to be informed about changes to a widgets
-  content or size
-
-* Remove gtk_dialog_run
-
-* Wayland:
- - Provide a builtin cursor of last resort
-
-* GSK:
- - Don't include renderer-specific headers automatically
-
-* Introspection:
- - Assorted annotation fixes
-
-* Inspector:
- - Preview media resources
- - Show media backend information
-
-* gtk4-widget-factory:
- - Add GtkVideo
- - Add text styles
- - Add a print dialog
- - Add a password entry
- - Improve toolbar styling
- - Revamp transition effects
-
-* gtk4-demo:
- - Replace some demos
-
-* Translation updates:
- Chinese (Taiwan)
- Esperanto
- Romanian
- Spanish
- Ukrainian
-
-
 Overview of Changes in GTK 3.98.3
 =================================
 

demos/constraint-editor/constraint-editor-window.c

@@ -317,7 +317,7 @@ save_response_cb (GtkNativeDialog        *dialog,
                                                    "Saving failed");
           gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog),
                                                     "%s", error->message);
-          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
           gtk_widget_show (message_dialog);
           g_error_free (error);
         }
@@ -403,7 +403,7 @@ constraint_editor_done (ConstraintEditor *editor,
 
   g_clear_object (&old_constraint);
 
-  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
+  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
 }
 
 static void
@@ -444,7 +444,7 @@ guide_editor_done (GuideEditor            *editor,
                    GtkConstraintGuide     *guide,
                    ConstraintEditorWindow *win)
 {
-  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
+  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
 }
 
 static void
@@ -607,8 +607,8 @@ create_widget_func (gpointer item,
   gtk_widget_set_margin_bottom (label, 10);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   gtk_widget_set_hexpand (label, TRUE);
-  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_container_add (GTK_CONTAINER (box), label);
 
   if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
     {
@@ -616,18 +616,18 @@ create_widget_func (gpointer item,
       gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
       g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
       g_object_set_data (G_OBJECT (row), "edit", button);
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
       button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
       gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
       g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
     }
   else if (GTK_IS_WIDGET (item))
     {
       button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
       gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
       g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
     }
 
   g_free (freeme);

demos/gtk-demo/application.c

@@ -47,7 +47,7 @@ show_action_dialog (GSimpleAction *action)
                                     name);
 
   g_signal_connect (dialog, "response",
-                    G_CALLBACK (gtk_window_destroy), NULL);
+                    G_CALLBACK (gtk_widget_destroy), NULL);
 
   gtk_widget_show (dialog);
 }
@@ -120,7 +120,7 @@ open_response_cb (GtkNativeDialog *dialog,
                                                    "Error loading file: \"%s\"",
                                                    error->message);
           g_signal_connect (message_dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);
           gtk_widget_show (message_dialog);
           g_error_free (error);
         }
@@ -234,7 +234,7 @@ activate_quit (GSimpleAction *action,
       win = list->data;
       next = list->next;
 
-      gtk_window_destroy (GTK_WINDOW (win));
+      gtk_widget_destroy (GTK_WIDGET (win));
 
       list = next;
     }
@@ -503,13 +503,13 @@ demo_application_window_unrealize (GtkWidget *widget)
 }
 
 static void
-demo_application_window_dispose (GObject *object)
+demo_application_window_destroy (GtkWidget *widget)
 {
-  DemoApplicationWindow *window = (DemoApplicationWindow *)object;
+  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
 
   demo_application_window_store_state (window);
 
-  G_OBJECT_CLASS (demo_application_window_parent_class)->dispose (object);
+  GTK_WIDGET_CLASS (demo_application_window_parent_class)->destroy (widget);
 }
 
 static void
@@ -519,11 +519,11 @@ demo_application_window_class_init (DemoApplicationWindowClass *class)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
   object_class->constructed = demo_application_window_constructed;
-  object_class->dispose = demo_application_window_dispose;
 
   widget_class->size_allocate = demo_application_window_size_allocate;
   widget_class->realize = demo_application_window_realize;
   widget_class->unrealize = demo_application_window_unrealize;
+  widget_class->destroy = demo_application_window_destroy;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");
   gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, message);

demos/gtk-demo/application_demo.c

@@ -31,7 +31,12 @@ on_name_vanished (GDBusConnection *connection,
   if (!name_seen)
     return;
 
-  g_clear_object (&placeholder);
+  if (placeholder)
+    {
+      gtk_widget_destroy (placeholder);
+      g_object_unref (placeholder);
+      placeholder = NULL;
+    }
 }
 
 #ifdef G_OS_WIN32

demos/gtk-demo/assistant.c

@@ -26,7 +26,7 @@ apply_changes_gradually (gpointer data)
   else
     {
       /* Close automatically once changes are fully applied. */
-      gtk_window_destroy (GTK_WINDOW (data));
+      gtk_widget_destroy (data);
       return G_SOURCE_REMOVE;
     }
 }
@@ -41,7 +41,7 @@ on_assistant_apply (GtkWidget *widget, gpointer data)
 static void
 on_assistant_close_cancel (GtkWidget *widget, gpointer data)
 {
-  gtk_window_destroy (GTK_WINDOW (widget));
+  gtk_widget_destroy (widget);
 }
 
 static void
@@ -95,12 +95,12 @@ create_page1 (GtkWidget *assistant)
   gtk_widget_set_margin_bottom (box, 12);
 
   label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (box), label);
 
   entry = gtk_entry_new ();
   gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
   gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_box_append (GTK_BOX (box), entry);
+  gtk_container_add (GTK_CONTAINER (box), entry);
   g_signal_connect (G_OBJECT (entry), "changed",
                     G_CALLBACK (on_entry_changed), assistant);
 
@@ -123,7 +123,7 @@ create_page2 (GtkWidget *assistant)
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                  "even if you do not check this");
   gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER);
-  gtk_box_append (GTK_BOX (box), checkbutton);
+  gtk_container_add (GTK_CONTAINER (box), checkbutton);
 
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
@@ -178,7 +178,8 @@ do_assistant (GtkWidget *do_widget)
 
       gtk_window_set_display (GTK_WINDOW (assistant),
                               gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (assistant), (gpointer *)&assistant);
+      g_signal_connect (assistant, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &assistant);
 
       create_page1 (assistant);
       create_page2 (assistant);
@@ -198,7 +199,7 @@ do_assistant (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
-    gtk_window_destroy (GTK_WINDOW (assistant));
+    gtk_widget_destroy (assistant);
 
   return assistant;
 }

demos/gtk-demo/builder.c

@@ -12,7 +12,7 @@ quit_activate (GSimpleAction *action,
 {
   GtkWidget *window = user_data;
 
-  gtk_window_destroy (GTK_WINDOW (window));
+  gtk_widget_destroy (window);
 }
 
 static void
@@ -26,10 +26,8 @@ about_activate (GSimpleAction *action,
 
   builder = g_object_get_data (G_OBJECT (window), "builder");
   about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
-  gtk_window_set_transient_for (GTK_WINDOW (about_dlg), GTK_WINDOW (window));
-  gtk_window_set_hide_on_close (GTK_WINDOW (about_dlg), TRUE);
-  g_signal_connect (about_dlg, "response", G_CALLBACK (gtk_widget_hide), NULL);
-  gtk_widget_show (about_dlg);
+  gtk_dialog_run (GTK_DIALOG (about_dlg));
+  gtk_widget_hide (about_dlg);
 }
 
 static void
@@ -76,7 +74,8 @@ do_builder (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       actions = (GActionGroup*)g_simple_action_group_new ();
       g_action_map_add_action_entries (G_ACTION_MAP (actions),
                                        win_entries, G_N_ELEMENTS (win_entries),
@@ -89,7 +88,7 @@ do_builder (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/clipboard.c

@@ -69,7 +69,7 @@ paste_received (GObject      *source_object,
                                        "Could not paste text: %s",
                                        error->message);
       g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_window_destroy), NULL);
+                        G_CALLBACK (gtk_widget_destroy), NULL);
       gtk_widget_show (dialog);
 
       g_error_free (error);
@@ -108,7 +108,9 @@ do_clipboard (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_widget_set_margin_start (vbox, 8);
@@ -120,72 +122,72 @@ do_clipboard (GtkWidget *do_widget)
 
       label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
 
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_widget_set_margin_start (hbox, 8);
       gtk_widget_set_margin_end (hbox, 8);
       gtk_widget_set_margin_top (hbox, 8);
       gtk_widget_set_margin_bottom (hbox, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
       /* Create the first entry */
       entry = gtk_entry_new ();
-      gtk_box_append (GTK_BOX (hbox), entry);
+      gtk_container_add (GTK_CONTAINER (hbox), entry);
 
       /* Create the button */
       button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (copy_button_clicked), entry);
 
       label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_widget_set_margin_start (hbox, 8);
       gtk_widget_set_margin_end (hbox, 8);
       gtk_widget_set_margin_top (hbox, 8);
       gtk_widget_set_margin_bottom (hbox, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
       /* Create the second entry */
       entry = gtk_entry_new ();
-      gtk_box_append (GTK_BOX (hbox), entry);
+      gtk_container_add (GTK_CONTAINER (hbox), entry);
 
       /* Create the button */
       button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (paste_button_clicked), entry);
 
       label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_widget_set_margin_start (hbox, 8);
       gtk_widget_set_margin_end (hbox, 8);
       gtk_widget_set_margin_top (hbox, 8);
       gtk_widget_set_margin_bottom (hbox, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
       /* Create the first image */
       image = demo_image_new ("dialog-warning");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);
 
       /* Create the second image */
       image = demo_image_new ("process-stop");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);
 
       /* Create the third image */
       image = demo_image_new ("weather-clear");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/combobox.c

@@ -315,7 +315,9 @@ do_combobox (GtkWidget *do_widget)
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");
-    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &window);
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
     gtk_widget_set_margin_start (vbox, 10);
@@ -328,7 +330,7 @@ do_combobox (GtkWidget *do_widget)
      *  insensitive rows
      */
     frame = gtk_frame_new ("Items with icons");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_margin_start (box, 5);
@@ -340,7 +342,7 @@ do_combobox (GtkWidget *do_widget)
     model = create_icon_store ();
     combo = gtk_combo_box_new_with_model (model);
     g_object_unref (model);
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);
 
     renderer = gtk_cell_renderer_pixbuf_new ();
     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
@@ -372,7 +374,7 @@ do_combobox (GtkWidget *do_widget)
     /* A combobox demonstrating trees.
      */
     frame = gtk_frame_new ("Where are we ?");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_margin_start (box, 5);
@@ -384,7 +386,7 @@ do_combobox (GtkWidget *do_widget)
     model = create_capital_store ();
     combo = gtk_combo_box_new_with_model (model);
     g_object_unref (model);
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);
 
     renderer = gtk_cell_renderer_text_new ();
     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
@@ -403,7 +405,7 @@ do_combobox (GtkWidget *do_widget)
 
     /* A GtkComboBoxEntry with validation */
     frame = gtk_frame_new ("Editable");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_margin_start (box, 5);
@@ -414,7 +416,7 @@ do_combobox (GtkWidget *do_widget)
 
     combo = gtk_combo_box_text_new_with_entry ();
     fill_combo_entry (combo);
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);
 
     entry = g_object_new (TYPE_MASK_ENTRY, NULL);
     MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
@@ -423,7 +425,7 @@ do_combobox (GtkWidget *do_widget)
 
     /* A combobox with string IDs */
     frame = gtk_frame_new ("String IDs");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_widget_set_margin_start (box, 5);
@@ -436,19 +438,19 @@ do_combobox (GtkWidget *do_widget)
     gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
     gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
     gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);
 
     entry = gtk_entry_new ();
     g_object_bind_property (combo, "active-id",
                             entry, "text",
                             G_BINDING_BIDIRECTIONAL);
-    gtk_box_append (GTK_BOX (box), entry);
+    gtk_container_add (GTK_CONTAINER (box), entry);
   }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/constraints.c

@@ -21,24 +21,23 @@ struct _SimpleGrid
 G_DEFINE_TYPE (SimpleGrid, simple_grid, GTK_TYPE_WIDGET)
 
 static void
-simple_grid_dispose (GObject *object)
+simple_grid_destroy (GtkWidget *widget)
 {
-  SimpleGrid *self = SIMPLE_GRID (object);
+  SimpleGrid *self = SIMPLE_GRID (widget);
 
-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);
 
-  G_OBJECT_CLASS (simple_grid_parent_class)->dispose (object);
+  GTK_WIDGET_CLASS (simple_grid_parent_class)->destroy (widget);
 }
 
 static void
 simple_grid_class_init (SimpleGridClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  object_class->dispose = simple_grid_dispose;
+  widget_class->destroy = simple_grid_destroy;
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -263,7 +262,8 @@ do_constraints (GtkWidget *do_widget)
      header = gtk_header_bar_new ();
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
      gtk_window_set_child (GTK_WINDOW (window), box);
@@ -271,19 +271,19 @@ do_constraints (GtkWidget *do_widget)
      grid = g_object_new (simple_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);
      gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);
 
      button = gtk_button_new_with_label ("Close");
-     gtk_box_append (GTK_BOX (box), button);
+     gtk_container_add (GTK_CONTAINER (box), button);
      gtk_widget_set_hexpand (grid, TRUE);
      g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_window_destroy), window);
+                               G_CALLBACK (gtk_widget_destroy), window);
    }
 
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-   gtk_window_destroy (GTK_WINDOW (window));
+   gtk_widget_destroy (window);
 
  return window;
 }

demos/gtk-demo/constraints2.c

@@ -22,24 +22,23 @@ struct _InteractiveGrid
 G_DEFINE_TYPE (InteractiveGrid, interactive_grid, GTK_TYPE_WIDGET)
 
 static void
-interactive_grid_dispose (GObject *object)
+interactive_grid_destroy (GtkWidget *widget)
 {
-  InteractiveGrid *self = INTERACTIVE_GRID (object);
+  InteractiveGrid *self = INTERACTIVE_GRID (widget);
 
-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);
 
-  G_OBJECT_CLASS (interactive_grid_parent_class)->dispose (object);
+  GTK_WIDGET_CLASS (interactive_grid_parent_class)->destroy (widget);
 }
 
 static void
 interactive_grid_class_init (InteractiveGridClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  object_class->dispose = interactive_grid_dispose;
+  widget_class->destroy = interactive_grid_destroy;
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -219,7 +218,8 @@ do_constraints2 (GtkWidget *do_widget)
      header = gtk_header_bar_new ();
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
      gtk_window_set_child (GTK_WINDOW (window), box);
@@ -227,19 +227,19 @@ do_constraints2 (GtkWidget *do_widget)
      grid = g_object_new (interactive_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);
      gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);
 
      button = gtk_button_new_with_label ("Close");
-     gtk_box_append (GTK_BOX (box), button);
+     gtk_container_add (GTK_CONTAINER (box), button);
      gtk_widget_set_hexpand (grid, TRUE);
      g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_window_destroy), window);
+                               G_CALLBACK (gtk_widget_destroy), window);
    }
 
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-   gtk_window_destroy (GTK_WINDOW (window));
+   gtk_widget_destroy (window);
 
  return window;
 }

demos/gtk-demo/constraints3.c

@@ -20,24 +20,23 @@ struct _VflGrid
 G_DEFINE_TYPE (VflGrid, vfl_grid, GTK_TYPE_WIDGET)
 
 static void
-vfl_grid_dispose (GObject *object)
+vfl_grid_destroy (GtkWidget *widget)
 {
-  VflGrid *self = VFL_GRID (object);
+  VflGrid *self = VFL_GRID (widget);
 
-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);
 
-  G_OBJECT_CLASS (vfl_grid_parent_class)->dispose (object);
+  GTK_WIDGET_CLASS (vfl_grid_parent_class)->destroy (widget);
 }
 
 static void
 vfl_grid_class_init (VflGridClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  object_class->dispose = vfl_grid_dispose;
+  widget_class->destroy = vfl_grid_destroy;
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -139,7 +138,8 @@ do_constraints3 (GtkWidget *do_widget)
      header = gtk_header_bar_new ();
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
      gtk_window_set_child (GTK_WINDOW (window), box);
@@ -147,19 +147,19 @@ do_constraints3 (GtkWidget *do_widget)
      grid = g_object_new (vfl_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);
      gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);
 
      button = gtk_button_new_with_label ("Close");
-     gtk_box_append (GTK_BOX (box), button);
+     gtk_container_add (GTK_CONTAINER (box), button);
      gtk_widget_set_hexpand (grid, TRUE);
      g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_window_destroy), window);
+                               G_CALLBACK (gtk_widget_destroy), window);
    }
 
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-   gtk_window_destroy (GTK_WINDOW (window));
+   gtk_widget_destroy (window);
 
  return window;
 }

demos/gtk-demo/css_accordion.c

@@ -9,13 +9,9 @@
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }
 
 GtkWidget *
@@ -32,7 +28,8 @@ do_css_accordion (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "CSS Accordion");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
@@ -40,22 +37,22 @@ do_css_accordion (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), container);
 
       child = gtk_button_new_with_label ("This");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
 
       child = gtk_button_new_with_label ("Is");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
 
       child = gtk_button_new_with_label ("A");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
 
       child = gtk_button_new_with_label ("CSS");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
 
       child = gtk_button_new_with_label ("Accordion");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
 
       child = gtk_button_new_with_label (":-)");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
       gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), "/css_accordion/css_accordion.css");
@@ -66,7 +63,7 @@ do_css_accordion (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/css_basics.c

@@ -55,13 +55,9 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }
 
 GtkWidget *
@@ -80,7 +76,8 @@ do_css_basics (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       text = gtk_text_buffer_new (NULL);
       gtk_text_buffer_create_tag (text,
@@ -97,7 +94,7 @@ do_css_basics (GtkWidget *do_widget)
       container = gtk_scrolled_window_new (NULL, NULL);
       gtk_window_set_child (GTK_WINDOW (window), container);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
       g_signal_connect (text, "changed",
                         G_CALLBACK (css_text_changed), provider);
 
@@ -116,7 +113,7 @@ do_css_basics (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/css_blendmodes.c

@@ -79,7 +79,7 @@ setup_listbox (GtkBuilder       *builder,
 
   normal_row = NULL;
   listbox = gtk_list_box_new ();
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (WID ("scrolledwindow")), listbox);
+  gtk_container_add (GTK_CONTAINER (WID ("scrolledwindow")), listbox);
 
   g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), provider);
 
@@ -95,8 +95,9 @@ setup_listbox (GtkBuilder       *builder,
                             "xalign", 0.0,
                             NULL);
 
-      gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), label);
-      gtk_list_box_insert (GTK_LIST_BOX (listbox), row, -1);
+      gtk_container_add (GTK_CONTAINER (row), label);
+
+      gtk_container_add (GTK_CONTAINER (listbox), row);
 
       /* The first selected row is "normal" */
       if (g_strcmp0 (blend_modes[i].id, "normal") == 0)
@@ -124,7 +125,7 @@ do_css_blendmodes (GtkWidget *do_widget)
 
       window = WID ("window");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
       /* Setup the CSS provider for window */
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
@@ -139,7 +140,7 @@ do_css_blendmodes (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/css_multiplebgs.c

@@ -69,13 +69,9 @@ drawing_area_draw (GtkDrawingArea *da,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }
 
 GtkWidget *
@@ -94,7 +90,8 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       container = gtk_overlay_new ();
       gtk_window_set_child (GTK_WINDOW (window), container);
@@ -104,7 +101,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
                                       drawing_area_draw,
                                       NULL, NULL);
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
 
       child = gtk_button_new ();
       gtk_overlay_add_overlay (GTK_OVERLAY (container), child);
@@ -118,7 +115,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
 
       /* Need a filler so we get a handle */
       child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_paned_set_start_child (GTK_PANED (paned), child);
+      gtk_container_add (GTK_CONTAINER (paned), child);
 
       text = gtk_text_buffer_new (NULL);
       gtk_text_buffer_create_tag (text,
@@ -133,9 +130,9 @@ do_css_multiplebgs (GtkWidget *do_widget)
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
       container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_paned_set_end_child (GTK_PANED (paned), container);
+      gtk_container_add (GTK_CONTAINER (paned), container);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
       g_signal_connect (text,
                         "changed",
                         G_CALLBACK (css_text_changed),
@@ -156,7 +153,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/css_pixbufs.c

@@ -55,13 +55,9 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }
 
 GtkWidget *
@@ -80,14 +76,15 @@ do_css_pixbufs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_window_set_child (GTK_WINDOW (window), paned);
 
       /* Need a filler so we get a handle */
       child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_paned_set_start_child (GTK_PANED (paned), child);
+      gtk_container_add (GTK_CONTAINER (paned), child);
 
       text = gtk_text_buffer_new (NULL);
       gtk_text_buffer_create_tag (text,
@@ -102,9 +99,9 @@ do_css_pixbufs (GtkWidget *do_widget)
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
       container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_paned_set_end_child (GTK_PANED (paned), container);
+      gtk_container_add (GTK_CONTAINER (paned), container);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
       g_signal_connect (text, "changed",
                         G_CALLBACK (css_text_changed), provider);
 
@@ -123,7 +120,7 @@ do_css_pixbufs (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/css_shadows.c

@@ -53,13 +53,9 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }
 
 static GtkWidget *
@@ -72,13 +68,13 @@ create_toolbar (void)
   gtk_widget_set_valign (toolbar, GTK_ALIGN_CENTER);
 
   item = gtk_button_new_from_icon_name ("go-next");
-  gtk_box_append (GTK_BOX (toolbar), item);
+  gtk_container_add (GTK_CONTAINER (toolbar), item);
 
   item = gtk_button_new_from_icon_name ("go-previous");
-  gtk_box_append (GTK_BOX (toolbar), item);
+  gtk_container_add (GTK_CONTAINER (toolbar), item);
 
   item = gtk_button_new_with_label ("Hello World");
-  gtk_box_append (GTK_BOX (toolbar), item);
+  gtk_container_add (GTK_CONTAINER (toolbar), item);
 
   return toolbar;
 }
@@ -99,13 +95,14 @@ do_css_shadows (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Shadows");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       gtk_window_set_child (GTK_WINDOW (window), paned);
 
       child = create_toolbar ();
-      gtk_paned_set_start_child (GTK_PANED (paned), child);
+      gtk_container_add (GTK_CONTAINER (paned), child);
 
       text = gtk_text_buffer_new (NULL);
       gtk_text_buffer_create_tag (text,
@@ -120,9 +117,9 @@ do_css_shadows (GtkWidget *do_widget)
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
       container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_paned_set_end_child (GTK_PANED (paned), container);
+      gtk_container_add (GTK_CONTAINER (paned), container);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
       g_signal_connect (text, "changed",
                         G_CALLBACK (css_text_changed), provider);
 
@@ -141,7 +138,7 @@ do_css_shadows (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/cursors.c

@@ -36,7 +36,7 @@ do_cursors (GtkWidget *do_widget)
     gtk_widget_show (window);
   else
     {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
     }
 
   return window;

demos/gtk-demo/demo.ui

@@ -94,7 +94,6 @@
   <object class="GtkAboutDialog" id="aboutdialog1">
     <property name="program-name" translatable="yes">Builder demo</property>
     <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
-    <property name="modal">True</property>
     <accessibility>
       <relation target="window1" type="subwindow-of"/>
     </accessibility>

demos/gtk-demo/demotaggedentry.c

@@ -49,7 +49,7 @@ demo_tagged_entry_init (DemoTaggedEntry *entry)
   gtk_widget_set_vexpand (priv->entry, TRUE);
   gtk_widget_set_hexpand (priv->box, FALSE);
   gtk_widget_set_vexpand (priv->box, FALSE);
-  gtk_box_append (GTK_BOX (priv->box), priv->entry);
+  gtk_container_add (GTK_CONTAINER (priv->box), priv->entry);
   gtk_editable_init_delegate (GTK_EDITABLE (entry));
 }
 
@@ -188,7 +188,7 @@ demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
 
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  gtk_box_append (GTK_BOX (priv->box), tag);
+  gtk_container_add (GTK_CONTAINER (priv->box), tag);
 }
 
 void
@@ -201,7 +201,7 @@ demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
   if (sibling == NULL)
-    gtk_box_append (GTK_BOX (priv->box), tag);
+    gtk_container_add (GTK_CONTAINER (priv->box), tag);
   else
     gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
 }
@@ -214,7 +214,7 @@ demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
 
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  gtk_box_remove (GTK_BOX (priv->box), tag);
+  gtk_container_remove (GTK_CONTAINER (priv->box), tag);
 }
 
 struct _DemoTaggedEntryTag
@@ -268,7 +268,7 @@ demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
   tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
   tag->label = gtk_label_new ("");
-  gtk_box_append (GTK_BOX (tag->box), tag->label);
+  gtk_container_add (GTK_CONTAINER (tag->box), tag->label);
 
   gesture = gtk_gesture_click_new ();
   g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag);
@@ -460,7 +460,7 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
 
   if (!has_close_button && tag->button)
     {
-      gtk_box_remove (GTK_BOX (tag->box), tag->button);
+      gtk_container_remove (GTK_CONTAINER (tag->box), tag->button);
       tag->button = NULL;
     }
   else if (has_close_button && tag->button == NULL)
@@ -469,11 +469,11 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
 
       image = gtk_image_new_from_icon_name ("window-close-symbolic");
       tag->button = gtk_button_new ();
-      gtk_box_append (GTK_BOX (tag->button), image);
+      gtk_container_add (GTK_CONTAINER (tag->button), image);
       gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
       gtk_button_set_has_frame (GTK_BUTTON (tag->button), FALSE);
-      gtk_box_append (GTK_BOX (tag->box), tag->button);
+      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
       g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
     }
 

demos/gtk-demo/dialog.c

@@ -25,36 +25,11 @@ message_dialog_clicked (GtkButton *button,
                                    "number of times:");
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                             "%d", i);
-  g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
-  gtk_widget_show (dialog);
+  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
   i++;
 }
 
-typedef struct {
-  GtkWidget *local_entry1;
-  GtkWidget *local_entry2;
-  GtkWidget *global_entry1;
-  GtkWidget *global_entry2;
-} ResponseData;
-
-static void
-on_dialog_response (GtkDialog *dialog,
-                    int        response,
-                    gpointer   user_data)
-{
-  ResponseData *data = user_data;
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_editable_set_text (GTK_EDITABLE (data->global_entry1),
-                             gtk_editable_get_text (GTK_EDITABLE (data->local_entry1)));
-      gtk_editable_set_text (GTK_EDITABLE (data->global_entry2),
-                             gtk_editable_get_text (GTK_EDITABLE (data->local_entry2)));
-    }
-
-  gtk_window_destroy (GTK_WINDOW (dialog));
-}
-
 static void
 interactive_dialog_clicked (GtkButton *button,
                             gpointer   user_data)
@@ -67,7 +42,7 @@ interactive_dialog_clicked (GtkButton *button,
   GtkWidget *local_entry1;
   GtkWidget *local_entry2;
   GtkWidget *label;
-  ResponseData *data;
+  gint response;
 
   dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
                                         GTK_WINDOW (window),
@@ -81,16 +56,16 @@ interactive_dialog_clicked (GtkButton *button,
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_append (GTK_BOX (content_area), hbox);
+  gtk_container_add (GTK_CONTAINER (content_area), hbox);
 
   image = gtk_image_new_from_icon_name ("dialog-question");
   gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-  gtk_box_append (GTK_BOX (hbox), image);
+  gtk_container_add (GTK_CONTAINER (hbox), image);
 
   table = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (table), 4);
   gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_box_append (GTK_BOX (hbox), table);
+  gtk_container_add (GTK_CONTAINER (hbox), table);
   label = gtk_label_new_with_mnemonic ("_Entry 1");
   gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
   local_entry1 = gtk_entry_new ();
@@ -106,18 +81,15 @@ interactive_dialog_clicked (GtkButton *button,
   gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);
 
-  data = g_new (ResponseData, 1);
-  data->local_entry1 = local_entry1;
-  data->local_entry2 = local_entry2;
-  data->global_entry1 = entry1;
-  data->global_entry2 = entry2;
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-  g_signal_connect_data (dialog, "response",
-                         G_CALLBACK (on_dialog_response),
-                         data, (GClosureNotify) g_free,
-                         0);
+  if (response == GTK_RESPONSE_OK)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (entry1), gtk_editable_get_text (GTK_EDITABLE (local_entry1)));
+      gtk_editable_set_text (GTK_EDITABLE (entry2), gtk_editable_get_text (GTK_EDITABLE (local_entry2)));
+    }
 
-  gtk_widget_show (dialog);
+  gtk_widget_destroy (dialog);
 }
 
 GtkWidget *
@@ -137,7 +109,9 @@ do_dialog (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       frame = gtk_frame_new ("Dialogs");
       gtk_widget_set_margin_start (frame, 8);
@@ -155,29 +129,29 @@ do_dialog (GtkWidget *do_widget)
 
       /* Standard message dialog */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
 
-      gtk_box_append (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+      gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
 
       /* Interactive dialog*/
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_box_append (GTK_BOX (hbox), vbox2);
-      gtk_box_append (GTK_BOX (vbox2), button);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox2);
+      gtk_container_add (GTK_CONTAINER (vbox2), button);
 
       table = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (table), 4);
       gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_box_append (GTK_BOX (hbox), table);
+      gtk_container_add (GTK_CONTAINER (hbox), table);
 
       label = gtk_label_new_with_mnemonic ("_Entry 1");
       gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
@@ -196,7 +170,7 @@ do_dialog (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/dnd.c

@@ -119,7 +119,7 @@ new_item_cb (GtkWidget *button, gpointer data)
   GtkWidget *item;
 
   item = canvas_item_new (pos_x, pos_y);
-  gtk_fixed_put (GTK_FIXED (canvas), item, 0, 0);
+  gtk_container_add (GTK_CONTAINER (canvas), item);
   apply_transform (item);
 
   gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
@@ -138,7 +138,7 @@ edit_label_done (GtkWidget *entry, gpointer data)
   gtk_label_set_text (GTK_LABEL (label), gtk_editable_get_text (GTK_EDITABLE (entry)));
   gtk_widget_show (label);
 
-  gtk_fixed_remove (GTK_FIXED (canvas), entry);
+  gtk_widget_destroy (entry);
 }
 
 static void
@@ -170,9 +170,7 @@ edit_cb (GtkWidget *button, GtkWidget *child)
 static void
 delete_cb (GtkWidget *button, GtkWidget *child)
 {
-  GtkWidget *canvas = gtk_widget_get_parent (child);
-
-  gtk_fixed_remove (GTK_FIXED (canvas), child);
+  gtk_widget_destroy (child);
 
   gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
@@ -204,30 +202,30 @@ pressed_cb (GtkGesture *gesture,
       gtk_popover_set_has_arrow (GTK_POPOVER (menu), FALSE);
       gtk_popover_set_pointing_to (GTK_POPOVER (menu), &(GdkRectangle){ x, y, 1, 1});
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_box_append (GTK_BOX (menu), box);
+      gtk_container_add (GTK_CONTAINER (menu), box);
 
       item = gtk_button_new_with_label ("New");
       gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
       g_signal_connect (item, "clicked", G_CALLBACK (new_item_cb), widget);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);
 
       item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);
 
       item = gtk_button_new_with_label ("Edit");
       gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
       g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);
 
       item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);
 
       item = gtk_button_new_with_label ("Delete");
       gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
       g_signal_connect (item, "clicked", G_CALLBACK (delete_cb), child);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);
 
       gtk_popover_popup (GTK_POPOVER (menu));
     }
@@ -421,6 +419,7 @@ do_dnd (GtkWidget *do_widget)
     {
       GtkWidget *sw;
       GtkWidget *canvas;
+      GtkWidget *widget;
       GtkWidget *box, *box2, *box3;
       const char *colors[] = {
         "red", "green", "blue", "magenta", "orange", "gray", "black", "yellow",
@@ -431,23 +430,26 @@ do_dnd (GtkWidget *do_widget)
       int i;
       int x, y;
 
-      g_type_ensure (GTK_TYPE_COLOR_BUTTON);
-
+      widget = gtk_color_button_new ();
+      gtk_widget_destroy (widget);
+  
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drag-and-Drop");
       gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_window_set_child (GTK_WINDOW (window), box);
 
       box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), box2);
+      gtk_container_add (GTK_CONTAINER (box), box2);
 
       canvas = canvas_new ();
-      gtk_box_append (GTK_BOX (box2), canvas);
+      gtk_container_add (GTK_CONTAINER (box2), canvas);
 
       n_items = 0;
 
@@ -457,7 +459,7 @@ do_dnd (GtkWidget *do_widget)
           GtkWidget *item;
 
           item = canvas_item_new (x, y);
-          gtk_fixed_put (GTK_FIXED (canvas), item, 0, 0);
+          gtk_container_add (GTK_CONTAINER (canvas), item);
           apply_transform (item);
 
           x += 150;
@@ -468,7 +470,7 @@ do_dnd (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_NEVER);
-      gtk_box_append (GTK_BOX (box), sw);
+      gtk_container_add (GTK_CONTAINER (box), sw);
 
       box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_add_css_class (box3, "linked");
@@ -485,14 +487,14 @@ do_dnd (GtkWidget *do_widget)
                                  "rgba", &rgba,
                                  "selectable", FALSE,
                                  NULL);
-          gtk_box_append (GTK_BOX (box3), swatch);
+          gtk_container_add (GTK_CONTAINER (box3), swatch);
         }
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/drawingarea.c

@@ -42,9 +42,7 @@ create_surface (GtkWidget *widget)
 }
 
 static void
-scribble_resize (GtkWidget *widget,
-                 int        width,
-                 int        height)
+scribble_size_allocate (GtkWidget *widget)
 {
   create_surface (widget);
 }
@@ -125,164 +123,49 @@ drag_end (GtkGestureDrag *gesture,
 }
 
 static void
-oval_path (cairo_t *cr,
-           double xc, double yc,
-           double xr, double yr)
+checkerboard_draw (GtkDrawingArea *da,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
-  cairo_save (cr);
+  gint i, j, xcount, ycount;
 
-  cairo_translate (cr, xc, yc);
-  cairo_scale (cr, 1.0, yr / xr);
-  cairo_move_to (cr, xr, 0.0);
-  cairo_arc (cr,
-             0, 0,
-             xr,
-             0, 2 * G_PI);
-  cairo_close_path (cr);
+#define CHECK_SIZE 10
+#define SPACING 2
 
-  cairo_restore (cr);
-}
+  /* At the start of a draw handler, a clip region has been set on
+   * the Cairo context, and the contents have been cleared to the
+   * widget's background color. The docs for
+   * gdk_surface_begin_paint_region() give more details on how this
+   * works.
+   */
 
-/* Fill the given area with checks in the standard style
- * for showing compositing effects.
- *
- * It would make sense to do this as a repeating surface,
- * but most implementations of RENDER currently have broken
- * implementations of repeat + transform, even when the
- * transform is a translation.
- */
-static void
-fill_checks (cairo_t *cr,
-             int x,     int y,
-             int width, int height)
-{
-  int i, j;
-
-#define CHECK_SIZE 16
-
-  cairo_rectangle (cr, x, y, width, height);
-  cairo_set_source_rgb (cr, 0.4, 0.4, 0.4);
-  cairo_fill (cr);
-
-  /* Only works for CHECK_SIZE a power of 2 */
-  j = x & (-CHECK_SIZE);
-
-  for (; j < height; j += CHECK_SIZE)
+  xcount = 0;
+  i = SPACING;
+  while (i < width)
     {
-      i = y & (-CHECK_SIZE);
-      for (; i < width; i += CHECK_SIZE)
-        if ((i / CHECK_SIZE + j / CHECK_SIZE) % 2 == 0)
+      j = SPACING;
+      ycount = xcount % 2; /* start with even/odd depending on row */
+      while (j < height)
+        {
+          if (ycount % 2)
+            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
+          else
+            cairo_set_source_rgb (cr, 1, 1, 1);
+
+          /* If we're outside the clip, this will do nothing.
+           */
           cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
+          cairo_fill (cr);
+
+          j += CHECK_SIZE + SPACING;
+          ++ycount;
+        }
+
+      i += CHECK_SIZE + SPACING;
+      ++xcount;
     }
-
-  cairo_set_source_rgb (cr, 0.7, 0.7, 0.7);
-  cairo_fill (cr);
-
-#undef CHECK_SIZE
-}
-
-/* Draw a red, green, and blue circle equally spaced inside
- * the larger circle of radius r at (xc, yc)
- */
-static void
-draw_3circles (cairo_t *cr,
-               double xc, double yc,
-               double radius,
-               double alpha)
-{
-  double subradius = radius * (2 / 3. - 0.1);
-
-  cairo_set_source_rgba (cr, 1., 0., 0., alpha);
-  oval_path (cr,
-             xc + radius / 3. * cos (G_PI * (0.5)),
-             yc - radius / 3. * sin (G_PI * (0.5)),
-             subradius, subradius);
-  cairo_fill (cr);
-
-  cairo_set_source_rgba (cr, 0., 1., 0., alpha);
-  oval_path (cr,
-             xc + radius / 3. * cos (G_PI * (0.5 + 2/.3)),
-             yc - radius / 3. * sin (G_PI * (0.5 + 2/.3)),
-             subradius, subradius);
-  cairo_fill (cr);
-
-  cairo_set_source_rgba (cr, 0., 0., 1., alpha);
-  oval_path (cr,
-             xc + radius / 3. * cos (G_PI * (0.5 + 4/.3)),
-             yc - radius / 3. * sin (G_PI * (0.5 + 4/.3)),
-             subradius, subradius);
-  cairo_fill (cr);
-}
-
-static void
-groups_draw (GtkDrawingArea *darea,
-             cairo_t        *cr,
-             int             width,
-             int             height,
-             gpointer        data)
-{
-  cairo_surface_t *overlay, *punch, *circles;
-  cairo_t *overlay_cr, *punch_cr, *circles_cr;
-
-  /* Fill the background */
-  double radius = 0.5 * (width < height ? width : height) - 10;
-  double xc = width / 2.;
-  double yc = height / 2.;
-
-  overlay = cairo_surface_create_similar (cairo_get_target (cr),
-                                          CAIRO_CONTENT_COLOR_ALPHA,
-                                          width, height);
-
-  punch = cairo_surface_create_similar (cairo_get_target (cr),
-                                        CAIRO_CONTENT_ALPHA,
-                                        width, height);
-
-  circles = cairo_surface_create_similar (cairo_get_target (cr),
-                                          CAIRO_CONTENT_COLOR_ALPHA,
-                                          width, height);
-
-  fill_checks (cr, 0, 0, width, height);
-
-  /* Draw a black circle on the overlay
-   */
-  overlay_cr = cairo_create (overlay);
-  cairo_set_source_rgb (overlay_cr, 0., 0., 0.);
-  oval_path (overlay_cr, xc, yc, radius, radius);
-  cairo_fill (overlay_cr);
-
-  /* Draw 3 circles to the punch surface, then cut
-   * that out of the main circle in the overlay
-   */
-  punch_cr = cairo_create (punch);
-  draw_3circles (punch_cr, xc, yc, radius, 1.0);
-  cairo_destroy (punch_cr);
-
-  cairo_set_operator (overlay_cr, CAIRO_OPERATOR_DEST_OUT);
-  cairo_set_source_surface (overlay_cr, punch, 0, 0);
-  cairo_paint (overlay_cr);
-
-  /* Now draw the 3 circles in a subgroup again
-   * at half intensity, and use OperatorAdd to join up
-   * without seams.
-   */
-  circles_cr = cairo_create (circles);
-
-  cairo_set_operator (circles_cr, CAIRO_OPERATOR_OVER);
-  draw_3circles (circles_cr, xc, yc, radius, 0.5);
-  cairo_destroy (circles_cr);
-
-  cairo_set_operator (overlay_cr, CAIRO_OPERATOR_ADD);
-  cairo_set_source_surface (overlay_cr, circles, 0, 0);
-  cairo_paint (overlay_cr);
-
-  cairo_destroy (overlay_cr);
-
-  cairo_set_source_surface (cr, overlay, 0, 0);
-  cairo_paint (cr);
-
-  cairo_surface_destroy (overlay);
-  cairo_surface_destroy (punch);
-  cairo_surface_destroy (circles);
 }
 
 static void
@@ -322,21 +205,22 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       /*
-       * Create the groups area
+       * Create the checkerboard area
        */
+
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Knockout groups</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+                            "<u>Checkerboard pattern</u>");
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_vexpand (frame, TRUE);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), groups_draw, NULL, NULL);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), checkerboard_draw, NULL, NULL);
       gtk_frame_set_child (GTK_FRAME (frame), da);
 
       /*
@@ -346,11 +230,11 @@ do_drawingarea (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Scribble area</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_vexpand (frame, TRUE);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -358,8 +242,8 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), scribble_draw, NULL, NULL);
       gtk_frame_set_child (GTK_FRAME (frame), da);
 
-      g_signal_connect (da, "resize",
-                        G_CALLBACK (scribble_resize), NULL);
+      g_signal_connect (da, "size-allocate",
+                        G_CALLBACK (scribble_size_allocate), NULL);
 
       drag = gtk_gesture_drag_new ();
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
@@ -374,7 +258,7 @@ do_drawingarea (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
       gtk_widget_show (window);
   else
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/editable_cells.c

@@ -352,7 +352,8 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_widget_set_margin_start (vbox, 5);
@@ -361,7 +362,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_widget_set_margin_bottom (vbox, 5);
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
-      gtk_box_append (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                           gtk_label_new ("Shopping list (you can edit the cells!)"));
 
       sw = gtk_scrolled_window_new (NULL, NULL);
@@ -369,7 +370,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_append (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);
 
       /* create models */
       items_model = create_items_model ();
@@ -391,17 +392,17 @@ do_editable_cells (GtkWidget *do_widget)
       /* some buttons */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
       button = gtk_button_new_with_label ("Add item");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (add_item), treeview);
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
 
       button = gtk_button_new_with_label ("Remove item");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (remove_item), treeview);
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
 
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }
@@ -409,7 +410,7 @@ do_editable_cells (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/entry_completion.c

@@ -50,7 +50,9 @@ do_entry_completion (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_widget_set_margin_start (vbox, 5);
@@ -61,11 +63,11 @@ do_entry_completion (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       /* Create our entry */
       entry = gtk_entry_new ();
-      gtk_box_append (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);
 
       /* Create the completion object */
       completion = gtk_entry_completion_new ();
@@ -86,7 +88,7 @@ do_entry_completion (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/entry_undo.c

@@ -25,7 +25,8 @@ do_entry_undo (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_widget_set_margin_start (vbox, 5);
@@ -37,18 +38,18 @@ do_entry_undo (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "Use Primary+z or Primary+Shift+z to undo or redo changes");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       /* Create our entry */
       entry = gtk_entry_new ();
       gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
-      gtk_box_append (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/expander.c

@@ -15,7 +15,7 @@ static GtkWidget *window = NULL;
 static void
 response_cb (GtkDialog *dialog, gint response_id)
 {
-  gtk_window_destroy (GTK_WINDOW (window));
+  gtk_widget_destroy (window);
   window = NULL;
 }
 
@@ -79,8 +79,8 @@ do_expander (GtkWidget *do_widget)
                                 "innuendo, just to make you scroll down or "
                                 "resize the window. Do it already !", -1);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
-      gtk_expander_set_child (GTK_EXPANDER (expander), sw);
-      gtk_box_append (GTK_BOX (area), expander);
+      gtk_container_add (GTK_CONTAINER (expander), sw);
+      gtk_container_add (GTK_CONTAINER (area), expander);
       g_signal_connect (expander, "notify::expanded",
                         G_CALLBACK (expander_cb), window);
 
@@ -90,7 +90,7 @@ do_expander (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/filtermodel.c

@@ -125,7 +125,8 @@ do_filtermodel (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       store = (GtkListStore*)gtk_builder_get_object (builder, "liststore1");
 
@@ -198,7 +199,7 @@ do_filtermodel (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/fishbowl.c

@@ -273,13 +273,15 @@ do_fishbowl (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
       selected_widget_type = -1;
       set_widget_type (GTK_FISHBOWL (bowl), 0);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_widget_realize (window);
       g_object_unref (builder);
@@ -288,7 +290,7 @@ do_fishbowl (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/fixed.c

@@ -53,7 +53,7 @@ create_faces (void)
       faces[i].face = gtk_frame_new (NULL);
       gtk_widget_set_size_request (faces[i].face, face_size, face_size);
       gtk_widget_add_css_class (faces[i].face, faces[i].css_class);
-      gtk_fixed_put (GTK_FIXED (fixed), faces[i].face, 0, 0);
+      gtk_container_add (GTK_CONTAINER (fixed), faces[i].face);
 
       /* Set up the transformation for each face */
       transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w, h));
@@ -139,7 +139,7 @@ create_demo_window (GtkWidget *do_widget)
   gtk_widget_set_valign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
 
   cube = create_faces ();
-  gtk_fixed_put (GTK_FIXED (fixed), cube, 0, 0);
+  gtk_container_add (GTK_CONTAINER (fixed), cube);
   gtk_widget_set_overflow (fixed, GTK_OVERFLOW_VISIBLE);
 
   provider = gtk_css_provider_new ();
@@ -161,7 +161,7 @@ do_fixed (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (demo_window))
     gtk_widget_show (demo_window);
   else
-    gtk_window_destroy (GTK_WINDOW (demo_window));
+    gtk_widget_destroy (demo_window);
 
   return demo_window;
 }

demos/gtk-demo/flowbox.c

@@ -724,7 +724,9 @@ do_flowbox (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Flow Box");
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -737,13 +739,13 @@ do_flowbox (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), scrolled);
 
       for (i = 0; colors[i]; i++)
-        gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), color_swatch_new (colors[i]), -1);
+        gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/font_features.c

@@ -194,7 +194,7 @@ add_check_group (GtkWidget   *box,
   pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   pango_attr_list_unref (attrs);
-  gtk_box_append (GTK_BOX (group), label);
+  gtk_container_add (GTK_CONTAINER (group), label);
 
   for (i = 0; tags[i]; i++)
     {
@@ -211,7 +211,7 @@ add_check_group (GtkWidget   *box,
       g_signal_connect (feat, "notify::inconsistent", G_CALLBACK (update_display), NULL);
       g_signal_connect (feat, "clicked", G_CALLBACK (feat_clicked), NULL);
 
-      gtk_box_append (GTK_BOX (group), feat);
+      gtk_container_add (GTK_CONTAINER (group), feat);
 
       item = g_new (FeatureItem, 1);
       item->name = tags[i];
@@ -223,7 +223,7 @@ add_check_group (GtkWidget   *box,
       feature_items = g_list_prepend (feature_items, item);
     }
 
-  gtk_box_append (GTK_BOX (box), group);
+  gtk_container_add (GTK_CONTAINER (box), group);
 }
 
 static void
@@ -248,7 +248,7 @@ add_radio_group (GtkWidget *box,
   pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   pango_attr_list_unref (attrs);
-  gtk_box_append (GTK_BOX (group), label);
+  gtk_container_add (GTK_CONTAINER (group), label);
 
   for (i = 0; tags[i]; i++)
     {
@@ -268,7 +268,7 @@ add_radio_group (GtkWidget *box,
       g_signal_connect (feat, "notify::active", G_CALLBACK (update_display), NULL);
       g_object_set_data (G_OBJECT (feat), "default", group_button);
 
-      gtk_box_append (GTK_BOX (group), feat);
+      gtk_container_add (GTK_CONTAINER (group), feat);
 
       item = g_new (FeatureItem, 1);
       item->name = tags[i];
@@ -280,7 +280,7 @@ add_radio_group (GtkWidget *box,
       feature_items = g_list_prepend (feature_items, item);
     }
 
-  gtk_box_append (GTK_BOX (box), group);
+  gtk_container_add (GTK_CONTAINER (box), group);
 }
 
 static void
@@ -1025,7 +1025,7 @@ denorm_coord (hb_ot_var_axis_info_t *axis, int coord)
 static void
 update_font_variations (void)
 {
-  GtkWidget *child;
+  GtkWidget *child, *next;
   PangoFont *pango_font = NULL;
   hb_font_t *hb_font;
   hb_face_t *hb_face;
@@ -1037,8 +1037,12 @@ update_font_variations (void)
   int i;
 
   child = gtk_widget_get_first_child (variations_grid);
-  while ((child = gtk_widget_get_first_child (variations_grid)))
-    gtk_grid_remove (GTK_GRID (variations_grid), child);
+  while (child != NULL)
+    {
+      next = gtk_widget_get_next_sibling (child);
+      gtk_widget_destroy (child);
+      child = next;
+    }
 
   instance_combo = NULL;
 
@@ -1329,7 +1333,8 @@ do_font_features (GtkWidget *do_widget)
 
       font_features_font_changed ();
 
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       g_object_unref (builder);
 
@@ -1339,7 +1344,7 @@ do_font_features (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_window_present (GTK_WINDOW (window));
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/fontrendering.c

@@ -281,7 +281,7 @@ do_fontrendering (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/gears.c

@@ -53,7 +53,7 @@ create_axis_slider (GtkGears *gears,
     }
 
   label = gtk_label_new (text);
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (box), label);
   gtk_widget_show (label);
 
   adj = gtk_adjustment_new (gtk_gears_get_axis (gears, axis), 0.0, 360.0, 1.0, 12.0, 0.0);
@@ -63,7 +63,7 @@ create_axis_slider (GtkGears *gears,
                     gears);
   slider = gtk_scale_new (GTK_ORIENTATION_VERTICAL, adj);
   gtk_scale_set_draw_value (GTK_SCALE (slider), FALSE);
-  gtk_box_append (GTK_BOX (box), slider);
+  gtk_container_add (GTK_CONTAINER (box), slider);
   gtk_widget_set_vexpand (slider, TRUE);
   gtk_widget_show (slider);
 
@@ -85,7 +85,7 @@ do_gears (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Gears");
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_window_set_default_size (GTK_WINDOW (window), 640, 640);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
       overlay = gtk_overlay_new ();
       gtk_widget_set_margin_start (overlay, 12);
@@ -111,19 +111,19 @@ do_gears (GtkWidget *do_widget)
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
       gtk_box_set_spacing (GTK_BOX (box), 6);
-      gtk_box_append (GTK_BOX (box), hbox);
+      gtk_container_add (GTK_CONTAINER (box), hbox);
 
       gears = gtk_gears_new ();
       gtk_widget_set_hexpand (gears, TRUE);
       gtk_widget_set_vexpand (gears, TRUE);
-      gtk_box_append (GTK_BOX (hbox), gears);
+      gtk_container_add (GTK_CONTAINER (hbox), gears);
 
       for (i = 0; i < GTK_GEARS_N_AXIS; i++)
-        gtk_box_append (GTK_BOX (hbox), create_axis_slider (GTK_GEARS (gears), i));
+        gtk_container_add (GTK_CONTAINER (hbox), create_axis_slider (GTK_GEARS (gears), i));
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
       gtk_box_set_spacing (GTK_BOX (hbox), 6);
-      gtk_box_append (GTK_BOX (box), hbox);
+      gtk_container_add (GTK_CONTAINER (box), hbox);
 
       gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label));
     }
@@ -131,7 +131,7 @@ do_gears (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/gestures.c

@@ -149,7 +149,8 @@ do_gestures (GtkWidget *do_widget)
       window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
       gtk_window_set_title (GTK_WINDOW (window), "Gestures");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       drawing_area = gtk_drawing_area_new ();
       gtk_window_set_child (GTK_WINDOW (window), drawing_area);
@@ -209,7 +210,7 @@ do_gestures (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/glarea.c

@@ -354,7 +354,7 @@ create_axis_slider (int axis)
     }
 
   label = gtk_label_new (text);
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (box), label);
   gtk_widget_show (label);
 
   adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0);
@@ -362,7 +362,7 @@ create_axis_slider (int axis)
                     G_CALLBACK (on_axis_value_change),
                     GINT_TO_POINTER (axis));
   slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adj);
-  gtk_box_append (GTK_BOX (box), slider);
+  gtk_container_add (GTK_CONTAINER (box), slider);
   gtk_widget_set_hexpand (slider, TRUE);
   gtk_widget_show (slider);
 
@@ -406,7 +406,7 @@ create_glarea_window (GtkWidget *do_widget)
   gl_area = gtk_gl_area_new ();
   gtk_widget_set_hexpand (gl_area, TRUE);
   gtk_widget_set_vexpand (gl_area, TRUE);
-  gtk_box_append (GTK_BOX (box), gl_area);
+  gtk_container_add (GTK_CONTAINER (box), gl_area);
 
   /* We need to initialize and free GL resources, so we use
    * the realize and unrealize signals on the widget
@@ -418,16 +418,16 @@ create_glarea_window (GtkWidget *do_widget)
   g_signal_connect (gl_area, "render", G_CALLBACK (render), NULL);
 
   controls = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_append (GTK_BOX (box), controls);
+  gtk_container_add (GTK_CONTAINER (box), controls);
   gtk_widget_set_hexpand (controls, TRUE);
 
   for (i = 0; i < N_AXIS; i++)
-    gtk_box_append (GTK_BOX (controls), create_axis_slider (i));
+    gtk_container_add (GTK_CONTAINER (controls), create_axis_slider (i));
 
   button = gtk_button_new_with_label ("Quit");
   gtk_widget_set_hexpand (button, TRUE);
-  gtk_box_append (GTK_BOX (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
+  gtk_container_add (GTK_CONTAINER (box), button);
+  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
 
   return window;
 }
@@ -441,7 +441,7 @@ do_glarea (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (demo_window))
     gtk_widget_show (demo_window);
   else
-    gtk_window_destroy (GTK_WINDOW (demo_window));
+    gtk_widget_destroy (demo_window);
 
   return demo_window;
 }

demos/gtk-demo/headerbar.c

@@ -25,8 +25,8 @@ do_headerbar (GtkWidget *do_widget)
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Welcome to Facebook - Log in, sign up or learn more");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
 
       header = gtk_header_bar_new ();
@@ -43,10 +43,10 @@ do_headerbar (GtkWidget *do_widget)
       gtk_widget_add_css_class (box, "linked");
       button = gtk_button_new ();
       gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
       button = gtk_button_new ();
       gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);
 
@@ -58,7 +58,7 @@ do_headerbar (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/hypertext.c

@@ -237,7 +237,9 @@ do_hypertext (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -273,7 +275,7 @@ do_hypertext (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/iconscroll.c

@@ -209,10 +209,12 @@ do_iconscroll (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       scrolledwindow = GTK_WIDGET (gtk_builder_get_object (builder, "scrolledwindow"));
       gtk_widget_realize (window);
       hadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "hadjustment"));
@@ -223,7 +225,7 @@ do_iconscroll (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/iconview.c

@@ -228,7 +228,7 @@ home_clicked (GtkButton *item,
 
 static void close_window(void)
 {
-  gtk_window_destroy (GTK_WINDOW (window));
+  gtk_widget_destroy (window);
   window = NULL;
 
   g_object_unref (file_pixbuf);
@@ -266,14 +266,14 @@ do_iconview (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       tool_bar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (vbox), tool_bar);
+      gtk_container_add (GTK_CONTAINER (vbox), tool_bar);
 
       up_button = gtk_button_new_with_mnemonic ("_Up");
       gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-      gtk_box_append (GTK_BOX (tool_bar), up_button);
+      gtk_container_add (GTK_CONTAINER (tool_bar), up_button);
 
       home_button = gtk_button_new_with_mnemonic ("_Home");
-      gtk_box_append (GTK_BOX (tool_bar), home_button);
+      gtk_container_add (GTK_CONTAINER (tool_bar), home_button);
 
 
       sw = gtk_scrolled_window_new (NULL, NULL);
@@ -283,7 +283,7 @@ do_iconview (GtkWidget *do_widget)
                                       GTK_POLICY_AUTOMATIC);
       gtk_widget_set_vexpand (sw, TRUE);
 
-      gtk_box_append (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);
 
       /* Create the store and fill it with the contents of '/' */
       parent = g_strdup ("/");
@@ -320,7 +320,7 @@ do_iconview (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/iconview_edit.c

@@ -111,7 +111,9 @@ do_iconview_edit (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       store = create_store ();
       fill_store (store);
@@ -150,7 +152,7 @@ do_iconview_edit (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/images.c

@@ -91,7 +91,7 @@ progressive_timeout (gpointer data)
           g_error_free (error);
 
           g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);
 
           g_object_unref (image_stream);
           image_stream = NULL;
@@ -119,7 +119,7 @@ progressive_timeout (gpointer data)
           g_error_free (error);
 
           g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);
 
           g_object_unref (image_stream);
           image_stream = NULL;
@@ -152,7 +152,7 @@ progressive_timeout (gpointer data)
               g_error_free (error);
 
               g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_window_destroy), NULL);
+                                G_CALLBACK (gtk_widget_destroy), NULL);
 
               gtk_widget_show (dialog);
 
@@ -189,7 +189,7 @@ progressive_timeout (gpointer data)
               g_error_free (error);
 
               g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_window_destroy), NULL);
+                                G_CALLBACK (gtk_widget_destroy), NULL);
 
               gtk_widget_show (dialog);
 
@@ -223,7 +223,7 @@ progressive_timeout (gpointer data)
           g_error_free (error);
 
           g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);
 
           gtk_widget_show (dialog);
 
@@ -293,16 +293,24 @@ static void
 toggle_sensitivity_callback (GtkWidget *togglebutton,
                              gpointer   user_data)
 {
-  GtkWidget *child;
+  GtkContainer *container = user_data;
+  GList *list;
+  GList *tmp;
 
-  for (child = gtk_widget_get_first_child (GTK_WIDGET (user_data));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
+  list = gtk_container_get_children (container);
+
+  tmp = list;
+  while (tmp != NULL)
     {
       /* don't disable our toggle */
-      if (child != togglebutton)
-        gtk_widget_set_sensitive (child, !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
+      if (GTK_WIDGET (tmp->data) != togglebutton)
+        gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
+                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
+
+      tmp = tmp->next;
     }
+
+  g_list_free (list);
 }
 
 
@@ -327,8 +335,9 @@ do_images (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Images");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (cleanup_callback), NULL);
 
@@ -340,20 +349,20 @@ do_images (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), base_vbox);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
-      gtk_box_append (GTK_BOX (base_vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (base_vbox), hbox);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_box_append (GTK_BOX (hbox), vbox);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Image loaded from a file</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       image = gtk_image_new_from_icon_name ("gtk3-demo");
       gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
@@ -366,12 +375,12 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Animation loaded from a file</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");
 
@@ -382,12 +391,12 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Symbolic themed icon</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon);
@@ -398,17 +407,17 @@ do_images (GtkWidget *do_widget)
 
       /* Progressive */
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_box_append (GTK_BOX (hbox), vbox);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Progressive image loading</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       /* Create an empty image for now; the progressive loader
        * will create the pixbuf and fill it in.
@@ -420,17 +429,17 @@ do_images (GtkWidget *do_widget)
 
       /* Video */
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_box_append (GTK_BOX (hbox), vbox);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Displaying video</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       video = gtk_video_new_for_resource ("/images/gtk-logo.webm");
       gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE);
@@ -438,22 +447,22 @@ do_images (GtkWidget *do_widget)
 
       /* Widget paintables */
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_box_append (GTK_BOX (hbox), vbox);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>GtkWidgetPaintable</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       paintable = gtk_widget_paintable_new (do_widget);
       picture = gtk_picture_new_for_paintable (paintable);
       gtk_widget_set_size_request (picture, 100, 100);
       gtk_widget_set_valign (picture, GTK_ALIGN_START);
-      gtk_box_append (GTK_BOX (vbox), picture);
+      gtk_container_add (GTK_CONTAINER (vbox), picture);
 
       /* Sensitivity control */
       button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_append (GTK_BOX (base_vbox), button);
+      gtk_container_add (GTK_CONTAINER (base_vbox), button);
 
       g_signal_connect (button, "toggled",
                         G_CALLBACK (toggle_sensitivity_callback),
@@ -463,7 +472,7 @@ do_images (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/infobar.c

@@ -29,8 +29,10 @@ on_bar_response (GtkInfoBar *info_bar,
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                             "Your response has id %d", response_id);
 
-  g_signal_connect_swapped (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), dialog);
+  g_signal_connect_swapped (dialog,
+                            "response",
+                            G_CALLBACK (gtk_widget_destroy),
+                            dialog);
 
   gtk_widget_show (dialog);
 }
@@ -56,7 +58,8 @@ do_infobar (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_widget_set_margin_start (vbox, 8);
@@ -66,73 +69,73 @@ do_infobar (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       bar = gtk_info_bar_new ();
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);
 
       button = gtk_toggle_button_new_with_label ("Message");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);
 
       button = gtk_toggle_button_new_with_label ("Warning");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
       gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
       g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);
       gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK);
 
       button = gtk_toggle_button_new_with_label ("Question");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);
 
       button = gtk_toggle_button_new_with_label ("Error");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
 
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);
 
       button = gtk_toggle_button_new_with_label ("Other");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);
 
       frame = gtk_frame_new ("An example of different info bars");
       gtk_widget_set_margin_top (frame, 8);
       gtk_widget_set_margin_bottom (frame, 8);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       gtk_widget_set_halign (actions, GTK_ALIGN_CENTER);
 
@@ -146,7 +149,7 @@ do_infobar (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/links.c

@@ -12,7 +12,7 @@ response_cb (GtkWidget *dialog,
              gint       response_id,
              gpointer   data)
 {
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (dialog);
 }
 
 static gboolean
@@ -59,7 +59,8 @@ do_links (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Links");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
                              "title=\"plain text\">text</a> may be marked up "
@@ -87,7 +88,7 @@ do_links (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/list_store.c

@@ -257,7 +257,9 @@ do_list_store (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Store");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_widget_set_margin_start (vbox, 8);
@@ -267,14 +269,14 @@ do_list_store (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_append (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);
 
       /* create tree model */
       model = create_model ();
@@ -307,7 +309,7 @@ do_list_store (GtkWidget *do_widget)
     }
   else
     {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
       window = NULL;
       if (timeout != 0)
         {

demos/gtk-demo/listbox.c

@@ -351,17 +351,22 @@ do_listbox (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Box");
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   400, 600);
+
+      /* NULL window variable when window is closed */
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_window_set_child (GTK_WINDOW (window), vbox);
       label = gtk_label_new ("Messages from GTK and friends");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
       scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
       gtk_widget_set_vexpand (scrolled, TRUE);
-      gtk_box_append (GTK_BOX (vbox), scrolled);
+      gtk_container_add (GTK_CONTAINER (vbox), scrolled);
       listbox = gtk_list_box_new ();
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), listbox);
 
@@ -377,7 +382,7 @@ do_listbox (GtkWidget *do_widget)
           message = gtk_message_new (lines[i]);
           row = gtk_message_row_new (message);
           gtk_widget_show (GTK_WIDGET (row));
-          gtk_list_box_insert (GTK_LIST_BOX (listbox), GTK_WIDGET (row), -1);
+          gtk_container_add (GTK_CONTAINER (listbox), GTK_WIDGET (row));
         }
 
       g_strfreev (lines);
@@ -387,7 +392,7 @@ do_listbox (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/main.c

@@ -101,7 +101,7 @@ activate_quit (GSimpleAction *action,
       win = list->data;
       next = list->next;
 
-      gtk_window_destroy (GTK_WINDOW (win));
+      gtk_widget_destroy (GTK_WIDGET (win));
 
       list = next;
     }

demos/gtk-demo/markup.c

@@ -58,7 +58,8 @@ do_markup (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       stack = gtk_stack_new ();
       gtk_widget_show (stack);
@@ -125,7 +126,7 @@ do_markup (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/modelbutton.c

@@ -43,7 +43,8 @@ do_modelbutton (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       actions = (GActionGroup*)g_simple_action_group_new ();
       g_action_map_add_action_entries (G_ACTION_MAP (actions),
@@ -58,7 +59,7 @@ do_modelbutton (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
 
   return window;

demos/gtk-demo/overlay.c

@@ -66,7 +66,7 @@ do_overlay (GtkWidget *do_widget)
       gtk_widget_set_can_target (label, FALSE);
       gtk_widget_set_margin_top (label, 8);
       gtk_widget_set_margin_bottom (label, 8);
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
@@ -76,16 +76,18 @@ do_overlay (GtkWidget *do_widget)
       gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
       gtk_widget_set_margin_top (entry, 8);
       gtk_widget_set_margin_bottom (entry, 8);
-      gtk_box_append (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);
 
       gtk_window_set_child (GTK_WINDOW (window), overlay);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/overlay2.c

@@ -60,7 +60,9 @@ do_overlay2 (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), overlay);
       gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), text);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       image = gtk_picture_new_for_resource ("/overlay2/decor1.png");
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), image);
@@ -95,7 +97,7 @@ do_overlay2 (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/pagesetup.c

@@ -11,7 +11,7 @@
 static void
 done_cb (GtkDialog *dialog, gint response, gpointer data)
 {
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 GtkWidget *
@@ -22,14 +22,14 @@ do_pagesetup (GtkWidget *do_widget)
   if (!window)
     {
       window = gtk_page_setup_unix_dialog_new ("Page Setup", GTK_WINDOW (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
       g_signal_connect (window, "response", G_CALLBACK (done_cb), NULL);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/paint.c

@@ -405,13 +405,16 @@ do_paint (GtkWidget *toplevel)
       gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
       gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
       gtk_window_set_title (GTK_WINDOW (window), "Paint");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/paintable.c

@@ -171,7 +171,7 @@ do_paintable (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/paintable_animated.c

@@ -203,7 +203,7 @@ do_paintable_animated (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/paintable_mediastream.c

@@ -306,7 +306,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/panes.c

@@ -19,14 +19,32 @@ toggle_resize (GtkWidget *widget,
 {
   GtkWidget *parent;
   GtkPaned *paned;
+  gboolean is_child1;
+  gboolean resize, shrink;
 
   parent = gtk_widget_get_parent (child);
   paned = GTK_PANED (parent);
 
-  if (child == gtk_paned_get_start_child (paned))
-    gtk_paned_set_resize_start_child (paned, !gtk_paned_get_resize_start_child (paned));
+  is_child1 = (child == gtk_paned_get_child1 (paned));
+
+  if (is_child1)
+    g_object_get (paned,
+                  "resize-child1", &resize,
+                  "shrink-child1", &shrink,
+                  NULL);
   else
-    gtk_paned_set_resize_end_child (paned, !gtk_paned_get_resize_end_child (paned));
+    g_object_get (paned,
+                  "resize-child2", &resize,
+                  "shrink-child2", &shrink,
+                  NULL);
+
+  g_object_ref (child);
+  gtk_container_remove (GTK_CONTAINER (parent), child);
+  if (is_child1)
+    gtk_paned_pack1 (paned, child, !resize, shrink);
+  else
+    gtk_paned_pack2 (paned, child, !resize, shrink);
+  g_object_unref (child);
 }
 
 static void
@@ -35,14 +53,32 @@ toggle_shrink (GtkWidget *widget,
 {
   GtkWidget *parent;
   GtkPaned *paned;
+  gboolean is_child1;
+  gboolean resize, shrink;
 
   parent = gtk_widget_get_parent (child);
   paned = GTK_PANED (parent);
 
-  if (child == gtk_paned_get_start_child (paned))
-    gtk_paned_set_shrink_start_child (paned, !gtk_paned_get_shrink_start_child (paned));
+  is_child1 = (child == gtk_paned_get_child1 (paned));
+
+  if (is_child1)
+    g_object_get (paned,
+                  "resize-child1", &resize,
+                  "shrink-child1", &shrink,
+                  NULL);
   else
-    gtk_paned_set_shrink_end_child (paned, !gtk_paned_get_shrink_end_child (paned));
+    g_object_get (paned,
+                  "resize-child2", &resize,
+                  "shrink-child2", &shrink,
+                  NULL);
+
+  g_object_ref (child);
+  gtk_container_remove (GTK_CONTAINER (parent), child);
+  if (is_child1)
+    gtk_paned_pack1 (paned, child, resize, !shrink);
+  else
+    gtk_paned_pack2 (paned, child, resize, !shrink);
+  g_object_unref (child);
 }
 
 static GtkWidget *
@@ -57,8 +93,8 @@ create_pane_options (GtkPaned    *paned,
   GtkWidget *label;
   GtkWidget *check_button;
 
-  child1 = gtk_paned_get_start_child (paned);
-  child2 = gtk_paned_get_end_child (paned);
+  child1 = gtk_paned_get_child1 (paned);
+  child2 = gtk_paned_get_child2 (paned);
 
   frame = gtk_frame_new (frame_label);
   gtk_widget_set_margin_start (frame, 4);
@@ -116,7 +152,9 @@ do_panes (GtkWidget *do_widget)
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");
 
@@ -128,35 +166,35 @@ do_panes (GtkWidget *do_widget)
       gtk_widget_set_margin_end (vpaned, 5);
       gtk_widget_set_margin_top (vpaned, 5);
       gtk_widget_set_margin_bottom (vpaned, 5);
-      gtk_box_append (GTK_BOX (vbox), vpaned);
+      gtk_container_add (GTK_CONTAINER (vbox), vpaned);
 
       hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_paned_set_start_child (GTK_PANED (vpaned), hpaned);
+      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_size_request (frame, 60, 60);
-      gtk_paned_set_start_child (GTK_PANED (hpaned), frame);
+      gtk_paned_add1 (GTK_PANED (hpaned), frame);
 
       button = gtk_button_new_with_mnemonic ("_Hi there");
       gtk_frame_set_child (GTK_FRAME (frame), button);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_size_request (frame, 80, 60);
-      gtk_paned_set_end_child (GTK_PANED (hpaned), frame);
+      gtk_paned_add2 (GTK_PANED (hpaned), frame);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_size_request (frame, 60, 80);
-      gtk_paned_set_end_child (GTK_PANED (vpaned), frame);
+      gtk_paned_add2 (GTK_PANED (vpaned), frame);
 
       /* Now create toggle buttons to control sizing */
 
-      gtk_box_append (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                           create_pane_options (GTK_PANED (hpaned),
                                                "Horizontal",
                                                "Left",
                                                "Right"));
 
-      gtk_box_append (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                           create_pane_options (GTK_PANED (vpaned),
                                                "Vertical",
                                                "Top",
@@ -166,7 +204,7 @@ do_panes (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/password_entry.c

@@ -45,7 +45,8 @@ do_password_entry (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Choose a Password");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       gtk_window_set_deletable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
       gtk_widget_set_margin_start (box, 18);
@@ -61,7 +62,7 @@ do_password_entry (GtkWidget *do_widget)
                     "activates-default", TRUE,
                     NULL);
       g_signal_connect (entry, "notify::text", G_CALLBACK (update_button), NULL);
-      gtk_box_append (GTK_BOX (box), entry);
+      gtk_container_add (GTK_CONTAINER (box), entry);
 
       entry2 = gtk_password_entry_new ();
       gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry2), TRUE);
@@ -70,11 +71,11 @@ do_password_entry (GtkWidget *do_widget)
                     "activates-default", TRUE,
                     NULL);
       g_signal_connect (entry2, "notify::text", G_CALLBACK (update_button), NULL);
-      gtk_box_append (GTK_BOX (box), entry2);
+      gtk_container_add (GTK_CONTAINER (box), entry2);
 
       button = gtk_button_new_with_mnemonic ("_Done");
       gtk_widget_add_css_class (button, "suggested-action");
-      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
+      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
       gtk_widget_set_sensitive (button, FALSE);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 
@@ -84,7 +85,7 @@ do_password_entry (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/peg_solitaire.c

@@ -284,7 +284,8 @@ do_peg_solitaire (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Peg Solitaire");
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       grid = gtk_grid_new ();
       gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
@@ -348,7 +349,7 @@ do_peg_solitaire (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/pickers.c

@@ -18,7 +18,9 @@ do_pickers (GtkWidget *do_widget)
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Pickers");
-    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &window);
 
     table = gtk_grid_new ();
     gtk_widget_set_margin_start (table, 20);
@@ -75,7 +77,7 @@ do_pickers (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/pixbufs.c

@@ -179,7 +179,9 @@ do_pixbufs (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       error = NULL;
       if (!load_pixbufs (&error))
@@ -196,7 +198,7 @@ do_pixbufs (GtkWidget *do_widget)
           g_error_free (error);
 
           g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);
 
           gtk_widget_show (dialog);
         }
@@ -220,7 +222,7 @@ do_pixbufs (GtkWidget *do_widget)
     gtk_widget_show (window);
   else
     {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
       g_object_unref (frame);
     }
 

demos/gtk-demo/printing.c

@@ -188,7 +188,7 @@ do_printing (GtkWidget *do_widget)
       g_error_free (error);
 
       g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_window_destroy), NULL);
+                        G_CALLBACK (gtk_widget_destroy), NULL);
 
       gtk_widget_show (dialog);
     }

demos/gtk-demo/revealer.c

@@ -85,7 +85,7 @@ do_revealer (GtkWidget *do_widget)
     }
   else
     {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
     }
 
 

demos/gtk-demo/rotated_text.c

@@ -180,7 +180,8 @@ do_rotated_text (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
       gtk_window_set_default_size (GTK_WINDOW (window), 4 * RADIUS, 2 * RADIUS);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
@@ -188,7 +189,7 @@ do_rotated_text (GtkWidget *do_widget)
 
       /* Add a drawing area */
       drawing_area = gtk_drawing_area_new ();
-      gtk_box_append (GTK_BOX (box), drawing_area);
+      gtk_container_add (GTK_CONTAINER (box), drawing_area);
       gtk_widget_add_css_class (drawing_area, GTK_STYLE_CLASS_VIEW);
 
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
@@ -197,7 +198,7 @@ do_rotated_text (GtkWidget *do_widget)
 
       /* And a label */
       label = gtk_label_new (text);
-      gtk_box_append (GTK_BOX (box), label);
+      gtk_container_add (GTK_CONTAINER (box), label);
 
       /* Set up fancy stuff on the label */
       layout = gtk_label_get_layout (GTK_LABEL (label));
@@ -212,7 +213,7 @@ do_rotated_text (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/scale.c

@@ -21,7 +21,8 @@ do_scale (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       g_object_unref (builder);
     }
@@ -29,7 +30,7 @@ do_scale (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
 
   return window;

demos/gtk-demo/search_entry.c

@@ -273,23 +273,23 @@ do_search_entry (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
       /* Create our entry */
       entry = gtk_entry_new ();
       gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
                                          GTK_ENTRY_ICON_PRIMARY,
                                          "edit-find-symbolic");
-      gtk_box_append (GTK_BOX (hbox), entry);
+      gtk_container_add (GTK_CONTAINER (hbox), entry);
 
       /* Create the find and cancel buttons */
       notebook = gtk_notebook_new ();
       gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
       gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-      gtk_box_append (GTK_BOX (hbox), notebook);
+      gtk_container_add (GTK_CONTAINER (hbox), notebook);
 
       find_button = gtk_button_new_with_label ("Find");
       g_signal_connect (find_button, "clicked",
@@ -319,7 +319,7 @@ do_search_entry (GtkWidget *do_widget)
   else
     {
       g_clear_object (&actions);
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
     }
 
   return window;

demos/gtk-demo/search_entry2.c

@@ -73,7 +73,9 @@ do_search_entry2 (GtkWidget *do_widget)
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_widget_set_size_request (window, 200, -1);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_window_set_child (GTK_WINDOW (window), vbox);
@@ -81,38 +83,38 @@ do_search_entry2 (GtkWidget *do_widget)
       entry = gtk_search_entry_new ();
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (container), entry);
+      gtk_container_add (GTK_CONTAINER (container), entry);
       searchbar = gtk_search_bar_new ();
       gtk_search_bar_connect_entry (GTK_SEARCH_BAR (searchbar), GTK_EDITABLE (entry));
       gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (searchbar), FALSE);
       gtk_search_bar_set_child (GTK_SEARCH_BAR (searchbar), container);
-      gtk_box_append (GTK_BOX (vbox), searchbar);
+      gtk_container_add (GTK_CONTAINER (vbox), searchbar);
 
       /* Hook the search bar to key presses */
       gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (searchbar), window);
 
       /* Help */
       label = gtk_label_new ("Start Typing to search");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
 
       /* Toggle button */
       button = gtk_toggle_button_new_with_label ("Search");
       g_object_bind_property (button, "active",
                               searchbar, "search-mode-enabled",
                               G_BINDING_BIDIRECTIONAL);
-      gtk_box_append (GTK_BOX (vbox), button);
+      gtk_container_add (GTK_CONTAINER (vbox), button);
 
       /* Result */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
       label = gtk_label_new ("Result:");
       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
       gtk_widget_set_margin_start (label, 6);
-      gtk_box_append (GTK_BOX (hbox), label);
+      gtk_container_add (GTK_CONTAINER (hbox), label);
 
       label = gtk_label_new ("");
-      gtk_box_append (GTK_BOX (hbox), label);
+      gtk_container_add (GTK_CONTAINER (hbox), label);
 
       g_signal_connect (entry, "search-changed",
                         G_CALLBACK (search_changed_cb), label);
@@ -120,15 +122,15 @@ do_search_entry2 (GtkWidget *do_widget)
                         G_CALLBACK (changed_cb), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
 
       label = gtk_label_new ("Signal:");
       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
       gtk_widget_set_margin_start (label, 6);
-      gtk_box_append (GTK_BOX (hbox), label);
+      gtk_container_add (GTK_CONTAINER (hbox), label);
 
       label = gtk_label_new ("");
-      gtk_box_append (GTK_BOX (hbox), label);
+      gtk_container_add (GTK_CONTAINER (hbox), label);
 
       g_signal_connect (entry, "search-changed",
                         G_CALLBACK (search_changed), label);
@@ -143,7 +145,7 @@ do_search_entry2 (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/shortcut_triggers.c

@@ -56,7 +56,9 @@ do_shortcut_triggers (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Shortcuts");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       list = gtk_list_box_new ();
       gtk_widget_set_margin_top (list, 6);
@@ -71,7 +73,7 @@ do_shortcut_triggers (GtkWidget *do_widget)
           GtkWidget *row;
 
           row = gtk_label_new (shortcuts[i].description);
-          gtk_list_box_insert (GTK_LIST_BOX (list), row, -1);
+          gtk_container_add (GTK_CONTAINER (list), row);
 
           controller = gtk_shortcut_controller_new ();
           gtk_shortcut_controller_set_scope (GTK_SHORTCUT_CONTROLLER (controller), GTK_SHORTCUT_SCOPE_GLOBAL);
@@ -86,7 +88,7 @@ do_shortcut_triggers (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/shortcuts.c

@@ -89,7 +89,8 @@ do_shortcuts (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       g_object_unref (builder);
     }
@@ -97,7 +98,7 @@ do_shortcuts (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/sidebar.c

@@ -43,18 +43,20 @@ do_sidebar (GtkWidget *do_widget)
       gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR(header), TRUE);
       gtk_window_set_titlebar (GTK_WINDOW(window), header);
       gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       sidebar = gtk_stack_sidebar_new ();
-      gtk_box_append (GTK_BOX (box), sidebar);
+      gtk_container_add (GTK_CONTAINER (box), sidebar);
 
       stack = gtk_stack_new ();
       gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
       gtk_stack_sidebar_set_stack (GTK_STACK_SIDEBAR (sidebar), GTK_STACK (stack));
       gtk_widget_set_hexpand (stack, TRUE);
 
-      gtk_box_append (GTK_BOX (box), stack);
+      gtk_container_add (GTK_CONTAINER (box), stack);
 
       for (i=0; (c = *(pages+i)) != NULL; i++ )
         {
@@ -78,7 +80,7 @@ do_sidebar (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/sizegroup.c

@@ -104,7 +104,8 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Size Groups");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_widget_set_margin_start (vbox, 5);
@@ -118,7 +119,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* Create one frame holding color options */
       frame = gtk_frame_new ("Color Options");
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       table = gtk_grid_new ();
       gtk_widget_set_margin_start (table, 5);
@@ -134,7 +135,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* And another frame holding line style options */
       frame = gtk_frame_new ("Line Options");
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       table = gtk_grid_new ();
       gtk_widget_set_margin_start (table, 5);
@@ -150,7 +151,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* And a check button to turn grouping on and off */
       check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
-      gtk_box_append (GTK_BOX (vbox), check_button);
+      gtk_container_add (GTK_CONTAINER (vbox), check_button);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
       g_signal_connect (check_button, "toggled",
@@ -160,7 +161,7 @@ do_sizegroup (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/sliding_puzzle.c

@@ -387,7 +387,7 @@ add_choice (GtkWidget    *container,
   icon = gtk_image_new_from_paintable (paintable);
   gtk_image_set_icon_size (GTK_IMAGE (icon), GTK_ICON_SIZE_LARGE);
 
-  gtk_box_append (GTK_BOX (container), icon);
+  gtk_container_add (GTK_CONTAINER (container), icon);
 }
 
 GtkWidget *
@@ -460,7 +460,8 @@ do_sliding_puzzle (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Sliding Puzzle");
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       frame = gtk_aspect_frame_new (0.5, 0.5, (float) gdk_paintable_get_intrinsic_aspect_ratio (puzzle), FALSE);
       gtk_window_set_child (GTK_WINDOW (window), frame);
@@ -471,7 +472,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/spinbutton.c

@@ -196,7 +196,8 @@ do_spinbutton (GtkWidget *do_widget)
                             gtk_widget_get_display (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Spin Buttons");
     gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &window);
 
     adj = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "basic_adjustment"));
     label = GTK_WIDGET (gtk_builder_get_object (builder, "basic_label"));
@@ -237,7 +238,7 @@ do_spinbutton (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/spinner.c

@@ -45,8 +45,9 @@ do_spinner (GtkWidget *do_widget)
     gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
     g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_window_destroy), NULL);
-    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+                      G_CALLBACK (gtk_widget_destroy), NULL);
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &window);
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
@@ -55,34 +56,34 @@ do_spinner (GtkWidget *do_widget)
     gtk_widget_set_margin_end (vbox, 5);
     gtk_widget_set_margin_top (vbox, 5);
     gtk_widget_set_margin_bottom (vbox, 5);
-    gtk_box_append (GTK_BOX (content_area), vbox);
+    gtk_container_add (GTK_CONTAINER (content_area), vbox);
 
     /* Sensitive */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
     spinner = gtk_spinner_new ();
-    gtk_box_append (GTK_BOX (hbox), spinner);
-    gtk_box_append (GTK_BOX (hbox), gtk_entry_new ());
-    gtk_box_append (GTK_BOX (vbox), hbox);
+    gtk_container_add (GTK_CONTAINER (hbox), spinner);
+    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
+    gtk_container_add (GTK_CONTAINER (vbox), hbox);
     spinner_sensitive = spinner;
 
     /* Disabled */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
     spinner = gtk_spinner_new ();
-    gtk_box_append (GTK_BOX (hbox), spinner);
-    gtk_box_append (GTK_BOX (hbox), gtk_entry_new ());
-    gtk_box_append (GTK_BOX (vbox), hbox);
+    gtk_container_add (GTK_CONTAINER (hbox), spinner);
+    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
+    gtk_container_add (GTK_CONTAINER (vbox), hbox);
     spinner_unsensitive = spinner;
     gtk_widget_set_sensitive (hbox, FALSE);
 
     button = gtk_button_new_with_label (_("Play"));
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (on_play_clicked), spinner);
-    gtk_box_append (GTK_BOX (vbox), button);
+    gtk_container_add (GTK_CONTAINER (vbox), button);
 
     button = gtk_button_new_with_label (_("Stop"));
     g_signal_connect (G_OBJECT (button), "clicked",
                       G_CALLBACK (on_stop_clicked), spinner);
-    gtk_box_append (GTK_BOX (vbox), button);
+    gtk_container_add (GTK_CONTAINER (vbox), button);
 
     /* Start by default to test for:
      * https://bugzilla.gnome.org/show_bug.cgi?id=598496 */
@@ -92,7 +93,7 @@ do_spinner (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/stack.c

@@ -21,7 +21,8 @@ do_stack (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       g_object_unref (builder);
     }
@@ -29,7 +30,7 @@ do_stack (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
 
   return window;

demos/gtk-demo/tabs.c

@@ -23,7 +23,9 @@ do_tabs (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -51,7 +53,7 @@ do_tabs (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/tagged_entry.c

@@ -72,7 +72,8 @@ do_tagged_entry (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "A tagged entry");
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_window_set_deletable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
       gtk_widget_set_margin_start (box, 18);
@@ -82,23 +83,23 @@ do_tagged_entry (GtkWidget *do_widget)
       gtk_window_set_child (GTK_WINDOW (window), box);
 
       entry = demo_tagged_entry_new ();
-      gtk_box_append (GTK_BOX (box), entry);
+      gtk_container_add (GTK_CONTAINER (box), entry);
 
       box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_widget_set_halign (box2, GTK_ALIGN_END);
-      gtk_box_append (GTK_BOX (box), box2);
+      gtk_container_add (GTK_CONTAINER (box), box2);
 
       button = gtk_button_new_with_mnemonic ("Add _Tag");
       g_signal_connect (button, "clicked", G_CALLBACK (add_tag), entry);
-      gtk_box_append (GTK_BOX (box2), button);
+      gtk_container_add (GTK_CONTAINER (box2), button);
 
       button = gtk_check_button_new_with_mnemonic ("_Spinner");
       g_signal_connect (button, "toggled", G_CALLBACK (toggle_spinner), entry);
-      gtk_box_append (GTK_BOX (box2), button);
+      gtk_container_add (GTK_CONTAINER (box2), button);
       
       button = gtk_button_new_with_mnemonic ("_Done");
       gtk_widget_add_css_class (button, "suggested-action");
-      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
+      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 
       gtk_window_set_default_widget (GTK_WINDOW (window), button);
@@ -107,7 +108,7 @@ do_tagged_entry (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/textmask.c

@@ -63,7 +63,9 @@ do_textmask (GtkWidget *do_widget)
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_widget_set_size_request (window, 400, 200);
       gtk_window_set_title (GTK_WINDOW (window), "Text Mask");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       da = gtk_drawing_area_new ();
 
@@ -74,7 +76,7 @@ do_textmask (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/textscroll.c

@@ -157,7 +157,7 @@ create_text_view (GtkWidget *hbox,
   guint timeout;
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_box_append (GTK_BOX (hbox), swindow);
+  gtk_container_add (GTK_CONTAINER (hbox), swindow);
   textview = gtk_text_view_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), textview);
 
@@ -182,7 +182,8 @@ do_textscroll (GtkWidget *do_widget)
 
       window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Automatic Scrolling");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
@@ -196,7 +197,7 @@ do_textscroll (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/textundo.c

@@ -26,8 +26,11 @@ do_textundo (GtkWidget *do_widget)
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   450, 450);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "TextView Undo");
 
@@ -60,7 +63,7 @@ do_textundo (GtkWidget *do_widget)
     }
   else
     {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
       window = NULL;
     }
 

demos/gtk-demo/textview.c

@@ -477,8 +477,11 @@ do_textview (GtkWidget *do_widget)
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   450, 450);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Views");
 
@@ -498,9 +501,7 @@ do_textview (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_paned_set_start_child (GTK_PANED (vpaned), sw);
-      gtk_paned_set_resize_start_child (GTK_PANED (vpaned), FALSE);
-      gtk_paned_set_shrink_start_child (GTK_PANED (vpaned), TRUE);
+      gtk_paned_add1 (GTK_PANED (vpaned), sw);
 
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view1);
 
@@ -508,9 +509,7 @@ do_textview (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_paned_set_end_child (GTK_PANED (vpaned), sw);
-      gtk_paned_set_resize_end_child (GTK_PANED (vpaned), TRUE);
-      gtk_paned_set_shrink_end_child (GTK_PANED (vpaned), TRUE);
+      gtk_paned_add2 (GTK_PANED (vpaned), sw);
 
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view2);
 
@@ -527,7 +526,7 @@ do_textview (GtkWidget *do_widget)
     }
   else
     {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
       window = NULL;
     }
 

demos/gtk-demo/themes.c

@@ -178,10 +178,12 @@ do_themes (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/themes/themes.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
       header = GTK_WIDGET (gtk_builder_get_object (builder, "header"));
       gesture = gtk_gesture_click_new ();
       g_signal_connect (gesture, "pressed", G_CALLBACK (clicked), builder);
@@ -193,7 +195,7 @@ do_themes (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/theming_style_classes.c

@@ -25,7 +25,8 @@ do_theming_style_classes (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Style Classes");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       builder = gtk_builder_new_from_resource ("/theming_style_classes/theming.ui");
 
@@ -37,7 +38,7 @@ do_theming_style_classes (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/transparent.c

@@ -22,7 +22,9 @@ do_transparent (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Transparency");
 
@@ -62,7 +64,7 @@ do_transparent (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/tree_store.c

@@ -394,7 +394,8 @@ do_tree_store (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Tree Store");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_widget_set_margin_start (vbox, 8);
@@ -403,7 +404,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_widget_set_margin_bottom (vbox, 8);
       gtk_window_set_child (GTK_WINDOW (window), vbox);
 
-      gtk_box_append (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                           gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));
 
       sw = gtk_scrolled_window_new (NULL, NULL);
@@ -411,7 +412,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_append (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);
 
       /* create model */
       model = create_model ();
@@ -436,7 +437,7 @@ do_tree_store (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/gtk-demo/video_player.c

@@ -23,7 +23,7 @@ open_dialog_response_cb (GtkWidget *dialog,
       g_object_unref (file);
     }
 
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (dialog);
 }
 
 static void
@@ -67,7 +67,8 @@ do_video_player (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Video Player");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       video = gtk_video_new ();
       gtk_window_set_child (GTK_WINDOW (window), video);
@@ -88,7 +89,7 @@ do_video_player (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);
 
   return window;
 }

demos/meson.build

@@ -3,4 +3,3 @@ subdir('gtk-demo')
 subdir('icon-browser')
 subdir('node-editor')
 subdir('widget-factory')
-subdir('print-editor')

demos/node-editor/node-editor-window.c

@@ -62,8 +62,6 @@ struct _NodeEditorWindow
   GListStore *renderers;
   GdkPaintable *paintable;
 
-  GFileMonitor *file_monitor;
-
   GArray *errors;
 };
 
@@ -333,10 +331,11 @@ text_view_query_tooltip_cb (GtkWidget        *widget,
     }
 }
 
-static gboolean
-load_file_contents (NodeEditorWindow *self,
-                    GFile            *file)
+gboolean
+node_editor_window_load (NodeEditorWindow *self,
+                         GFile            *file)
 {
+  GtkTextIter end;
   GBytes *bytes;
 
   bytes = g_file_load_bytes (file, NULL, NULL, NULL);
@@ -349,54 +348,17 @@ load_file_contents (NodeEditorWindow *self,
       return FALSE;
     }
 
-  gtk_text_buffer_set_text (self->text_buffer,
-                            g_bytes_get_data (bytes, NULL),
-                            g_bytes_get_size (bytes));
+  gtk_text_buffer_get_end_iter (self->text_buffer, &end);
+  gtk_text_buffer_insert (self->text_buffer,
+                          &end,
+                          g_bytes_get_data (bytes, NULL),
+                          g_bytes_get_size (bytes));
 
   g_bytes_unref (bytes);
 
   return TRUE;
 }
 
-static void
-file_changed_cb (GFileMonitor      *monitor,
-                 GFile             *file,
-                 GFile             *other_file,
-                 GFileMonitorEvent  event_type,
-                 gpointer           user_data)
-{
-  NodeEditorWindow *self = user_data;
-
-  if (event_type == G_FILE_MONITOR_EVENT_CHANGED)
-    load_file_contents (self, file);
-}
-
-gboolean
-node_editor_window_load (NodeEditorWindow *self,
-                         GFile            *file)
-{
-  GError *error = NULL;
-
-  if (!load_file_contents (self, file))
-    return FALSE;
-
-  g_clear_object (&self->file_monitor);
-  self->file_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
-
-
-  if (error)
-    {
-      g_warning ("couldn't monitor file: %s", error->message);
-      g_error_free (error);
-    }
-  else
-    {
-      g_signal_connect (self->file_monitor, "changed", G_CALLBACK (file_changed_cb), self);
-    }
-
-  return TRUE;
-}
-
 static void
 open_response_cb (GtkWidget        *dialog,
                   gint              response,
@@ -413,7 +375,7 @@ open_response_cb (GtkWidget        *dialog,
       g_object_unref (file);
     }
 
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (dialog);
 }
 
 static void
@@ -479,7 +441,7 @@ save_response_cb (GtkWidget        *dialog,
                                                    "Saving failed");
           gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog),
                                                     "%s", error->message);
-          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
           gtk_widget_show (message_dialog);
           g_error_free (error);
         }
@@ -488,7 +450,7 @@ save_response_cb (GtkWidget        *dialog,
       g_object_unref (file);
     }
 
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (dialog);
 }
 
 static void
@@ -596,14 +558,14 @@ export_image_response_cb (GtkWidget  *dialog,
                                                    GTK_MESSAGE_INFO,
                                                    GTK_BUTTONS_OK,
                                                    "Exporting to image failed");
-          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
           gtk_widget_show (message_dialog);
         }
 
       g_object_unref (file);
     }
 
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (dialog);
   g_object_unref (texture);
 }
 
@@ -825,16 +787,16 @@ node_editor_window_create_renderer_widget (gpointer item,
   gtk_widget_set_size_request (box, 120, 90);
 
   label = gtk_label_new (g_object_get_data (G_OBJECT (paintable), "description"));
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (box), label);
 
   picture = gtk_picture_new_for_paintable (paintable);
   /* don't ever scale up, we want to be as accurate as possible */
   gtk_widget_set_halign (picture, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (picture, GTK_ALIGN_CENTER);
-  gtk_box_append (GTK_BOX (box), picture);
+  gtk_container_add (GTK_CONTAINER (box), picture);
 
   row = gtk_list_box_row_new ();
-  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
+  gtk_container_add (GTK_CONTAINER (row), box);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
 
   return row;

demos/node-editor/node-editor-window.ui

@@ -123,7 +123,7 @@
     </child>
     <child>
       <object class="GtkPaned">
-        <property name="shrink-end-child">false</property>
+        <property name="shrink-child2">false</property>
         <property name="position">400</property>
         <child>
           <object class="GtkScrolledWindow">

demos/print-editor/meson.build

@@ -1,6 +0,0 @@
-executable('print-editor',
-           ['print-editor.c'],
-           c_args: common_cflags,
-           dependencies: libgtk_dep,
-           include_directories: confinc,
-           gui_app: true)

demos/widget-factory/widget-factory.c

@@ -311,7 +311,7 @@ activate_quit (GSimpleAction *action,
       win = list->data;
       next = list->next;
 
-      gtk_window_destroy (GTK_WINDOW (win));
+      gtk_widget_destroy (GTK_WIDGET (win));
 
       list = next;
     }
@@ -891,12 +891,12 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
     {
       if (silver)
         {
-          gtk_list_box_remove (GTK_LIST_BOX (widget), silver);
+          gtk_container_remove (GTK_CONTAINER (widget), silver);
           g_object_set_data (G_OBJECT (widget), "Silver", NULL);
         }
       if (gold)
         {
-          gtk_list_box_remove (GTK_LIST_BOX (widget), gold);
+          gtk_container_remove (GTK_CONTAINER (widget), gold);
           g_object_set_data (G_OBJECT (widget), "Gold", NULL);
         }
 
@@ -926,7 +926,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                 "margin-bottom", 6,
                 "xalign", 0.0,
                 NULL);
-  gtk_box_append (GTK_BOX (row), label);
+  gtk_container_add (GTK_CONTAINER (row), label);
   gdk_rgba_parse (&rgba, color);
   swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                          "rgba", &rgba,
@@ -941,8 +941,8 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                          "height-request", 24,
                          NULL);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_append (GTK_BOX (box), swatch);
-  gtk_box_append (GTK_BOX (row), box);
+  gtk_container_add (GTK_CONTAINER (box), swatch);
+  gtk_container_add (GTK_CONTAINER (row), box);
   gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
   row = gtk_widget_get_parent (row);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -1044,7 +1044,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                     "hexpand", TRUE,
                     "xalign", 0.0,
                     NULL);
-      gtk_box_append (GTK_BOX (row), label);
+      gtk_container_add (GTK_CONTAINER (row), label);
       gdk_rgba_parse (&rgba, colors[i].color);
       swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                              "rgba", &rgba,
@@ -1059,8 +1059,8 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                              "height-request", 24,
                              NULL);
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), swatch);
-      gtk_box_append (GTK_BOX (row), box);
+      gtk_container_add (GTK_CONTAINER (box), swatch);
+      gtk_container_add (GTK_CONTAINER (row), box);
       gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
       row = gtk_widget_get_parent (row);
       gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -1288,7 +1288,10 @@ close_selection_dialog (GtkWidget *dialog, gint response, GtkWidget *tv)
   if (response == GTK_RESPONSE_CANCEL)
     return;
 
-  box = gtk_widget_get_first_child (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
+  box = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+  children = gtk_container_get_children (GTK_CONTAINER (box));
+  box = children->data;
+  g_list_free (children);
   g_assert (GTK_IS_FLOW_BOX (box));
   children = gtk_flow_box_get_selected_children (GTK_FLOW_BOX (box));
 

demos/widget-factory/widget-factory.ui

@@ -1779,10 +1779,6 @@ microphone-sensitivity-medium-symbolic</property>
                                                 <property name="hexpand">1</property>
                                                 <property name="halign">end</property>
                                                 <property name="valign">center</property>
-                                                <property name="margin-top">6</property>
-                                                <property name="margin-bottom">6</property>
-                                                <property name="margin-start">12</property>
-                                                <property name="margin-end">12</property>
                                               </object>
                                             </child>
                                           </object>
@@ -1800,6 +1796,7 @@ microphone-sensitivity-medium-symbolic</property>
                                                 <property name="halign">start</property>
                                                 <property name="valign">center</property>
                                                 <property name="margin-start">6</property>
+                                                <property name="margin-start">6</property>
                                                 <property name="margin-end">6</property>
                                                 <property name="margin-top">6</property>
                                                 <property name="margin-bottom">6</property>

docs/reference/gdk/gdk4-docs.xml

@@ -40,7 +40,6 @@
     <xi:include href="xml/gdkdrawcontext.xml" />
     <xi:include href="xml/gdkglcontext.xml" />
     <xi:include href="xml/gdkvulkancontext.xml" />
-    <xi:include href="xml/gdkcairocontext.xml" />
     <xi:include href="xml/events.xml" />
     <xi:include href="xml/keys.xml" />
     <xi:include href="xml/gdkclipboard.xml" />

docs/reference/gdk/gdk4-sections.txt

@@ -98,8 +98,6 @@ gdk_display_get_monitor_at_surface
 gdk_display_get_clipboard
 gdk_display_get_primary_clipboard
 gdk_display_get_setting
-gdk_display_get_startup_notification_id
-gdk_display_setup_window_visual
 
 <SUBSECTION>
 gdk_display_map_keyval
@@ -147,7 +145,6 @@ gdk_display_manager_get_type
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
 gdk_pixbuf_get_from_surface
-gdk_pixbuf_get_from_texture
 </SECTION>
 
 <SECTION>
@@ -186,6 +183,8 @@ gdk_surface_get_display
 gdk_surface_hide
 gdk_surface_is_viewable
 gdk_surface_get_mapped
+gdk_surface_get_width
+gdk_surface_get_height
 gdk_surface_translate_coordinates
 gdk_surface_begin_resize_drag
 gdk_surface_begin_move_drag
@@ -205,6 +204,8 @@ gdk_surface_get_frame_clock
 <SUBSECTION>
 gdk_surface_set_cursor
 gdk_surface_get_cursor
+gdk_surface_set_device_cursor
+gdk_surface_get_device_cursor
 gdk_surface_set_input_region
 gdk_surface_get_width
 gdk_surface_get_height
@@ -355,9 +356,9 @@ GdkDevice
 GdkInputSource
 GdkAxisUse
 GdkAxisFlags
-GdkDeviceTool
 GdkDeviceToolType
 GdkDeviceType
+GdkGrabOwnership
 
 <SUBSECTION>
 gdk_device_get_name
@@ -379,12 +380,6 @@ gdk_device_get_axes
 gdk_device_get_seat
 gdk_device_get_num_touches
 gdk_device_get_device_tool
-gdk_device_get_caps_lock_state
-gdk_device_get_direction
-gdk_device_get_modifier_state
-gdk_device_get_num_lock_state
-gdk_device_get_scroll_lock_state
-gdk_device_has_bidi_layouts
 
 <SUBSECTION>
 gdk_device_get_state
@@ -476,8 +471,6 @@ gdk_seat_capabilities_get_type
 GdkEvent
 GdkEventType
 GdkEventMask
-GdkKeyMatch
-GdkTouchpadGesturePhase
 GdkScrollDirection
 GdkCrossingMode
 GdkNotifyType
@@ -519,25 +512,25 @@ gdk_key_event_get_consumed_modifiers
 gdk_key_event_get_layout
 gdk_key_event_get_level
 gdk_key_event_is_modifier
+GdkEventMatch
 gdk_key_event_matches
 gdk_key_event_get_match
 gdk_focus_event_get_in
 gdk_touch_event_get_emulating_pointer
 gdk_crossing_event_get_mode
 gdk_crossing_event_get_detail
-gdk_crossing_event_get_focus
-gdk_grab_broken_event_get_grab_surface
-gdk_dnd_event_get_drop
 gdk_configure_event_get_size
 gdk_touchpad_event_get_gesture_phase
 gdk_touchpad_event_get_n_fingers
 gdk_touchpad_event_get_deltas
-gdk_touchpad_event_get_pinch_angle_delta
-gdk_touchpad_event_get_pinch_scale
-gdk_pad_event_get_axis_value
-gdk_pad_event_get_button
+gdk_touchpad_pinch_event_get_angle_delta
+gdk_touchpad_pinch_event_get_scale
+gdk_pad_button_event_get_button
+gdk_pad_axis_event_get_value
 gdk_pad_event_get_group_mode
-gdk_motion_event_get_history
+gdk_drag_event_get_drop
+gdk_grab_broken_event_get_grab_surface
+gdk_event_get_motion_history
 
 <SUBSECTION>
 gdk_events_get_angle
@@ -560,7 +553,6 @@ gdk_event_sequence_get_type
 <FILE>gdkpaintable</FILE>
 <TITLE>GdkPaintable</TITLE>
 GdkPaintable
-GdkPaintableInterface
 GdkPaintableFlags
 gdk_paintable_get_current_image
 gdk_paintable_snapshot
@@ -575,19 +567,9 @@ gdk_paintable_invalidate_contents
 gdk_paintable_invalidate_size
 gdk_paintable_new_empty
 
-<SUBSECTION>
-GdkSnapshot
-
-<SUBSECTION Standard>
-GDK_SNAPSHOT
-GDK_TYPE_PAINTABLE
-GDK_TYPE_SNAPSHOT
-GDK_IS_SNAPSHOT
-
 <SUBSECTION Private>
-GdkSnapshotClass
+GDK_TYPE_PAINTABLE
 gdk_paintable_get_type
-gdk_snapshot_get_type
 </SECTION>
 
 
@@ -761,11 +743,6 @@ gdk_drag_set_hotspot
 <SUBSECTION>
 gdk_drag_action_is_unique
 
-<SUBSECTION>
-GdkDragSurface
-GdkDragSurfaceInterface
-gdk_drag_surface_present
-
 <SUBSECTION>
 gdk_drop_get_display
 gdk_drop_get_device
@@ -792,7 +769,6 @@ GDK_TYPE_DRAG_PROTOCOL
 GDK_TYPE_DROP
 GDK_DROP
 GDK_IS_DROP
-GDK_TYPE_DRAG_SURFACE
 
 <SUBSECTION Private>
 GdkDragClass
@@ -1219,7 +1195,6 @@ GdkContentProviderClass
 gdk_content_provider_new_for_value
 gdk_content_provider_new_typed
 gdk_content_provider_new_for_bytes
-gdk_content_provider_new_union
 gdk_content_provider_ref_formats
 gdk_content_provider_ref_storable_formats
 gdk_content_provider_content_changed

docs/reference/gsk/gsk4-docs.xml

@@ -27,6 +27,4 @@
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
   </index>
 
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-
 </book>

docs/reference/gsk/gsk4-sections.txt

@@ -1,6 +1,5 @@
 <SECTION>
 <FILE>GskRenderer</FILE>
-GskRenderer
 gsk_renderer_get_surface
 gsk_renderer_realize
 gsk_renderer_unrealize
@@ -17,6 +16,7 @@ gsk_broadway_renderer_new
 GSK_IS_RENDERER
 GSK_RENDERER
 GSK_TYPE_RENDERER
+GskRenderer
 GskRendererClass
 gsk_renderer_get_type
 GSK_TYPE_SCALING_FILTER
@@ -24,28 +24,6 @@ GSK_TYPE_SCALING_FILTER
 
 <SECTION>
 <FILE>GskRenderNode</FILE>
-GskRenderNode
-GskBlendNode
-GskBlurNode
-GskBorderNode
-GskCairoNode
-GskClipNode
-GskColorMatrixNode
-GskColorNode
-GskContainerNode
-GskCrossFadeNode
-GskDebugNode
-GskInsetShadowNode
-GskLinearGradientNode
-GskOpacityNode
-GskOutsetShadowNode
-GskRepeatingLinearGradientNode
-GskRepeatNode
-GskRoundedClipNode
-GskShadowNode
-GskTextNode
-GskTextureNode
-GskTransformNode
 gsk_render_node_ref
 gsk_render_node_unref
 GskRenderNodeType
@@ -64,7 +42,6 @@ gsk_color_node_new
 gsk_color_node_peek_color
 gsk_texture_node_new
 gsk_texture_node_get_texture
-GskColorStop
 gsk_linear_gradient_node_new
 gsk_linear_gradient_node_peek_start
 gsk_linear_gradient_node_peek_end
@@ -132,7 +109,6 @@ gsk_text_node_new
 gsk_text_node_peek_font
 gsk_text_node_peek_glyphs
 gsk_text_node_peek_color
-gsk_text_node_has_color_glyphs
 gsk_text_node_get_num_glyphs
 gsk_text_node_get_offset
 gsk_blur_node_new
@@ -145,52 +121,10 @@ gsk_debug_node_get_message
 GSK_IS_RENDER_NODE
 GSK_RENDER_NODE
 GSK_TYPE_RENDER_NODE
-GSK_TYPE_BLEND_NODE
-GSK_TYPE_BLUR_NODE
-GSK_TYPE_BORDER_NODE
-GSK_TYPE_CAIRO_NODE
-GSK_TYPE_CLIP_NODE
-GSK_TYPE_COLOR_MATRIX_NODE
-GSK_TYPE_COLOR_NODE
-GSK_TYPE_CONTAINER_NODE
-GSK_TYPE_CROSS_FADE_NODE
-GSK_TYPE_DEBUG_NODE
-GSK_TYPE_INSET_SHADOW_NODE
-GSK_TYPE_LINEAR_GRADIENT_NODE
-GSK_TYPE_OPACITY_NODE
-GSK_TYPE_OUTSET_SHADOW_NODE
-GSK_TYPE_REPEATING_LINEAR_GRADIENT_NODE
-GSK_TYPE_REPEAT_NODE
-GSK_TYPE_ROUNDED_CLIP_NODE
-GSK_TYPE_SHADOW_NODE
-GSK_TYPE_TEXT_NODE
-GSK_TYPE_TEXTURE_NODE
-GSK_TYPE_TRANSFORM_NODE
+GSK_VALUE_HOLDS_RENDER_NODE
+GskRenderNode
 GskRenderNodeClass
-gsk_blend_node_get_type
-gsk_blur_node_get_type
-gsk_border_node_get_type
-gsk_broadway_renderer_get_type
-gsk_cairo_node_get_type
-gsk_cairo_renderer_get_type
-gsk_clip_node_get_type
-gsk_color_matrix_node_get_type
-gsk_color_node_get_type
-gsk_container_node_get_type
-gsk_cross_fade_node_get_type
-gsk_debug_node_get_type
-gsk_inset_shadow_node_get_type
-gsk_linear_gradient_node_get_type
-gsk_opacity_node_get_type
-gsk_outset_shadow_node_get_type
 gsk_render_node_get_type
-gsk_repeating_linear_gradient_node_get_type
-gsk_repeat_node_get_type
-gsk_rounded_clip_node_get_type
-gsk_shadow_node_get_type
-gsk_text_node_get_type
-gsk_texture_node_get_type
-gsk_transform_node_get_type
 GSK_TYPE_BLEND_MODE
 <SUBSECTION Standard>
 gsk_serialization_error_quark
@@ -251,7 +185,6 @@ gsk_transform_transform_bounds
 gsk_transform_transform_point
 <SUBSECTION Private>
 GSK_TYPE_TRANSFORM
-GSK_TYPE_TRANSFORM_CATEGORY
 gsk_transform_get_type
 gsk_transform_new
 </SECTION>

docs/reference/gtk/actions.xml

@@ -208,8 +208,8 @@
 
      <para>
        You can convert between detailed action names and split-out
-       action names and target values using g_action_parse_detailed_name()
-       and g_action_print_detailed_name() but usually you will
+       action names and target values using g_action_parse_detailed_action_name()
+       and g_action_print_detailed_action_name() but usually you will
        not need to. Most APIs will provide both ways of specifying
        actions with targets.
      </para>