Rename gdk_surface_input_shape_combine_region

There is no shape combining going on anymore, so call this just gdk_surface_set_input_region, and remove the offset arguments too. All callers pass 0 anyway. Update all callers.
surface: Drop more toplevel api
2020-03-01 11:32:24 -08:00 · 2020-03-01 11:32:24 -08:00 · 2020-03-01 11:32:24 -08:00 · 2020-03-01 11:32:24 -08:00 · 2020-03-01 11:32:24 -08:00 · 2020-03-01 11:20:21 -08:00
1263 changed files with 88822 additions and 105659 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,14 +27,14 @@ variables:

 style-check-diff:
  extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
  stage: .pre
  allow_failure: true
  script:
    - .gitlab-ci/run-style-check-diff.sh

 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
  stage: build
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
@@ -66,7 +66,7 @@ fedora-x86_64:
    <<: *cache-paths

 release-build:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
  stage: build
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
@@ -99,12 +99,12 @@ release-build:
 .mingw-defaults: &mingw-defaults
  stage: build
  tags:
-    - win32-ps
+    - win32
  script:
    - 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: "%CI_JOB_NAME%"
    <<: *cache-paths

 msys2-mingw32:
@@ -168,7 +168,7 @@ flatpak-master:icon-browser:
  <<: *flatpak-master

 static-scan:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
  stage: analysis
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=debug"
@@ -181,7 +181,7 @@ static-scan:
  allow_failure: true

 reference:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
  stage: docs
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -13,7 +13,6 @@ RUN dnf -y install \
    colord-devel \
    cups-devel \
    dbus-daemon \
-    dbus-x11 \
    dejavu-sans-mono-fonts \
    desktop-file-utils \
    diffutils \
@@ -82,7 +81,7 @@ RUN dnf -y install \
    xorg-x11-server-Xvfb \
 && dnf clean all

-RUN pip3 install meson==0.53.1
+RUN pip3 install meson==0.52.1

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
--- a/.gitlab-ci/meson-html-report.py
+++ b/.gitlab-ci/meson-html-report.py
@@ -174,7 +174,7 @@ ul.images li {
        <div class="failures">
          <h4><a name="{{ suite_result.suite_name }}-failed">Failures</a></h4>
          <ul class="failed">
-            {% for failure in suite_result.failures if failure.result in [ 'ERROR', 'FAIL', 'UNEXPECTEDPASS' ] %}
+            {% for failure in suite_result.failures if failure.result in [ 'FAIL', 'UNEXPECTEDPASS' ] %}
            <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
              {% if failure.stdout %}
              Output: <pre>{{ failure.stdout }}</pre>
@@ -207,6 +207,24 @@ ul.images li {
        </div>

        <div class="successes">
+          <h4><a name="{{ suite_result.suite_name }}-skipped">Skipped</a></h4>
+          <ul>
+            {% for success in suite_result.successes if success.result == 'SKIP' %}
+            <li>{{ success.name }} - result: <span class="result skip">{{ success.result }}</li>
+            {% else %}
+            <li>None</li>
+            {% endfor %}
+          </ul>
+
+          <h4><a name="{{ suite_result.suite_name }}-passed">Passed</a></h4>
+          <ul class="passed">
+            {% for success in suite_result.successes if success.result == 'OK' %}
+            <li>{{ success.name }} - result: <span class="result pass">{{ success.result }}</li>
+            {% else %}
+            <li>None</li>
+            {% endfor %}
+          </ul>
+
          <h4><a name="{{ suite_result.suite_name }}-expected-fail">Expected failures</a></h4>
          <ul>
          {% for success in suite_result.successes if success.result == 'EXPECTEDFAIL' %}
@@ -226,24 +244,6 @@ ul.images li {
            <li>None</li>
          {% endfor %}
          </ul>
-
-          <h4><a name="{{ suite_result.suite_name }}-skipped">Skipped</a></h4>
-          <ul>
-            {% for success in suite_result.successes if success.result == 'SKIP' %}
-            <li>{{ success.name }} - result: <span class="result skip">{{ success.result }}</li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
-          <h4><a name="{{ suite_result.suite_name }}-passed">Passed</a></h4>
-          <ul class="passed">
-            {% for success in suite_result.successes if success.result == 'OK' %}
-            <li>{{ success.name }} - result: <span class="result pass">{{ success.result }}</li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
        </div>

      </div>
@@ -331,7 +331,7 @@ for name, units in suites.items():
    print('Processing {} suite {}:'.format(project_name, suite_name))

    def if_failed(unit):
-        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT', 'ERROR',]:
+        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
            return True
        return False

--- a/.gitlab-ci/meson-junit-report.py
+++ b/.gitlab-ci/meson-junit-report.py
@@ -70,7 +70,7 @@ for name, units in suites.items():
    print('Processing suite {} (units: {})'.format(name, len(units)))

    def if_failed(unit):
-        if unit['result'] in ['ERROR', 'FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
+        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
            return True
        return False

--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -34,7 +34,7 @@ pacman --noconfirm -S --needed \
    mingw-w64-$MSYS2_ARCH-shared-mime-info

 # https://gitlab.gnome.org/GNOME/gtk/issues/2243
-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"
+wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner/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"

 mkdir -p _ccache
@@ -45,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
--- a/CONTRIBUTING.md
+++ b/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).
--- a/165
+++ b/165
@@ -1,168 +1,3 @@
-Overview of Changes in GTK 3.98.3
-=================================
-
-* GtkEntry:
- - Support setting attributes in ui files
-
-* GtkScaleButton:
- - Don't derive from GtkButton
-
-* GtkAboutDialog:
- - Support more common licenses
-
-* GtkEmojiChooser:
- - Improve keyboard navigation
-
-* GtkLabel:
- - Remove pattern API
-
-* GtkAspectFrame:
- - Modernize and simplify
-
-* Chooser buttons:
- - Make dialogs modal by default
-
-* Various widgets:
- - Replace shadow-type and relief properties by
-   a simpler has-frame
-
-* CSS:
- - Use :focus-visible instead of :focus(visible)
- - Add support for :focus-within
-
-* Focus handling
- - Fix crossing event generation
- - Fix focus handling in various widgets
- - Change :can-focus to be recursive
- - Fix GtkWindow:is-active setting
-
-* Scrolling
- - gtk_container_set_focus_[hv]adjustment has been removed
- - gtk_viewport_set_scroll_to_focus has been added
-
-* Accessibility:
- - Add a cursor-aspect-ratio setting
- - Set focus-related states properly
-
-* Themes:
- - Use blue focus outlines more
- - Numerous minor improvements
-
-* Wayland:
- - Fix .Compose file loading
- - Support popup repositioning
- - Fix problems with autohide popovers
-
-* GDK:
- - Remove GdkKeymap from public API, replaced by
-   GdkDevice properties
- - Add full keyboard translation state to key events
- - Simplify modifier support, drop GdkModifierIntent
- - Move key event matching to GDK
- - Add GdkSurface::enter/leave-monitor signals
- - Turn GskEvent into a derivable type, and make
-   it introspectable
-
-* GSK:
- - Turn GskRenderNode into a derivable type, and make
-   it introspectable
- - Fall back to cairo if compiling shaders fails
-
-* Translation updates:
- - Japanese
- - Lithuanian
- - Turkish
-
-
-Overview of Changes in GTK 3.98.2
-=================================
-
-* Introduce GtkShortcutController, and replace key bindings,
-  mnemonics and accelerators by GtkShortcut
-
-* Derive the HighContrast theme from Adwaita
-
-* GtkMenuButton: Add a use-underline property
-
-* GtkTreeView: Fix cell editing
-
-* Add gdk_toplevel_inhibit_system_shortcuts
-
-* gtk-demo: Fix issues in multiple demos
-
-* Translation updates:
- Polish
-
-
-Overview of Changes in GTK 3.98.1
-=================================
-
-* GtkFileChooser:
- - Remove filename/uri api
- - Drop extra-widget
- - Remove overwrite confirmation
- - Remove show-hidden property
- - Remove local-only property
- - Remove GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
- - The portal file chooser supports selecting folders
-
-* GtkSpinner:
- - Rename active property to spinning
-
-* GtkRevealer:
- - Fix size allocation at small scales
-
-* GtkPopover:
- - Drop :relative-to, it is always the :parent now
-
-* GtkWindow:
- - Drop window-type, it is always a regular toplevel
-
-* GtkWidget:
- - Drop expand property
- - Drop margin property
- - Drop gtk_grab_add, gtk_device_grab_add
-
-* GtkTextView:
- - Support overlines in GtkTextTag
- - Support visible spaces in GtkTextTag
- - Support hyphenation control in GtkTextTag
-
-* Split GtkEventControllerFocus from GtkEventControllerKey
-
-* DND:
- - Fix local DND to avoid serialization
- - Add new content provider constructors
- - Split GtkDropTargetAsync and GtkDropTarget
- - Group DND events into event sequences
- - Propagate DND events like motion events
- - Introduce GtkDropControllerMotion
- - Remove GtkSelectionData
-
-* Performance:
- - Clean up profiler marks
- - Share GL programs between renderers
-
-* GDK:
- - Drop gdk_surface_new_temp
- - Make GdkEvent an immutable boxed type, not an object
- - Remove GdkAtom and property- and selection-related apis
- - Introduce GdkPopup and GdkToplevel interfaces
- - Implement them in backend-specific surface subtypes
- - Rename gdk_surface_input_shape_combine_region to
-   gdk_surface_set_input_region
- - Drop X11-only concepts such as sticky or keep-below
-
-* OS X: Fix OpenGL extension detection
-
-* Broadway: implement scaling
-
-* Translation updates:
- Dutch
- Japanese
- Persian
-
-
 Overview of Changes in GTK 3.98.0
 =================================

--- a/README.md
+++ b/README.md
@@ -27,9 +27,9 @@ The official developers blog

  - https://blog.gtk.org

-Discussion forum
+Information about mailing lists can be found at

-  - https://discourse.gnome.org/c/platform/core/
+  - http://www.gtk.org/mailing-lists.php

 Nightly documentation can be found at
  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
@@ -140,12 +140,6 @@ In the bug report please include:
 * Further information such as stack traces may be useful, but
  is not necessary.

-Contributing to GTK
-------------------
-
-Please, follow the [contribution guide](./CONTRIBUTING.md) to know how to
-start contributing to GTK.
-
 Release notes
 -------------

@@ -162,4 +156,4 @@ GTK is released under the terms of the GNU Lesser General Public License,
 version 2.1 or, at your option, any later version, as published by the Free
 Software Foundation.

-Please, see the [`COPYING`](./COPYING) file for further information.
+Please, see the `COPYING` file for further information.
--- a/demos/constraint-editor/constraint-editor-window.c
+++ b/demos/constraint-editor/constraint-editor-window.c
@@ -308,17 +308,17 @@ save_response_cb (GtkNativeDialog        *dialog,
                               &error);
      if (error != NULL)
        {
-          GtkWidget *message_dialog;
+          GtkWidget *dialog;

-          message_dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
+          dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
                                           GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
                                           GTK_MESSAGE_INFO,
                                           GTK_BUTTONS_OK,
                                           "Saving failed");
-          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog),
+          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                                    "%s", error->message);
-          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
-          gtk_widget_show (message_dialog);
+          g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
+          gtk_widget_show (dialog);
          g_error_free (error);
        }

@@ -426,7 +426,7 @@ edit_constraint (ConstraintEditorWindow *win,

  editor = constraint_editor_new (model, constraint);

-  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
+  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));

  g_signal_connect (editor, "done", G_CALLBACK (constraint_editor_done), win);

@@ -460,7 +460,7 @@ edit_guide (ConstraintEditorWindow *win,
  gtk_window_set_title (GTK_WINDOW (window), "Edit Guide");

  editor = guide_editor_new (guide);
-  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
+  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));

  g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
  gtk_widget_show (window);
@@ -613,19 +613,19 @@ create_widget_func (gpointer item,
  if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
    {
      button = gtk_button_new_from_icon_name ("document-edit-symbolic");
-      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
+      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
      g_object_set_data (G_OBJECT (row), "edit", 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);
+      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
      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);
+      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
      gtk_container_add (GTK_CONTAINER (box), button);
    }
--- a/demos/constraint-editor/constraint-editor-window.ui
+++ b/demos/constraint-editor/constraint-editor-window.ui
@@ -9,6 +9,7 @@
    <property name="default-height">768</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
+        <property name="title" translatable="yes">GTK Constraint Editor</property>
        <property name="show-title-buttons">1</property>
        <child type="start">
          <object class="GtkButton">
--- a/demos/constraint-editor/constraint-view.c
+++ b/demos/constraint-editor/constraint-view.c
@@ -77,7 +77,7 @@ update_weak_position (ConstraintView *self,
                                                GTK_CONSTRAINT_RELATION_EQ,
                                                x,
                                                GTK_CONSTRAINT_STRENGTH_WEAK);
-      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
      gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
                                            constraint);
      g_object_set_data (G_OBJECT (child), "x-constraint", constraint);
@@ -97,7 +97,7 @@ update_weak_position (ConstraintView *self,
                                                GTK_CONSTRAINT_RELATION_EQ,
                                                y,
                                                GTK_CONSTRAINT_STRENGTH_WEAK);
-      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
      gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
                                            constraint);
      g_object_set_data (G_OBJECT (child), "y-constraint", constraint);
@@ -214,9 +214,9 @@ constraint_view_add_child (ConstraintView *view,

  label = gtk_label_new (name);
  frame = gtk_frame_new (NULL);
-  gtk_widget_add_css_class (frame, "child");
+  gtk_style_context_add_class (gtk_widget_get_style_context (frame), "child");
  gtk_widget_set_name (frame, name);
-  gtk_frame_set_child (GTK_FRAME (frame), label);
+  gtk_container_add (GTK_CONTAINER (frame), label);
  gtk_widget_set_parent (frame, GTK_WIDGET (view));

  update_weak_position (view, frame, 100, 100);
@@ -257,9 +257,9 @@ constraint_view_add_guide (ConstraintView *view,
                          G_BINDING_DEFAULT);

  frame = gtk_frame_new (NULL);
-  gtk_widget_add_css_class (frame, "guide");
-  g_object_set_data (G_OBJECT (frame), "internal", (char *)"yes");
-  gtk_frame_set_child (GTK_FRAME (frame), label);
+  gtk_style_context_add_class (gtk_widget_get_style_context (frame), "guide");
+  g_object_set_data (G_OBJECT (frame), "internal", "yes");
+  gtk_container_add (GTK_CONTAINER (frame), label);
  gtk_widget_insert_after (frame, GTK_WIDGET (view), NULL);

  g_object_set_data (G_OBJECT (guide), "frame", frame);
@@ -276,7 +276,7 @@ constraint_view_add_guide (ConstraintView *view,
                                       names[i].attr,
                                       1.0, 0.0,
                                       GTK_CONSTRAINT_STRENGTH_REQUIRED);
-      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
      gtk_constraint_layout_add_constraint (layout, constraint);
      g_object_set_data (G_OBJECT (guide), names[i].name, constraint);
    }
--- a/demos/constraint-editor/guide-editor.c
+++ b/demos/constraint-editor/guide-editor.c
@@ -78,7 +78,7 @@ get_strength (const char *id)
  return strength;
 }

-static const char *
+const char *
 get_strength_nick (GtkConstraintStrength strength)
 {
  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
--- a/demos/constraint-editor/meson.build
+++ b/demos/constraint-editor/meson.build
@@ -13,7 +13,6 @@ constraint_editor_resources = gnome.compile_resources('constraint_editor_resourc

 executable('gtk4-constraint-editor',
           constraint_editor_sources, constraint_editor_resources,
-           c_args: common_cflags,
           dependencies: libgtk_dep,
           include_directories: confinc,
           gui_app: true,
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -6,7 +6,6 @@
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;

-static GType demo_application_get_type (void);
 G_DEFINE_TYPE (DemoApplication, demo_application, GTK_TYPE_APPLICATION)

 typedef struct {
@@ -26,7 +25,6 @@ typedef struct {
 } DemoApplicationWindow;
 typedef GtkApplicationWindowClass DemoApplicationWindowClass;

-static GType demo_application_window_get_type (void);
 G_DEFINE_TYPE (DemoApplicationWindow, demo_application_window, GTK_TYPE_APPLICATION_WINDOW)

 static void create_window (GApplication *app, const char *contents);
@@ -503,13 +501,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 +517,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);
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -61,7 +61,7 @@
        </child>
        <child>
          <object class="GtkScrolledWindow">
-            <property name="has-frame">1</property>
+            <property name="shadow-type">in</property>
            <child>
              <object class="GtkTextView">
                <property name="hexpand">1</property>
--- a/demos/gtk-demo/appmenu.ui
+++ b/demos/gtk-demo/appmenu.ui
@@ -11,7 +11,7 @@
      <item>
        <attribute name="label" translatable="yes">_Quit</attribute>
        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Control&gt;q</attribute>
+        <attribute name="accel">&lt;Primary&gt;q</attribute>
      </item>
    </section>
  </menu>
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -7,6 +7,7 @@

 #include <gtk/gtk.h>

+static GtkWidget *assistant = NULL;
 static GtkWidget *progress_bar = NULL;

 static gboolean
@@ -26,7 +27,8 @@ apply_changes_gradually (gpointer data)
  else
    {
      /* Close automatically once changes are fully applied. */
-      gtk_widget_destroy (data);
+      gtk_widget_destroy (assistant);
+      assistant = NULL;
      return G_SOURCE_REMOVE;
    }
 }
@@ -35,13 +37,16 @@ static void
 on_assistant_apply (GtkWidget *widget, gpointer data)
 {
  /* Start a timer to simulate changes taking a few seconds to apply. */
-  g_timeout_add (100, apply_changes_gradually, widget);
+  g_timeout_add (100, apply_changes_gradually, NULL);
 }

 static void
 on_assistant_close_cancel (GtkWidget *widget, gpointer data)
 {
-  gtk_widget_destroy (widget);
+  GtkWidget **assistant = (GtkWidget **) data;
+
+  gtk_widget_destroy (*assistant);
+  *assistant = NULL;
 }

 static void
@@ -168,8 +173,6 @@ create_page4 (GtkWidget *assistant)
 GtkWidget*
 do_assistant (GtkWidget *do_widget)
 {
-  static GtkWidget *assistant;
-
  if (!assistant)
    {
      assistant = gtk_assistant_new ();
@@ -178,8 +181,6 @@ do_assistant (GtkWidget *do_widget)

      gtk_window_set_display (GTK_WINDOW (assistant),
                              gtk_widget_get_display (do_widget));
-      g_signal_connect (assistant, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &assistant);

      create_page1 (assistant);
      create_page2 (assistant);
@@ -187,9 +188,9 @@ do_assistant (GtkWidget *do_widget)
      create_page4 (assistant);

      g_signal_connect (G_OBJECT (assistant), "cancel",
-                        G_CALLBACK (on_assistant_close_cancel), NULL);
+                        G_CALLBACK (on_assistant_close_cancel), &assistant);
      g_signal_connect (G_OBJECT (assistant), "close",
-                        G_CALLBACK (on_assistant_close_cancel), NULL);
+                        G_CALLBACK (on_assistant_close_cancel), &assistant);
      g_signal_connect (G_OBJECT (assistant), "apply",
                        G_CALLBACK (on_assistant_apply), NULL);
      g_signal_connect (G_OBJECT (assistant), "prepare",
@@ -199,7 +200,10 @@ do_assistant (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (assistant))
    gtk_widget_show (assistant);
  else
+    {
      gtk_widget_destroy (assistant);
+      assistant = NULL;
+    }

  return assistant;
 }
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -25,8 +25,9 @@
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow">
+            <property name="can-focus">1</property>
            <property name="vexpand">1</property>
-            <property name="has-frame">1</property>
+            <property name="shadow-type">in</property>
            <property name="min-content-width">150</property>
            <layout>
              <property name="left-attach">0</property>
--- a/demos/gtk-demo/bluroverlay.c
+++ b/demos/gtk-demo/bluroverlay.c
@@ -39,7 +39,7 @@ enum {
 static guint signals[LAST_SIGNAL] = { 0 };
 static GQuark child_data_quark = 0;

-G_DEFINE_TYPE (BlurOverlay, blur_overlay, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE (BlurOverlay, blur_overlay, GTK_TYPE_BIN)

 static void
 blur_overlay_set_overlay_child (GtkWidget       *widget,
@@ -131,11 +131,13 @@ blur_overlay_child_update_style_classes (BlurOverlay *overlay,
  GtkAlign valign, halign;
  gboolean is_left, is_right, is_top, is_bottom;
  gboolean has_left, has_right, has_top, has_bottom;
+  GtkStyleContext *context;

-  has_left = gtk_widget_has_css_class (child, GTK_STYLE_CLASS_LEFT);
-  has_right = gtk_widget_has_css_class (child, GTK_STYLE_CLASS_RIGHT);
-  has_top = gtk_widget_has_css_class (child, GTK_STYLE_CLASS_TOP);
-  has_bottom = gtk_widget_has_css_class (child, GTK_STYLE_CLASS_BOTTOM);
+  context = gtk_widget_get_style_context (child);
+  has_left = gtk_style_context_has_class (context, GTK_STYLE_CLASS_LEFT);
+  has_right = gtk_style_context_has_class (context, GTK_STYLE_CLASS_RIGHT);
+  has_top = gtk_style_context_has_class (context, GTK_STYLE_CLASS_TOP);
+  has_bottom = gtk_style_context_has_class (context, GTK_STYLE_CLASS_BOTTOM);

  is_left = is_right = is_top = is_bottom = FALSE;

@@ -158,24 +160,24 @@ blur_overlay_child_update_style_classes (BlurOverlay *overlay,
    is_bottom = (child_allocation->y + child_allocation->height == height);

  if (has_left && !is_left)
-    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_LEFT);
+    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_LEFT);
  else if (!has_left && is_left)
-    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_LEFT);
+    gtk_style_context_add_class (context, GTK_STYLE_CLASS_LEFT);

  if (has_right && !is_right)
-    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_RIGHT);
+    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_RIGHT);
  else if (!has_right && is_right)
-    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_RIGHT);
+    gtk_style_context_add_class (context, GTK_STYLE_CLASS_RIGHT);

  if (has_top && !is_top)
-    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_TOP);
+    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TOP);
  else if (!has_top && is_top)
-    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_TOP);
+    gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOP);

  if (has_bottom && !is_bottom)
-    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_BOTTOM);
+    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_BOTTOM);
  else if (!has_bottom && is_bottom)
-    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_BOTTOM);
+    gtk_style_context_add_class (context, GTK_STYLE_CLASS_BOTTOM);
 }

 static void
@@ -204,7 +206,7 @@ blur_overlay_size_allocate (GtkWidget *widget,
  GtkWidget *child;
  GtkWidget *main_widget;

-  main_widget = overlay->main_widget;
+  main_widget = gtk_bin_get_child (GTK_BIN (overlay));
  if (main_widget && gtk_widget_get_visible (main_widget))
    gtk_widget_size_allocate (main_widget,
                              &(GtkAllocation) {
@@ -290,6 +292,43 @@ blur_overlay_get_child_position (BlurOverlay    *overlay,
  return TRUE;
 }

+static void
+blur_overlay_add (GtkContainer *container,
+                  GtkWidget    *widget)
+{
+  BlurOverlay *overlay = BLUR_OVERLAY (container);
+  gtk_widget_insert_after (widget, GTK_WIDGET (container), NULL);
+  overlay->main_widget = widget;  
+}
+
+static void
+blur_overlay_remove (GtkContainer *container,
+                     GtkWidget    *widget)
+{
+  BlurOverlay *overlay = BLUR_OVERLAY (container);
+  gtk_widget_unparent (widget);
+  if (overlay->main_widget == widget)
+    overlay->main_widget = NULL;
+}
+
+static void
+blur_overlay_forall (GtkContainer *overlay,
+                    GtkCallback   callback,
+                    gpointer      callback_data)
+{
+  GtkWidget *child;
+
+  child = gtk_widget_get_first_child (GTK_WIDGET (overlay));
+  while (child != NULL)
+    {
+      GtkWidget *next = gtk_widget_get_next_sibling (child);
+
+      (* callback) (child, callback_data);
+
+      child = next;
+    }
+}
+
 static void
 blur_overlay_snapshot (GtkWidget   *widget,
                      GtkSnapshot *snapshot)
@@ -383,32 +422,21 @@ blur_overlay_snapshot (GtkWidget   *widget,
  gsk_render_node_unref (main_widget_node);
 }

-static void
-blur_overlay_dispose (GObject *object)
-{
-  BlurOverlay *overlay = BLUR_OVERLAY (object);
-  GtkWidget *child;
-
-  g_clear_pointer (&overlay->main_widget, gtk_widget_unparent);
-
-  while ((child = gtk_widget_get_first_child (GTK_WIDGET (overlay))))
-    gtk_widget_unparent (child);
-
-  G_OBJECT_CLASS (blur_overlay_parent_class)->dispose (object);
-}
-
 static void
 blur_overlay_class_init (BlurOverlayClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = blur_overlay_dispose;
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);

  widget_class->measure = blur_overlay_measure;
  widget_class->size_allocate = blur_overlay_size_allocate;
  widget_class->snapshot = blur_overlay_snapshot;

+  container_class->add = blur_overlay_add;
+  container_class->remove = blur_overlay_remove;
+  container_class->forall = blur_overlay_forall;
+
  klass->get_child_position = blur_overlay_get_child_position;

  signals[GET_CHILD_POSITION] =
@@ -451,11 +479,3 @@ blur_overlay_add_overlay (BlurOverlay *overlay,

  blur_overlay_set_overlay_child (widget, child);
 }
-
-void
-blur_overlay_set_child (BlurOverlay *overlay,
-                        GtkWidget   *widget)
-{
-  gtk_widget_insert_after (widget, GTK_WIDGET (overlay), NULL);
-  overlay->main_widget = widget;
-}
--- a/demos/gtk-demo/bluroverlay.h
+++ b/demos/gtk-demo/bluroverlay.h
@@ -37,14 +37,14 @@ typedef struct _BlurOverlayClass    BlurOverlayClass;

 struct _BlurOverlay
 {
-  GtkWidget parent_instance;
+  GtkBin parent_instance;

  GtkWidget *main_widget;
 };

 struct _BlurOverlayClass
 {
-  GtkWidgetClass parent_class;
+  GtkBinClass parent_class;

  gboolean (*get_child_position) (BlurOverlay   *overlay,
                                  GtkWidget     *widget,
@@ -59,9 +59,6 @@ GDK_AVAILABLE_IN_ALL
 void       blur_overlay_add_overlay (BlurOverlay *overlay,
                                     GtkWidget   *widget,
                                     double       blur);
-GDK_AVAILABLE_IN_ALL
-void       blur_overlay_set_child   (BlurOverlay *overlay,
-                                     GtkWidget   *widget);

 G_END_DECLS

--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -12,11 +12,10 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
-#include "demoimage.h"

 static GtkWidget *window = NULL;

-static void
+void
 copy_button_clicked (GtkWidget *button,
                     gpointer   user_data)
 {
@@ -32,7 +31,7 @@ copy_button_clicked (GtkWidget *button,
  gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (entry)));
 }

-static void
+void
 paste_received (GObject      *source_object,
                GAsyncResult *result,
                gpointer      user_data)
@@ -76,7 +75,7 @@ paste_received (GObject      *source_object,
    }
 }

-static void
+void
 paste_button_clicked (GtkWidget *button,
                      gpointer   user_data)
 {
@@ -94,6 +93,170 @@ paste_button_clicked (GtkWidget *button,
  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
 }

+static GdkPaintable *
+get_image_paintable (GtkImage *image)
+{
+  const gchar *icon_name;
+  GtkIconTheme *icon_theme;
+  GtkIconPaintable *icon;
+
+  switch (gtk_image_get_storage_type (image))
+    {
+    case GTK_IMAGE_PAINTABLE:
+      return g_object_ref (gtk_image_get_paintable (image));
+    case GTK_IMAGE_ICON_NAME:
+      icon_name = gtk_image_get_icon_name (image);
+      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
+      icon = gtk_icon_theme_lookup_icon (icon_theme,
+                                         icon_name,
+                                         NULL,
+                                         48, 1,
+                                         gtk_widget_get_direction (GTK_WIDGET (image)),
+                                         0);
+      if (icon == NULL)
+        return NULL;
+      return GDK_PAINTABLE (icon);
+    default:
+      g_warning ("Image storage type %d not handled",
+                 gtk_image_get_storage_type (image));
+      return NULL;
+    }
+}
+
+static void
+drag_begin (GtkDragSource *source,
+            GdkDrag       *drag,
+            GtkWidget     *widget)
+{
+  GdkPaintable *paintable;
+
+  paintable = get_image_paintable (GTK_IMAGE (widget));
+  if (paintable)
+    {
+      gtk_drag_source_set_icon (source, paintable, -2, -2);
+      g_object_unref (paintable);
+    }
+}
+
+static GdkContentProvider *
+prepare_drag (GtkDragSource *source,
+              double         x,
+              double         y,
+              GtkWidget     *image)
+{
+  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (image));
+
+  if (!GDK_IS_TEXTURE (paintable))
+    return NULL;
+
+  return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, paintable);
+}
+
+static void
+got_texture (GObject *source,
+             GAsyncResult *result,
+             gpointer data)
+{
+  GdkDrop *drop = GDK_DROP (source);
+  GtkWidget *image = data;
+  const GValue *value;
+  GError *error = NULL;
+
+  value = gdk_drop_read_value_finish (drop, result, &error);
+  if (value)
+    {
+      GdkTexture *texture = g_value_get_object (value);
+      gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (texture));
+    }
+  else
+    {
+      g_print ("Failed to get data: %s\n", error->message);
+      g_error_free (error);
+    }
+}
+
+static gboolean
+drag_drop (GtkDropTarget *dest,
+           GdkDrop       *drop,
+           int            x,
+           int            y,
+           GtkWidget     *widget)
+{
+  if (gdk_drop_has_value (drop, GDK_TYPE_TEXTURE))
+    {
+      gdk_drop_read_value_async (drop, GDK_TYPE_TEXTURE, G_PRIORITY_DEFAULT, NULL, got_texture, widget);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static void
+copy_image (GSimpleAction *action,
+            GVariant      *value,
+            gpointer       data)
+{
+  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
+  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
+
+  if (GDK_IS_TEXTURE (paintable))
+    gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
+
+  if (paintable)
+    g_object_unref (paintable);
+}
+
+static void
+paste_image_received (GObject      *source,
+                      GAsyncResult *result,
+                      gpointer      data)
+{
+  GdkTexture *texture;
+
+  texture = gdk_clipboard_read_texture_finish (GDK_CLIPBOARD (source), result, NULL);
+  if (texture == NULL)
+    return;
+    
+  gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
+  g_object_unref (texture);
+}
+
+static void
+paste_image (GSimpleAction *action,
+             GVariant      *value,
+             gpointer       data)
+{
+  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
+  gdk_clipboard_read_texture_async (clipboard, NULL, paste_image_received, data);
+}
+
+static void
+pressed_cb (GtkGesture *gesture,
+            int         n_press,
+            double      x,
+            double      y,
+            GtkWidget  *image)
+{
+  GtkWidget *popover;
+  GMenu *menu;
+  GMenuItem *item;
+
+  menu = g_menu_new (); 
+  item = g_menu_item_new (_("_Copy"), "clipboard.copy");
+  g_menu_append_item (menu, item);
+
+  item = g_menu_item_new (_("_Paste"), "clipboard.paste");
+  g_menu_append_item (menu, item);
+
+  popover = gtk_popover_menu_new_from_model (G_MENU_MODEL (menu));
+  gtk_widget_set_parent (popover, image);
+
+  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &(GdkRectangle) { x, y, 1, 1});
+  gtk_popover_popup (GTK_POPOVER (popover));
+
+  g_object_unref (menu);
+}
+
 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
@@ -103,6 +266,14 @@ do_clipboard (GtkWidget *do_widget)
      GtkWidget *label;
      GtkWidget *entry, *button;
      GtkWidget *image;
+      GtkGesture *gesture;
+      GActionEntry entries[] = {
+        { "copy", copy_image, NULL, NULL, NULL },
+        { "paste", paste_image, NULL, NULL, NULL },
+      };
+      GActionGroup *actions;
+      GtkDragSource *source;
+      GtkDropTarget *dest;

      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
@@ -118,7 +289,7 @@ do_clipboard (GtkWidget *do_widget)
      gtk_widget_set_margin_top (vbox, 8);
      gtk_widget_set_margin_bottom (vbox, 8);

-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");

@@ -172,16 +343,62 @@ do_clipboard (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      /* Create the first image */
-      image = demo_image_new ("dialog-warning");
+      image = gtk_image_new_from_icon_name ("dialog-warning");
+      gtk_image_set_pixel_size (GTK_IMAGE (image), 48);
      gtk_container_add (GTK_CONTAINER (hbox), image);

+      /* make image a drag source */
+      source = gtk_drag_source_new ();
+      g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
+      g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
+      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+
+      /* accept drops on image */
+      dest = gtk_drop_target_new (gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE), GDK_ACTION_COPY);
+      g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image);
+      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
+
+      /* context menu on image */
+      gesture = gtk_gesture_click_new ();
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
+      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
+      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
+
+      actions = G_ACTION_GROUP (g_simple_action_group_new ());
+      g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image);
+
+      gtk_widget_insert_action_group (image, "clipboard", actions);
+
+      g_object_unref (actions);
+
      /* Create the second image */
-      image = demo_image_new ("process-stop");
+      image = gtk_image_new_from_icon_name ("process-stop");
+      gtk_image_set_pixel_size (GTK_IMAGE (image), 48);
      gtk_container_add (GTK_CONTAINER (hbox), image);

-      /* Create the third image */
-      image = demo_image_new ("weather-clear");
-      gtk_container_add (GTK_CONTAINER (hbox), image);
+      /* make image a drag source */
+      source = gtk_drag_source_new ();
+      g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
+      g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
+      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+
+      /* accept drops on image */
+      dest = gtk_drop_target_new (gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE), GDK_ACTION_COPY);
+      g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image);
+      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
+
+      /* context menu on image */
+      gesture = gtk_gesture_click_new ();
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
+      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
+      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
+
+      actions = G_ACTION_GROUP (g_simple_action_group_new ());
+      g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image);
+
+      gtk_widget_insert_action_group (image, "clipboard", actions);
+
+      g_object_unref (actions);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -0,0 +1,119 @@
+/* Color Chooser
+ *
+ * A GtkColorChooser lets the user choose a color. There are several
+ * implementations of the GtkColorChooser interface in GTK. The
+ * GtkColorChooserDialog is a prebuilt dialog containing a
+ * GtkColorChooserWidget.
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+static GtkWidget *da;
+static GdkRGBA color;
+static GtkWidget *frame;
+
+/* draw callback for the drawing area
+ */
+static void
+draw_function (GtkDrawingArea *da,
+               cairo_t        *cr,
+               int             width,
+               int             height,
+               gpointer        data)
+{
+  gdk_cairo_set_source_rgba (cr, &color);
+  cairo_paint (cr);
+}
+
+static void
+response_cb (GtkDialog *dialog,
+             gint       response_id,
+             gpointer   user_data)
+{
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+      gtk_widget_queue_draw (da);
+    }
+
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
+change_color_callback (GtkWidget *button,
+                       gpointer   data)
+{
+  GtkWidget *dialog;
+
+  dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window));
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
+
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (response_cb), NULL);
+
+  gtk_widget_show (dialog);
+}
+
+GtkWidget *
+do_colorsel (GtkWidget *do_widget)
+{
+  GtkWidget *vbox;
+  GtkWidget *button;
+
+  if (!window)
+    {
+      color.red = 0;
+      color.blue = 1;
+      color.green = 0;
+      color.alpha = 1;
+
+      window = gtk_window_new ();
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Color Chooser");
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+      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, 12);
+      gtk_widget_set_margin_end (vbox, 12);
+      gtk_widget_set_margin_top (vbox, 12);
+      gtk_widget_set_margin_bottom (vbox, 12);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
+
+      /*
+       * Create the color swatch area
+       */
+
+      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+      da = gtk_drawing_area_new ();
+      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200);
+      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 200);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_function, NULL, NULL);
+
+      gtk_container_add (GTK_CONTAINER (frame), da);
+
+      button = gtk_button_new_with_mnemonic ("_Change the above color");
+      gtk_widget_set_halign (button, GTK_ALIGN_END);
+      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+
+      gtk_container_add (GTK_CONTAINER (vbox), button);
+
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (change_color_callback), NULL);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -19,7 +19,7 @@ enum
 static GtkTreeModel *
 create_icon_store (void)
 {
-  const char *icon_names[6] = {
+  const gchar *icon_names[6] = {
    "dialog-warning",
    "process-stop",
    "document-new",
@@ -27,7 +27,7 @@ create_icon_store (void)
    NULL,
    "document-open"
  };
-  const char *labels[6] = {
+  const gchar *labels[6] = {
    N_("Warning"),
    N_("Stop"),
    N_("New"),
@@ -111,8 +111,8 @@ static GtkTreeModel *
 create_capital_store (void)
 {
  struct {
-    const char *group;
-    const char *capital;
+    gchar *group;
+    gchar *capital;
  } capitals[] = {
    { "A - B", NULL },
    { NULL, "Albany" },
@@ -234,7 +234,7 @@ typedef struct _MaskEntry MaskEntry;
 struct _MaskEntry
 {
  GtkEntry entry;
-  const char *mask;
+  gchar *mask;
 };

 typedef struct _MaskEntryClass MaskEntryClass;
@@ -246,7 +246,6 @@ struct _MaskEntryClass

 static void mask_entry_editable_init (GtkEditableInterface *iface);

-static GType mask_entry_get_type (void);
 G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
                                                mask_entry_editable_init));
@@ -324,7 +323,7 @@ do_combobox (GtkWidget *do_widget)
    gtk_widget_set_margin_end (vbox, 10);
    gtk_widget_set_margin_top (vbox, 10);
    gtk_widget_set_margin_bottom (vbox, 10);
-    gtk_window_set_child (GTK_WINDOW (window), vbox);
+    gtk_container_add (GTK_CONTAINER (window), vbox);

    /* A combobox demonstrating cell renderers, separators and
     *  insensitive rows
@@ -337,7 +336,7 @@ do_combobox (GtkWidget *do_widget)
    gtk_widget_set_margin_end (box, 5);
    gtk_widget_set_margin_top (box, 5);
    gtk_widget_set_margin_bottom (box, 5);
-    gtk_frame_set_child (GTK_FRAME (frame), box);
+    gtk_container_add (GTK_CONTAINER (frame), box);

    model = create_icon_store ();
    combo = gtk_combo_box_new_with_model (model);
@@ -381,7 +380,7 @@ do_combobox (GtkWidget *do_widget)
    gtk_widget_set_margin_end (box, 5);
    gtk_widget_set_margin_top (box, 5);
    gtk_widget_set_margin_bottom (box, 5);
-    gtk_frame_set_child (GTK_FRAME (frame), box);
+    gtk_container_add (GTK_CONTAINER (frame), box);

    model = create_capital_store ();
    combo = gtk_combo_box_new_with_model (model);
@@ -412,7 +411,7 @@ do_combobox (GtkWidget *do_widget)
    gtk_widget_set_margin_end (box, 5);
    gtk_widget_set_margin_top (box, 5);
    gtk_widget_set_margin_bottom (box, 5);
-    gtk_frame_set_child (GTK_FRAME (frame), box);
+    gtk_container_add (GTK_CONTAINER (frame), box);

    combo = gtk_combo_box_text_new_with_entry ();
    fill_combo_entry (combo);
@@ -421,7 +420,8 @@ do_combobox (GtkWidget *do_widget)
    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";

-    gtk_combo_box_set_child (GTK_COMBO_BOX (combo), entry);
+    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
+    gtk_container_add (GTK_CONTAINER (combo), entry);

    /* A combobox with string IDs */
    frame = gtk_frame_new ("String IDs");
@@ -432,7 +432,7 @@ do_combobox (GtkWidget *do_widget)
    gtk_widget_set_margin_end (box, 5);
    gtk_widget_set_margin_top (box, 5);
    gtk_widget_set_margin_bottom (box, 5);
-    gtk_frame_set_child (GTK_FRAME (frame), box);
+    gtk_container_add (GTK_CONTAINER (frame), box);

    combo = gtk_combo_box_text_new ();
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
--- a/demos/gtk-demo/constraints.c
+++ b/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_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);
 }
@@ -258,16 +257,16 @@ do_constraints (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), "Constraints");

     header = gtk_header_bar_new ();
+     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
     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);
+     gtk_container_add (GTK_CONTAINER (window), box);

     grid = g_object_new (simple_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
--- a/demos/gtk-demo/constraints2.c
+++ b/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_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);
 }
@@ -214,16 +213,16 @@ do_constraints2 (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), "Constraints");

     header = gtk_header_bar_new ();
+     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
     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);
+     gtk_container_add (GTK_CONTAINER (window), box);

     grid = g_object_new (interactive_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
--- a/demos/gtk-demo/constraints3.c
+++ b/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_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);
 }
@@ -134,16 +133,16 @@ do_constraints3 (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), "Constraints");

     header = gtk_header_bar_new ();
+     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
     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);
+     gtk_container_add (GTK_CONTAINER (window), box);

     grid = g_object_new (vfl_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
--- a/demos/gtk-demo/css_accordion.c
+++ b/demos/gtk-demo/css_accordion.c
@@ -34,7 +34,7 @@ do_css_accordion (GtkWidget *do_widget)
      container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (container, GTK_ALIGN_CENTER);
-      gtk_window_set_child (GTK_WINDOW (window), container);
+      gtk_container_add (GTK_CONTAINER (window), container);

      child = gtk_button_new_with_label ("This");
      gtk_container_add (GTK_CONTAINER (container), child);
--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -92,7 +92,7 @@ do_css_basics (GtkWidget *do_widget)
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_window_set_child (GTK_WINDOW (window), container);
+      gtk_container_add (GTK_CONTAINER (window), container);
      child = gtk_text_view_new_with_buffer (text);
      gtk_container_add (GTK_CONTAINER (container), child);
      g_signal_connect (text, "changed",
--- a/demos/gtk-demo/css_blendmodes.c
+++ b/demos/gtk-demo/css_blendmodes.c
@@ -11,8 +11,8 @@
 * These are the available blend modes.
 */
 struct {
-  const char *name;
-  const char *id;
+  gchar *name;
+  gchar *id;
 } blend_modes[] =
 {
  { "Color", "color" },
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -94,7 +94,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);

      container = gtk_overlay_new ();
-      gtk_window_set_child (GTK_WINDOW (window), container);
+      gtk_container_add (GTK_CONTAINER (window), container);

      child = gtk_drawing_area_new ();
      gtk_widget_set_name (child, "canvas");
--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -80,7 +80,7 @@ do_css_pixbufs (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_window_set_child (GTK_WINDOW (window), paned);
+      gtk_container_add (GTK_CONTAINER (window), paned);

      /* Need a filler so we get a handle */
      child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -58,7 +58,7 @@ apply_css (GtkWidget *widget, GtkStyleProvider *provider)
    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }

-static GtkWidget *
+GtkWidget *
 create_toolbar (void)
 {
  GtkWidget *toolbar;
@@ -99,7 +99,7 @@ do_css_shadows (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_window_set_child (GTK_WINDOW (window), paned);
+      gtk_container_add (GTK_CONTAINER (window), paned);

      child = create_toolbar ();
      gtk_container_add (GTK_CONTAINER (paned), child);
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -12,10 +12,6 @@
  <gresource prefix="/builder">
    <file>demo.ui</file>
  </gresource>
-  <gresource prefix="/clipboard">
-    <file>demoimage.c</file>
-    <file>demoimage.h</file>
-  </gresource>
  <gresource prefix="/css_accordion">
    <file>css_accordion.css</file>
    <file>reset.css</file>
@@ -108,10 +104,6 @@
    <file>gtkfishbowl.c</file>
    <file>gtkfishbowl.h</file>
  </gresource>
-  <gresource prefix="/gears">
-    <file>gtkgears.c</file>
-    <file>gtkgears.h</file>
-  </gresource>
  <gresource prefix="/iconscroll">
    <file>iconscroll.ui</file>
  </gresource>
@@ -158,6 +150,7 @@
    <file>assistant.c</file>
    <file>builder.c</file>
    <file>clipboard.c</file>
+    <file>colorsel.c</file>
    <file>combobox.c</file>
    <file>constraints.c</file>
    <file>constraints2.c</file>
@@ -183,7 +176,6 @@
    <file>font_features.c</file>
    <file>fontplane.c</file>
    <file>fontrendering.c</file>
-    <file>gears.c</file>
    <file>gestures.c</file>
    <file>glarea.c</file>
    <file>headerbar.c</file>
@@ -207,9 +199,9 @@
    <file>paintable_mediastream.c</file>
    <file>panes.c</file>
    <file>password_entry.c</file>
-    <file>peg_solitaire.c</file>
    <file>pickers.c</file>
    <file>pixbufs.c</file>
+    <file>popover.c</file>
    <file>printing.c</file>
    <file>revealer.c</file>
    <file>rotated_text.c</file>
@@ -217,7 +209,6 @@
    <file>search_entry.c</file>
    <file>search_entry2.c</file>
    <file>shortcuts.c</file>
-    <file>shortcut_triggers.c</file>
    <file>sizegroup.c</file>
    <file>sidebar.c</file>
    <file>sliding_puzzle.c</file>
@@ -247,6 +238,9 @@
    <file>messages.txt</file>
    <file>apple-red.png</file>
  </gresource>
+  <gresource prefix="/popover">
+    <file>popover.ui</file>
+  </gresource>
  <gresource prefix="/glarea">
    <file>glarea-gl.fs.glsl</file>
    <file>glarea-gl.vs.glsl</file>
@@ -280,6 +274,9 @@
  <gresource prefix="/modelbutton">
    <file>modelbutton.ui</file>
  </gresource>
+  <gresource prefix="/dnd">
+    <file>dnd.css</file>
+  </gresource>
  <gresource prefix="/tagged_entry">
    <file>demotaggedentry.c</file>
    <file>demotaggedentry.h</file>
@@ -309,7 +306,4 @@
    <file>icons/16x16/status/battery-caution-charging-symbolic.symbolic.png</file>
    <file>icons/16x16/categories/applications-other.png</file>
  </gresource>
-  <gresource prefix="/org/gtk/Demo4/gtk">
-    <file preprocess="xml-stripblanks">help-overlay.ui</file>
-  </gresource>
 </gresources>
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -29,29 +29,29 @@
        <item>
          <attribute name="label" translatable="yes">_New</attribute>
          <attribute name="action">win.new</attribute>
-          <attribute name="accel">&lt;Control&gt;n</attribute>
+          <attribute name="accel">&lt;Primary&gt;n</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">_Open</attribute>
          <attribute name="action">win.open</attribute>
-          <attribute name="accel">&lt;Control&gt;o</attribute>
+          <attribute name="accel">&lt;Primary&gt;o</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">_Save</attribute>
          <attribute name="action">win.save</attribute>
-          <attribute name="accel">&lt;Control&gt;s</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">Save _As</attribute>
          <attribute name="action">win.save-as</attribute>
-          <attribute name="accel">&lt;Control&gt;q</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
        </item>
      </section>
      <section>
        <item>
          <attribute name="label" translatable="yes">_Quit</attribute>
          <attribute name="action">win.quit</attribute>
-          <attribute name="accel">&lt;Control&gt;&lt;Shift&gt;s</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
        </item>
      </section>
    </submenu>
@@ -61,17 +61,17 @@
        <item>
          <attribute name="label" translatable="yes">_Copy</attribute>
          <attribute name="action">win.copy</attribute>
-          <attribute name="accel">&lt;Control&gt;c</attribute>
+          <attribute name="accel">&lt;Primary&gt;c</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">_Cut</attribute>
          <attribute name="action">win.cut</attribute>
-          <attribute name="accel">&lt;Control&gt;x</attribute>
+          <attribute name="accel">&lt;Primary&gt;x</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">_Paste</attribute>
          <attribute name="action">win.paste</attribute>
-          <attribute name="accel">&lt;Control&gt;v</attribute>
+          <attribute name="accel">&lt;Primary&gt;v</attribute>
        </item>
      </section>
    </submenu>
@@ -166,7 +166,7 @@
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="has-frame">1</property>
+            <property name="shadow-type">in</property>
            <property name="hexpand">1</property>
            <property name="vexpand">1</property>
            <child>
--- a/demos/gtk-demo/demoimage.c
+++ b/demos/gtk-demo/demoimage.c
@@ -1,259 +0,0 @@
-#include "demoimage.h"
-#include <glib/gi18n.h>
-
-struct _DemoImage {
-  GtkWidget parent_instance;
- 
-  GtkWidget *image;
-  GtkWidget *popover;
-};
-
-enum {
-  PROP_ICON_NAME = 1
-};
-
-G_DEFINE_TYPE(DemoImage, demo_image, GTK_TYPE_WIDGET)
-
-static GdkPaintable *
-get_image_paintable (GtkImage *image)
-{
-  const gchar *icon_name;
-  GtkIconTheme *icon_theme;
-  GtkIconPaintable *icon;
-
-  switch (gtk_image_get_storage_type (image))
-    {
-    case GTK_IMAGE_PAINTABLE:
-      return g_object_ref (gtk_image_get_paintable (image));
-    case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (image);
-      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
-      icon = gtk_icon_theme_lookup_icon (icon_theme,
-                                         icon_name,
-                                         NULL,
-                                         48, 1,
-                                         gtk_widget_get_direction (GTK_WIDGET (image)),
-                                         0);
-      if (icon == NULL)
-        return NULL;
-      return GDK_PAINTABLE (icon);
-
-    case GTK_IMAGE_EMPTY:
-    case GTK_IMAGE_GICON:
-    default:
-      g_warning ("Image storage type %d not handled",
-                 gtk_image_get_storage_type (image));
-      return NULL;
-    }
-}
-
-static void
-drag_begin (GtkDragSource *source,
-            GdkDrag       *drag,
-            gpointer       data)
-{
-  GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-  DemoImage *demo = DEMO_IMAGE (widget);
-  GdkPaintable *paintable;
-
-  paintable = get_image_paintable (GTK_IMAGE (demo->image));
-  if (paintable)
-    {
-      gtk_drag_icon_set_from_paintable (drag, paintable, -2, -2);
-      g_object_unref (paintable);
-    }
-}
-
-static GdkContentProvider *
-prepare_drag (GtkDragSource *source,
-              double         x,
-              double         y,
-              gpointer       data)
-{
-  GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-  DemoImage *demo = DEMO_IMAGE (widget);
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));
-
-  return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
-}
-
-static gboolean
-drag_drop (GtkDropTarget *dest,
-           const GValue  *value,
-           double         x,
-           double         y,
-           gpointer       data)
-{
-  GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
-  DemoImage *demo = DEMO_IMAGE (widget);
-  GdkPaintable *paintable = g_value_get_object (value);
-
-  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), paintable);
-
-  return TRUE;
-}
-
-static void
-copy_image (GtkWidget *widget,
-            const char *action_name,
-            GVariant *parameter)
-{
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
-  DemoImage *demo = DEMO_IMAGE (widget);
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));
-  GValue value = G_VALUE_INIT;
-
-  g_value_init (&value, GDK_TYPE_PAINTABLE);
-  g_value_set_object (&value, paintable);
-  gdk_clipboard_set_value (clipboard, &value);
-  g_value_unset (&value);
-
-  if (paintable)
-    g_object_unref (paintable);
-}
-
-static void
-paste_image (GtkWidget *widget,
-             const char *action_name,
-             GVariant *parameter)
-{
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
-  DemoImage *demo = DEMO_IMAGE (widget);
-  GdkContentProvider *content = gdk_clipboard_get_content (clipboard);
-  GValue value = G_VALUE_INIT;
-  GdkPaintable *paintable;
-
-  g_value_init (&value, GDK_TYPE_PAINTABLE);
-  if (!gdk_content_provider_get_value (content, &value, NULL))
-    return;
-
-  paintable = GDK_PAINTABLE (g_value_get_object (&value));
-  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), paintable);
-  g_value_unset (&value);
-}
-
-static void
-pressed_cb (GtkGesture *gesture,
-            int         n_press,
-            double      x,
-            double      y,
-            gpointer    data)
-{
-  DemoImage *demo = DEMO_IMAGE (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
-
-  gtk_popover_popup (GTK_POPOVER (demo->popover));
-}
-
-static void
-demo_image_init (DemoImage *demo)
-{
-  GMenu *menu;
-  GMenuItem *item;
-  GtkDragSource *source;
-  GtkDropTarget *dest;
-  GtkGesture *gesture;
-
-  demo->image = gtk_image_new ();
-  gtk_image_set_pixel_size (GTK_IMAGE (demo->image), 48);
-  gtk_widget_set_parent (demo->image, GTK_WIDGET (demo));
-
-  menu = g_menu_new (); 
-  item = g_menu_item_new (_("_Copy"), "clipboard.copy");
-  g_menu_append_item (menu, item);
-
-  item = g_menu_item_new (_("_Paste"), "clipboard.paste");
-  g_menu_append_item (menu, item);
-
-  demo->popover = gtk_popover_menu_new_from_model (G_MENU_MODEL (menu));
-  gtk_widget_set_parent (demo->popover, GTK_WIDGET (demo));
-
-  source = gtk_drag_source_new ();
-  g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
-  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (demo), GTK_EVENT_CONTROLLER (source));
-
-  dest = gtk_drop_target_new (GDK_TYPE_PAINTABLE, GDK_ACTION_COPY);
-  g_signal_connect (dest, "drop", G_CALLBACK (drag_drop), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (demo), GTK_EVENT_CONTROLLER (dest));
-
-  gesture = gtk_gesture_click_new ();
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
-  g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (demo), GTK_EVENT_CONTROLLER (gesture));
-}
-
-static void
-demo_image_dispose (GObject *object)
-{
-  DemoImage *demo = DEMO_IMAGE (object);
-
-  g_clear_pointer (&demo->image, gtk_widget_unparent);
-  g_clear_pointer (&demo->popover, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (demo_image_parent_class)->dispose (object);
-}
-
-static void
-demo_image_get_property (GObject    *object,
-                         guint       prop_id,
-                         GValue     *value,
-                         GParamSpec *pspec)
-{
-  DemoImage *demo = DEMO_IMAGE (object);
-
-  switch (prop_id)
-    {
-    case PROP_ICON_NAME:
-      g_value_set_string (value, gtk_image_get_icon_name (GTK_IMAGE (demo->image)));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo_image_set_property (GObject      *object,
-                         guint         prop_id,
-                         const GValue *value,
-                         GParamSpec   *pspec)
-{
-  DemoImage *demo = DEMO_IMAGE (object);
-
-  switch (prop_id)
-    {
-    case PROP_ICON_NAME:
-      gtk_image_set_from_icon_name (GTK_IMAGE (demo->image),
-                                    g_value_get_string (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo_image_class_init (DemoImageClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo_image_dispose;
-  object_class->get_property = demo_image_get_property;
-  object_class->set_property = demo_image_set_property;
-
-  g_object_class_install_property (object_class, PROP_ICON_NAME,
-      g_param_spec_string ("icon-name", "Icon name", "Icon name",
-                           NULL, G_PARAM_READWRITE));
-                       
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-
-  gtk_widget_class_install_action (widget_class, "clipboard.copy", NULL, copy_image);
-  gtk_widget_class_install_action (widget_class, "clipboard.paste", NULL, paste_image);
-}
-
-GtkWidget *
-demo_image_new (const char *icon_name)
-{
-  return g_object_new (DEMO_TYPE_IMAGE, "icon-name", icon_name, NULL);
-}
--- a/demos/gtk-demo/demoimage.h
+++ b/demos/gtk-demo/demoimage.h
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define DEMO_TYPE_IMAGE (demo_image_get_type ())
-
-G_DECLARE_FINAL_TYPE(DemoImage, demo_image, DEMO, IMAGE, GtkWidget)
-
-GtkWidget * demo_image_new (const char *icon_name);
-
-G_END_DECLS
--- a/demos/gtk-demo/demotaggedentry.c
+++ b/demos/gtk-demo/demotaggedentry.c
@@ -472,7 +472,7 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
      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_button_set_relief (GTK_BUTTON (tag->button), GTK_RELIEF_NONE);
      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
      g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
    }
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -118,14 +118,14 @@ do_dialog (GtkWidget *do_widget)
      gtk_widget_set_margin_end (frame, 8);
      gtk_widget_set_margin_top (frame, 8);
      gtk_widget_set_margin_bottom (frame, 8);
-      gtk_window_set_child (GTK_WINDOW (window), frame);
+      gtk_container_add (GTK_CONTAINER (window), frame);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_widget_set_margin_start (vbox, 8);
      gtk_widget_set_margin_end (vbox, 8);
      gtk_widget_set_margin_top (vbox, 8);
      gtk_widget_set_margin_bottom (vbox, 8);
-      gtk_frame_set_child (GTK_FRAME (frame), vbox);
+      gtk_container_add (GTK_CONTAINER (frame), vbox);

      /* Standard message dialog */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -1,126 +1,202 @@
 /* Drag-and-Drop
 *
- * This demo shows dragging colors and widgets.
- * The items in this demo can be moved, recolored
- * and rotated.
+ * I can't believe its not glade!
+ *
+ * Try right-clicking in the window.
 */

+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <string.h>

-static GdkContentProvider *
-prepare (GtkDragSource *source,
-         double         x,
-         double         y)
+typedef struct _GtkDemoWidget GtkDemoWidget;
+struct _GtkDemoWidget
 {
-  GtkWidget *canvas;
-  GtkWidget *item;
+  GType type;
+  union {
+    char *text;
+    gboolean active;
+  };
+};

-  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-  item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
+static gpointer
+copy_demo_widget (gpointer data)
+{
+  GtkDemoWidget *demo = g_memdup (data, sizeof (GtkDemoWidget));

-  if (!GTK_IS_LABEL (item))
-    return NULL;
+  if (demo->type == GTK_TYPE_LABEL)
+    demo->text = g_strdup (demo->text);

-  g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
-
-  return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
+  return demo;
 }

 static void
-drag_begin (GtkDragSource *source,
-            GdkDrag       *drag)
+free_demo_widget (gpointer data)
 {
-  GtkWidget *canvas;
-  GtkWidget *item;
+  GtkDemoWidget *demo = data;

-  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-  item = g_object_get_data (G_OBJECT (canvas), "dragged-item");
+  if (demo->type == GTK_TYPE_LABEL)
+    g_free (demo->text);

-  gtk_widget_set_opacity (item, 0.5);
+  g_free (demo);
 }

-static void
-drag_end (GtkDragSource *source,
-          GdkDrag       *drag)
+#define GTK_TYPE_DEMO_WIDGET (gtk_demo_widget_get_type ())
+
+G_DEFINE_BOXED_TYPE (GtkDemoWidget, gtk_demo_widget, copy_demo_widget, free_demo_widget)
+
+static GtkDemoWidget *
+serialize_widget (GtkWidget *widget)
 {
-  GtkWidget *canvas;
-  GtkWidget *item;
+  GtkDemoWidget *demo;

-  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-  item = g_object_get_data (G_OBJECT (canvas), "dragged-item");
-  g_object_set_data (G_OBJECT (canvas), "dragged-item", NULL);
+  demo = g_new0 (GtkDemoWidget, 1);
+  demo->type = G_OBJECT_TYPE (widget);

-  gtk_widget_set_opacity (item, 1.0);
+  if (GTK_IS_LABEL (widget))
+    {
+      demo->text = g_strdup (gtk_label_get_text (GTK_LABEL (widget)));
+    }
+  else if (GTK_IS_SPINNER (widget))
+    {
+      g_object_get (widget, "spinning", &demo->active, NULL);
+    }
+  else
+    {
+      g_print ("Type %s not supported\n", g_type_name (demo->type));
    }

-static void
-drag_cancel (GtkDragSource       *source,
-             GdkDrag             *drag,
-             GdkDragCancelReason  reason)
-{
-  drag_end (source, drag);
+  return demo;
 }

-typedef struct {
-  double x, y;
-  double angle;
-  double delta;
-} TransformData;
-
-static void
-apply_transform (GtkWidget *item)
+static GtkWidget *
+deserialize_widget (GtkDemoWidget *demo)
 {
-  GtkWidget *canvas = gtk_widget_get_parent (item);
-  TransformData *data;
-  GskTransform *transform;
+  GtkWidget *widget = NULL;

-  data = g_object_get_data (G_OBJECT (item), "transform-data");
-  transform = gsk_transform_rotate (gsk_transform_translate (NULL, &(graphene_point_t){data->x, data->y}),
-                                    data->angle + data->delta);
-  gtk_fixed_set_child_transform (GTK_FIXED (canvas), item, transform);
-  gsk_transform_unref (transform);
+  if (demo->type == GTK_TYPE_LABEL)
+    {
+      widget = gtk_label_new (demo->text);
+    }
+  else if (demo->type == GTK_TYPE_SPINNER)
+    {
+      widget = g_object_new (demo->type, "spinning", demo->active, NULL);
+      gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
+    }
+  else
+    {
+      g_print ("Type %s not supported\n", g_type_name (demo->type));
    }

-static gboolean
-drag_drop (GtkDropTarget *target,
-           const GValue  *value,
-           double         x,
-           double         y)
-{
-  GtkWidget *item;
-  TransformData *transform_data;
-  GtkWidget *canvas;
-  GtkWidget *last_child;
-
-  item = g_value_get_object (value);
-  transform_data = g_object_get_data (G_OBJECT (item), "transform-data");
-
-  transform_data->x = x;
-  transform_data->y = y;
-
-  canvas = gtk_widget_get_parent (item);
-  last_child = gtk_widget_get_last_child (canvas);
-  if (item != last_child)
-    gtk_widget_insert_after (item, canvas, last_child);
-
-  apply_transform (item);
-
-  return TRUE;
+  return widget;
 }

 static double pos_x, pos_y;

-static GtkWidget * canvas_item_new (double x, double y);
+static void
+new_label_cb (GtkWidget *button,
+              gpointer     data)
+{
+  GtkFixed *fixed = data;
+  GtkWidget *widget;
+
+  widget = gtk_label_new ("Label");
+  gtk_fixed_put (fixed, widget, pos_x, pos_y);
+
+  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+}

 static void
-new_item_cb (GtkWidget *button, gpointer data)
+new_spinner_cb (GtkWidget *button,
+                gpointer     data)
 {
-  GtkWidget *canvas = data;
-  GtkWidget *item;
+  GtkFixed *fixed = data;
+  GtkWidget *widget;

-  item = canvas_item_new (pos_x, pos_y);
-  gtk_container_add (GTK_CONTAINER (canvas), item);
-  apply_transform (item);
+  widget = gtk_spinner_new ();
+  gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
+  gtk_spinner_start (GTK_SPINNER (widget));
+  gtk_fixed_put (fixed, widget, pos_x, pos_y);
+
+  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+}
+
+static void
+copy_cb (GtkWidget *button, GtkWidget *child)
+{
+  GdkClipboard *clipboard;
+  GtkDemoWidget *demo;
+
+  demo = serialize_widget (child);
+
+  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
+  gdk_clipboard_set (clipboard, GTK_TYPE_DEMO_WIDGET, demo);
+
+  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+}
+
+static void
+delete_cb (GtkWidget *button, GtkWidget *child)
+{
+  gtk_widget_destroy (child);
+
+  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+}
+
+static void
+cut_cb (GtkWidget *button, GtkWidget *child)
+{
+  copy_cb (button, child);
+  delete_cb (button, child);
+
+  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+}
+
+static void
+value_read (GObject      *source,
+            GAsyncResult *res,
+            gpointer      data)
+{
+  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
+  GError *error = NULL;
+  const GValue *value;
+  GtkDemoWidget *demo;
+  GtkWidget *widget = NULL;
+
+  value = gdk_clipboard_read_value_finish (clipboard, res, &error);
+
+  if (value == NULL)
+    {
+      g_print ("error: %s\n", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  if (!G_VALUE_HOLDS (value, GTK_TYPE_DEMO_WIDGET))
+    {
+      g_print ("can't handle clipboard contents\n");
+      return;
+    }
+
+  demo = g_value_get_boxed (value);
+  widget = deserialize_widget (demo);
+
+  gtk_fixed_put (GTK_FIXED (data), widget, pos_x, pos_y);
+}
+
+static void
+paste_cb (GtkWidget *button, GtkWidget *fixed)
+{
+  GdkClipboard *clipboard;
+
+  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
+  if (gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET))
+    {
+      g_print ("Paste %s\n", g_type_name (GTK_TYPE_DEMO_WIDGET));
+      gdk_clipboard_read_value_async (clipboard, GTK_TYPE_DEMO_WIDGET, 0, NULL, value_read, fixed);
+    }
+  else
+    g_print ("Don't know how to handle clipboard contents\n");

  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
@@ -128,15 +204,14 @@ new_item_cb (GtkWidget *button, gpointer data)
 static void
 edit_label_done (GtkWidget *entry, gpointer data)
 {
-  GtkWidget *canvas = gtk_widget_get_parent (entry);
+  GtkWidget *fixed = gtk_widget_get_parent (entry);
  GtkWidget *label;
  int x, y;

-  gtk_fixed_get_child_position (GTK_FIXED (canvas), entry, &x, &y);
+  gtk_fixed_get_child_position (GTK_FIXED (fixed), entry, &x, &y);

  label = GTK_WIDGET (g_object_get_data (G_OBJECT (entry), "label"));
  gtk_label_set_text (GTK_LABEL (label), gtk_editable_get_text (GTK_EDITABLE (entry)));
-  gtk_widget_show (label);

  gtk_widget_destroy (entry);
 }
@@ -144,10 +219,10 @@ edit_label_done (GtkWidget *entry, gpointer data)
 static void
 edit_cb (GtkWidget *button, GtkWidget *child)
 {
-  GtkWidget *canvas = gtk_widget_get_parent (child);
+  GtkWidget *fixed = gtk_widget_get_parent (child);
  int x, y;

-  gtk_fixed_get_child_position (GTK_FIXED (canvas), child, &x, &y);
+  gtk_fixed_get_child_position (GTK_FIXED (fixed), child, &x, &y);

  if (GTK_IS_LABEL (child))
    {
@@ -158,23 +233,21 @@ edit_cb (GtkWidget *button, GtkWidget *child)
      gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_LABEL (child)));
      gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
      g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
-      gtk_fixed_put (GTK_FIXED (canvas), entry, x, y);
+      gtk_fixed_put (GTK_FIXED (fixed), entry, x, y);
      gtk_widget_grab_focus (entry);
-      gtk_widget_hide (child);
+    }
+  else if (GTK_IS_SPINNER (child))
+    {
+      gboolean active;
+
+      g_object_get (child, "spinning", &active, NULL);
+      g_object_set (child, "spinning", !active, NULL);
    }

  if (button)
    gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }

-static void
-delete_cb (GtkWidget *button, GtkWidget *child)
-{
-  gtk_widget_destroy (child);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
-}
-
 static void
 pressed_cb (GtkGesture *gesture,
            int         n_press,
@@ -193,6 +266,7 @@ pressed_cb (GtkGesture *gesture,
      GtkWidget *menu;
      GtkWidget *box;
      GtkWidget *item;
+      GdkClipboard *clipboard;

      pos_x = x;
      pos_y = y;
@@ -204,16 +278,20 @@ pressed_cb (GtkGesture *gesture,
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      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);
+      item = gtk_button_new_with_label ("New Label");
+      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      g_signal_connect (item, "clicked", G_CALLBACK (new_label_cb), widget);
+      gtk_container_add (GTK_CONTAINER (box), item);
+      item = gtk_button_new_with_label ("New Spinner");
+      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      g_signal_connect (item, "clicked", G_CALLBACK (new_spinner_cb), widget);
      gtk_container_add (GTK_CONTAINER (box), item);

      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
      gtk_container_add (GTK_CONTAINER (box), item);

      item = gtk_button_new_with_label ("Edit");
-      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
+      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
      gtk_widget_set_sensitive (item, child != NULL && child != widget);
      g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child);
      gtk_container_add (GTK_CONTAINER (box), item);
@@ -221,8 +299,25 @@ pressed_cb (GtkGesture *gesture,
      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
      gtk_container_add (GTK_CONTAINER (box), item);

+      item = gtk_button_new_with_label ("Cut");
+      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      gtk_widget_set_sensitive (item, child != NULL && child != widget);
+      g_signal_connect (item, "clicked", G_CALLBACK (cut_cb), child);
+      gtk_container_add (GTK_CONTAINER (box), item);
+      item = gtk_button_new_with_label ("Copy");
+      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      gtk_widget_set_sensitive (item, child != NULL && child != widget);
+      g_signal_connect (item, "clicked", G_CALLBACK (copy_cb), child);
+      gtk_container_add (GTK_CONTAINER (box), item);
+      item = gtk_button_new_with_label ("Paste");
+      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
+      gtk_widget_set_sensitive (item,
+                                gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET));
+      g_signal_connect (item, "clicked", G_CALLBACK (paste_cb), widget);
+      gtk_container_add (GTK_CONTAINER (box), item);
      item = gtk_button_new_with_label ("Delete");
-      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
+      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
      gtk_widget_set_sensitive (item, child != NULL && child != widget);
      g_signal_connect (item, "clicked", G_CALLBACK (delete_cb), child);
      gtk_container_add (GTK_CONTAINER (box), item);
@@ -251,165 +346,6 @@ released_cb (GtkGesture *gesture,
    }
 }

-static GtkWidget *
-canvas_new (void)
-{
-  GtkWidget *canvas;
-  GtkDragSource *source;
-  GtkDropTarget *dest;
-  GtkGesture *gesture;
-
-  canvas = gtk_fixed_new ();
-  gtk_widget_set_hexpand (canvas, TRUE);
-  gtk_widget_set_vexpand (canvas, TRUE);
-  gtk_widget_add_css_class (canvas, "frame");
-
-  source = gtk_drag_source_new ();
-  gtk_drag_source_set_actions (source, GDK_ACTION_MOVE);
-  g_signal_connect (source, "prepare", G_CALLBACK (prepare), NULL);
-  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), NULL);
-  g_signal_connect (source, "drag-end", G_CALLBACK (drag_end), NULL);
-  g_signal_connect (source, "drag-cancel", G_CALLBACK (drag_cancel), NULL);
-  gtk_widget_add_controller (canvas, GTK_EVENT_CONTROLLER (source));
-
-  dest = gtk_drop_target_new (GTK_TYPE_WIDGET, GDK_ACTION_MOVE);
-  g_signal_connect (dest, "drop", G_CALLBACK (drag_drop), NULL);
-  gtk_widget_add_controller (canvas, GTK_EVENT_CONTROLLER (dest));
-
-  gesture = gtk_gesture_click_new ();
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0);
-  g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), NULL);
-  g_signal_connect (gesture, "released", G_CALLBACK (released_cb), NULL);
-  gtk_widget_add_controller (canvas, GTK_EVENT_CONTROLLER (gesture));
-
-  return canvas;
-}
-
-static void
-set_color (GtkWidget *item,
-           GdkRGBA   *color)
-{
-  char *css;
-  char *str;
-  GtkStyleContext *context;
-  GtkCssProvider *provider;
-
-  str = gdk_rgba_to_string (color);
-  css = g_strdup_printf ("* { background: %s; padding: 10px; }", str);
-
-  context = gtk_widget_get_style_context (item);
-  provider = g_object_get_data (G_OBJECT (context), "style-provider");
-  if (provider)
-    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css, -1);
-  gtk_style_context_add_provider (gtk_widget_get_style_context (item), GTK_STYLE_PROVIDER (provider), 800);
-  g_object_set_data_full (G_OBJECT (context), "style-provider", provider, g_object_unref);
-
-  g_free (str);
-  g_free (css);
-}
-
-static gboolean
-item_drag_drop (GtkDropTarget *dest,
-                const GValue  *value,
-                double         x,
-                double         y)
-{
-  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
-
-  set_color (item, g_value_get_boxed (value));
-
-  return TRUE;
-}
-
-static void
-angle_changed (GtkGestureRotate *gesture,
-               double            angle,
-               double            delta)
-{
-  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  TransformData *data = g_object_get_data (G_OBJECT (item), "transform-data");
-
-  data->delta = angle / M_PI * 180.0;
-
-  apply_transform (item);
-}
-
-static void
-rotate_done (GtkGesture *gesture)
-{
-  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  TransformData *data = g_object_get_data (G_OBJECT (item), "transform-data");
-
-  data->angle = data->angle + data->delta;
-  data->delta = 0;
-}
-
-static void
-click_done (GtkGesture *gesture)
-{
-  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  GtkWidget *canvas = gtk_widget_get_parent (item);
-  GtkWidget *last_child;
-
-  last_child = gtk_widget_get_last_child (canvas);
-  if (item != last_child)
-    gtk_widget_insert_after (item, canvas, last_child);
-}
-
-static int n_items = 0;
-
-static GtkWidget *
-canvas_item_new (double x,
-                 double y)
-{
-  GtkWidget *widget;
-  char *label;
-  char *id;
-  TransformData *transform_data;
-  GdkRGBA rgba;
-  GtkDropTarget *dest;
-  GtkGesture *gesture;
-
-  n_items++;
-
-  label = g_strdup_printf ("Item %d", n_items);
-  id = g_strdup_printf ("item%d", n_items);
-
-  gdk_rgba_parse (&rgba, "yellow");
-
-  widget = gtk_label_new (label);
-  gtk_widget_add_css_class (widget, "frame");
-  gtk_widget_set_name (widget, id);
-
-  set_color (widget, &rgba);
-  transform_data = g_new0 (TransformData, 1);
-  transform_data->x = x;
-  transform_data->y = y;
-  transform_data->angle = 0.0;
-  g_object_set_data_full (G_OBJECT (widget), "transform-data", transform_data, g_free);
-
-  g_free (label);
-  g_free (id);
-
-  dest = gtk_drop_target_new (GDK_TYPE_RGBA, GDK_ACTION_COPY);
-  g_signal_connect (dest, "drop", G_CALLBACK (item_drag_drop), NULL);
-  gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (dest));
-
-  gesture = gtk_gesture_rotate_new ();
-  g_signal_connect (gesture, "angle-changed", G_CALLBACK (angle_changed), NULL);
-  g_signal_connect (gesture, "end", G_CALLBACK (rotate_done), NULL);
-  gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (gesture));
-
-  gesture = gtk_gesture_click_new ();
-  g_signal_connect (gesture, "released", G_CALLBACK (click_done), NULL);
-  gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (gesture));
-  
-  return widget;
-}
-
 static GtkWidget *window = NULL;

 GtkWidget *
@@ -417,78 +353,37 @@ do_dnd (GtkWidget *do_widget)
 {
  if (!window)
    {
-      GtkWidget *sw;
-      GtkWidget *canvas;
-      GtkWidget *widget;
-      GtkWidget *box, *box2, *box3;
-      const char *colors[] = {
-        "red", "green", "blue", "magenta", "orange", "gray", "black", "yellow",
-        "white", "gray", "brown", "pink",  "cyan", "bisque", "gold", "maroon",
-        "navy", "orchid", "olive", "peru", "salmon", "silver", "wheat",
-        NULL
-      };
-      int i;
-      int x, y;
-
-      widget = gtk_color_button_new ();
-      gtk_widget_destroy (widget);
+      GtkWidget *vbox, *fixed;
+      GtkGesture *multipress;
+      GtkCssProvider *provider;

      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);
+      gtk_window_set_title (GTK_WINDOW (window), "Drag-and-drop");

      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);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

-      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_container_add (GTK_CONTAINER (box), box2);
+      fixed = gtk_fixed_new ();
+      gtk_container_add (GTK_CONTAINER (vbox), fixed);
+      gtk_widget_set_hexpand (fixed, TRUE);
+      gtk_widget_set_vexpand (fixed, TRUE);

-      canvas = canvas_new ();
-      gtk_container_add (GTK_CONTAINER (box2), canvas);
+      multipress = gtk_gesture_click_new ();
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (multipress), 0);
+      g_signal_connect (multipress, "pressed", G_CALLBACK (pressed_cb), NULL);
+      g_signal_connect (multipress, "released", G_CALLBACK (released_cb), NULL);
+      gtk_widget_add_controller (fixed, GTK_EVENT_CONTROLLER (multipress));

-      n_items = 0;
-
-      x = y = 40;
-      for (i = 0; i < 4; i++)
-        {
-          GtkWidget *item;
-
-          item = canvas_item_new (x, y);
-          gtk_container_add (GTK_CONTAINER (canvas), item);
-          apply_transform (item);
-
-          x += 150;
-          y += 100;
-        }
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_NEVER);
-      gtk_container_add (GTK_CONTAINER (box), sw);
-
-      box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_widget_add_css_class (box3, "linked");
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box3);
-
-      for (i = 0; colors[i]; i++)
-        {
-          GdkRGBA rgba;
-          GtkWidget *swatch;
-
-          gdk_rgba_parse (&rgba, colors[i]);
-
-          swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
-                                 "rgba", &rgba,
-                                 "selectable", FALSE,
-                                 NULL);
-          gtk_container_add (GTK_CONTAINER (box3), swatch);
-        }
+      provider = gtk_css_provider_new ();
+      gtk_css_provider_load_from_resource (provider, "/dnd/dnd.css");
+      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
+                                                  GTK_STYLE_PROVIDER (provider),
+                                                  800);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/dnd.css
+++ b/demos/gtk-demo/dnd.css
@@ -0,0 +1,3 @@
+spinner.demo {
+  opacity: 1;
+}
--- a/demos/gtk-demo/drawingarea.c
+++ b/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);
 }
@@ -204,7 +202,7 @@ do_drawingarea (GtkWidget *do_widget)
      gtk_widget_set_margin_end (vbox, 16);
      gtk_widget_set_margin_top (vbox, 16);
      gtk_widget_set_margin_bottom (vbox, 16);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      /*
       * Create the checkerboard area
@@ -216,6 +214,7 @@ do_drawingarea (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_vexpand (frame, TRUE);
      gtk_container_add (GTK_CONTAINER (vbox), frame);

@@ -223,7 +222,7 @@ do_drawingarea (GtkWidget *do_widget)
      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), checkerboard_draw, NULL, NULL);
-      gtk_frame_set_child (GTK_FRAME (frame), da);
+      gtk_container_add (GTK_CONTAINER (frame), da);

      /*
       * Create the scribble area
@@ -236,16 +235,17 @@ do_drawingarea (GtkWidget *do_widget)

      frame = gtk_frame_new (NULL);
      gtk_widget_set_vexpand (frame, TRUE);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      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), scribble_draw, NULL, NULL);
-      gtk_frame_set_child (GTK_FRAME (frame), da);
+      gtk_container_add (GTK_CONTAINER (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);
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -275,9 +275,6 @@ cell_edited (GtkCellRendererText *cell,
                            g_array_index (articles, Item, i).product, -1);
      }
      break;
-
-    default:
-      g_assert_not_reached ();
    }

  gtk_tree_path_free (path);
@@ -360,13 +357,14 @@ do_editable_cells (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_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      gtk_container_add (GTK_CONTAINER (vbox),
                          gtk_label_new ("Shopping list (you can edit the cells!)"));

      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
+      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+                                           GTK_SHADOW_ETCHED_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
@@ -387,7 +385,7 @@ do_editable_cells (GtkWidget *do_widget)
      g_object_unref (numbers_model);
      g_object_unref (items_model);

-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
+      gtk_container_add (GTK_CONTAINER (sw), treeview);

      /* some buttons */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -9,7 +9,7 @@
 #include <gtk/gtk.h>

 /* Creates a tree model containing the completions */
-static GtkTreeModel *
+GtkTreeModel *
 create_completion_model (void)
 {
  GtkListStore *store;
@@ -59,7 +59,7 @@ do_entry_completion (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_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      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.");
--- a/demos/gtk-demo/entry_undo.c
+++ b/demos/gtk-demo/entry_undo.c
@@ -33,7 +33,7 @@ do_entry_undo (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_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -59,7 +59,7 @@ do_expander (GtkWidget *do_widget)
      gtk_widget_set_vexpand (expander, TRUE);
      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
-      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
+      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
@@ -78,7 +78,7 @@ do_expander (GtkWidget *do_widget)
                                "A second paragraph will contain even more "
                                "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_container_add (GTK_CONTAINER (sw), tv);
      gtk_container_add (GTK_CONTAINER (expander), sw);
      gtk_container_add (GTK_CONTAINER (area), expander);
      g_signal_connect (expander, "notify::expanded",
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -56,6 +56,7 @@
        </child>
        <child>
          <object class="GtkTreeView" id="treeview1">
+            <property name="can-focus">1</property>
            <property name="model">liststore1</property>
            <property name="headers-clickable">0</property>
            <child internal-child="selection">
@@ -94,6 +95,7 @@
        </child>
        <child>
          <object class="GtkTreeView" id="treeview2">
+            <property name="can-focus">1</property>
            <property name="headers-clickable">0</property>
            <property name="search-column">0</property>
            <child internal-child="selection">
@@ -176,6 +178,7 @@
        </child>
        <child>
          <object class="GtkTreeView" id="treeview3">
+            <property name="can-focus">1</property>
            <property name="headers-clickable">0</property>
            <property name="search-column">0</property>
            <child internal-child="selection">
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -37,7 +37,6 @@ get_random_icon_name (GtkIconTheme *theme)
  return icon_names[g_random_int_range(0, n_icon_names)];
 }

-/* Can't be static because it's also used in iconscroll.c */
 GtkWidget *
 create_icon (void)
 {
@@ -62,7 +61,7 @@ create_blurred_button (void)
 {
  GtkWidget *w = gtk_button_new ();

-  gtk_widget_add_css_class (w, "blurred-button");
+  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");

  return w;
 }
@@ -161,7 +160,7 @@ create_menu_button (void)
  GtkWidget *w = gtk_menu_button_new ();
  GtkWidget *popover = gtk_popover_new ();

-  gtk_popover_set_child (GTK_POPOVER (popover), gtk_button_new_with_label ("Hey!"));
+  gtk_container_add (GTK_CONTAINER (popover), gtk_button_new_with_label ("Hey!"));
  gtk_popover_set_autohide (GTK_POPOVER (popover), FALSE);
  gtk_menu_button_set_popover (GTK_MENU_BUTTON (w), popover);
  g_signal_connect (w, "map", G_CALLBACK (mapped), NULL);
@@ -194,7 +193,7 @@ static void
 set_widget_type (GtkFishbowl *fishbowl,
                 int          widget_type_index)
 {
-  GtkWidget *window;
+  GtkWidget *window, *headerbar;

  if (widget_type_index == selected_widget_type)
    return;
@@ -205,7 +204,8 @@ set_widget_type (GtkFishbowl *fishbowl,
                                  widget_types[selected_widget_type].create_func);

  window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (fishbowl)));
-  gtk_window_set_title (GTK_WINDOW (window),
+  headerbar = gtk_window_get_titlebar (GTK_WINDOW (window));
+  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
                            widget_types[selected_widget_type].name);
 }

--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -49,7 +49,7 @@
        <child type="end">
          <object class="GtkToggleButton" id="changes_allow">
            <property name="icon-name">changes-allow</property>
-            <property name="has-frame">0</property>
+            <property name="relief">none</property>
            <signal name="notify::active" handler="fishbowl_changes_toggled_cb"/>
          </object>
        </child>
--- a/demos/gtk-demo/fixed.c
+++ b/demos/gtk-demo/fixed.c
@@ -52,7 +52,7 @@ create_faces (void)
      /* Add a face */
      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_style_context_add_class (gtk_widget_get_style_context (faces[i].face), faces[i].css_class);
      gtk_container_add (GTK_CONTAINER (fixed), faces[i].face);

      /* Set up the transformation for each face */
@@ -131,10 +131,10 @@ create_demo_window (GtkWidget *do_widget)
  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_window_set_child (GTK_WINDOW (window), sw);
+  gtk_container_add (GTK_CONTAINER (window), sw);

  fixed = gtk_fixed_new ();
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), fixed);
+  gtk_container_add (GTK_CONTAINER (sw), fixed);
  gtk_widget_set_halign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
  gtk_widget_set_valign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);

--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -37,7 +37,7 @@ color_swatch_new (const gchar *color)
  gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (area), 24);
  gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (area), 24);
  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (area), draw_color, (gpointer) color, NULL);
-  gtk_button_set_child (GTK_BUTTON (button), area);
+  gtk_container_add (GTK_CONTAINER (button), area);

  return button;
 }
@@ -735,8 +735,8 @@ do_flowbox (GtkWidget *do_widget)
      gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (flowbox), 30);
      gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (flowbox), GTK_SELECTION_NONE);

-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), flowbox);
-      gtk_window_set_child (GTK_WINDOW (window), scrolled);
+      gtk_container_add (GTK_CONTAINER (scrolled), flowbox);
+      gtk_container_add (GTK_CONTAINER (window), scrolled);

      for (i = 0; colors[i]; i++)
        gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -4,12 +4,13 @@
  <object class="GtkWindow" id="window">
    <property name="default-width">600</property>
    <property name="default-height">500</property>
-    <property name="title">Font Explorer</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
        <property name="show-title-buttons">1</property>
+        <property name="title">Font Explorer</property>
        <child>
          <object class="GtkButton" id="reset">
+            <property name="can-focus">1</property>
            <property name="receives-default">1</property>
            <property name="tooltip-text">Reset</property>
            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
@@ -26,6 +27,7 @@
      <object class="GtkBox">
        <child>
          <object class="GtkScrolledWindow">
+            <property name="can-focus">1</property>
            <property name="hscrollbar-policy">never</property>
            <child>
              <object class="GtkViewport">
@@ -39,6 +41,7 @@
                    <property name="spacing">6</property>
                    <child>
                      <object class="GtkFontButton" id="font">
+                        <property name="can-focus">1</property>
                        <property name="receives-default">1</property>
                        <property name="font">Sans 12</property>
                        <property name="level">family|style|size|variations|features</property>
@@ -61,6 +64,7 @@
                            <property name="orientation">vertical</property>
                            <child>
                              <object class="GtkComboBox" id="script_lang">
+                                <property name="can-focus">1</property>
                                <property name="margin-top">10</property>
                                <signal name="changed" handler="font_features_script_changed" swapped="no"/>
                                <child>
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -25,14 +25,14 @@

 #define MAKE_TAG(a,b,c,d) (unsigned int)(((a) << 24) | ((b) << 16) | ((c) <<  8) | (d))

-static GtkWidget *the_label;
+static GtkWidget *label;
 static GtkWidget *settings;
 static GtkWidget *description;
 static GtkWidget *font;
 static GtkWidget *script_lang;
 static GtkWidget *resetbutton;
 static GtkWidget *stack;
-static GtkWidget *the_entry;
+static GtkWidget *entry;
 static GtkWidget *variations_heading;
 static GtkWidget *variations_grid;
 static GtkWidget *instance_combo;
@@ -301,9 +301,9 @@ update_display (void)
  char *font_desc;
  char *features;

-  text = gtk_editable_get_text (GTK_EDITABLE (the_entry));
+  text = gtk_editable_get_text (GTK_EDITABLE (entry));

-  if (gtk_label_get_selection_bounds (GTK_LABEL (the_label), &ins, &bound))
+  if (gtk_label_get_selection_bounds (GTK_LABEL (label), &ins, &bound))
    {
      start = g_utf8_offset_to_pointer (text, ins) - text;
      end = g_utf8_offset_to_pointer (text, bound) - text;
@@ -409,8 +409,8 @@ update_display (void)

  gtk_label_set_text (GTK_LABEL (description), font_desc);
  gtk_label_set_text (GTK_LABEL (settings), features);
-  gtk_label_set_text (GTK_LABEL (the_label), text);
-  gtk_label_set_attributes (GTK_LABEL (the_label), attrs);
+  gtk_label_set_text (GTK_LABEL (label), text);
+  gtk_label_set_attributes (GTK_LABEL (label), attrs);

  g_free (font_desc);
  pango_font_description_free (desc);
@@ -548,7 +548,7 @@ update_script_combo (void)
    {
      const char *langname;
      char langbuf[5];
-      GtkTreeIter tree_iter;
+      GtkTreeIter iter;

      if (pair->lang_tag == HB_OT_TAG_DEFAULT_LANGUAGE)
        langname = NC_("Language", "Default");
@@ -563,7 +563,7 @@ update_script_combo (void)
            }
        }

-      gtk_list_store_insert_with_values (store, &tree_iter, -1,
+      gtk_list_store_insert_with_values (store, &iter, -1,
                                         0, langname,
                                         1, pair->script_index,
                                         2, pair->lang_index,
@@ -572,7 +572,7 @@ update_script_combo (void)
      if (pair->lang_tag == active)
        {
          have_active = TRUE;
-          active_iter = tree_iter;
+          active_iter = iter;
        }
    }

@@ -751,7 +751,7 @@ add_font_variations (GString *s)
  GHashTableIter iter;
  Axis *axis;
  char buf[G_ASCII_DTOSTR_BUF_SIZE];
-  const char *sep = "";
+  char *sep = "";

  g_hash_table_iter_init (&iter, axes);
  while (g_hash_table_iter_next (&iter, (gpointer *)NULL, (gpointer *)&axis))
@@ -1129,7 +1129,7 @@ font_features_reset_features (void)
 {
  GList *l;

-  gtk_label_select_region (GTK_LABEL (the_label), 0, 0);
+  gtk_label_select_region (GTK_LABEL (label), 0, 0);

  g_list_free_full (ranges, free_range);
  ranges = NULL;
@@ -1156,9 +1156,9 @@ static char *text;
 static void
 switch_to_entry (void)
 {
-  text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (the_entry)));
+  text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (entry)));
  gtk_stack_set_visible_child_name (GTK_STACK (stack), "entry");
-  gtk_widget_grab_focus (the_entry);
+  gtk_widget_grab_focus (entry);
 }

 static void
@@ -1217,20 +1217,20 @@ do_font_features (GtkWidget *do_widget)

      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list"));
-      the_label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
+      label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
      settings = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
      description = GTK_WIDGET (gtk_builder_get_object (builder, "description"));
      resetbutton = GTK_WIDGET (gtk_builder_get_object (builder, "reset"));
      font = GTK_WIDGET (gtk_builder_get_object (builder, "font"));
      script_lang = GTK_WIDGET (gtk_builder_get_object (builder, "script_lang"));
      stack = GTK_WIDGET (gtk_builder_get_object (builder, "stack"));
-      the_entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
+      entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
      edit_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "edit_toggle"));

      controller = gtk_event_controller_key_new ();
-      g_object_set_data_full (G_OBJECT (the_entry), "controller", g_object_ref (controller), g_object_unref);
-      g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), the_entry);
-      gtk_widget_add_controller (the_entry, controller);
+      g_object_set_data_full (G_OBJECT (entry), "controller", g_object_ref (controller), g_object_unref);
+      g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), entry);
+      gtk_widget_add_controller (entry, controller);

      add_check_group (feature_list, _("Kerning"), (const char *[]){ "kern", NULL });
      add_check_group (feature_list, _("Ligatures"), (const char *[]){ "liga",
--- a/demos/gtk-demo/fontplane.c
+++ b/demos/gtk-demo/fontplane.c
@@ -140,6 +140,17 @@ update_value (GtkFontPlane *plane,
  gtk_widget_queue_draw (widget);
 }

+static void
+hold_action (GtkGestureLongPress *gesture,
+             gdouble              x,
+             gdouble              y,
+             GtkFontPlane       *plane)
+{
+  gboolean handled;
+
+  g_signal_emit_by_name (plane, "popup-menu", &handled);
+}
+
 static void
 plane_drag_gesture_begin (GtkGestureDrag *gesture,
                          gdouble         start_x,
@@ -150,6 +161,13 @@ plane_drag_gesture_begin (GtkGestureDrag *gesture,

  button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));

+  if (button == GDK_BUTTON_SECONDARY)
+    {
+      gboolean handled;
+
+      g_signal_emit_by_name (plane, "popup-menu", &handled);
+    }
+
  if (button != GDK_BUTTON_PRIMARY)
    {
      gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
@@ -189,6 +207,8 @@ gtk_font_plane_init (GtkFontPlane *plane)
 {
  GtkGesture *gesture;

+  gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
+
  gesture = gtk_gesture_drag_new ();
  g_signal_connect (gesture, "drag-begin",
 		    G_CALLBACK (plane_drag_gesture_begin), plane);
@@ -198,6 +218,13 @@ gtk_font_plane_init (GtkFontPlane *plane)
 		    G_CALLBACK (plane_drag_gesture_end), plane);
  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0);
  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
+
+  gesture = gtk_gesture_long_press_new ();
+  g_signal_connect (gesture, "pressed",
+                    G_CALLBACK (hold_action), plane);
+  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture),
+                                     TRUE);
+  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
 }

 static void
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -43,6 +43,7 @@ update_image (void)
  cairo_font_options_t *fopt;
  cairo_hint_style_t hintstyle;
  cairo_hint_metrics_t hintmetrics;
+  int i;

  if (!context)
    context = gtk_widget_create_pango_context (image);
@@ -115,7 +116,6 @@ update_image (void)

      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (show_grid)))
        {
-          int i;
          cairo_set_source_rgba (cr, 0.2, 0, 0, 0.2);
          for (i = 1; i < ink.height + 20; i++)
            {
--- a/demos/gtk-demo/fontrendering.ui
+++ b/demos/gtk-demo/fontrendering.ui
@@ -193,7 +193,7 @@
        <child>
          <object class="GtkScrolledWindow">
            <property name="propagate-natural-height">1</property>
-            <property name="has-frame">1</property>
+            <property name="shadow-type">in</property>
            <property name="hexpand">1</property>
            <property name="vexpand">1</property>
            <child>
--- a/demos/gtk-demo/gears.c
+++ b/demos/gtk-demo/gears.c
@@ -1,137 +0,0 @@
-/* OpenGL/Gears
- *
- * This is a classic OpenGL demo, running in a GtkGLArea.
- */
-
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-
-#include "gtkgears.h"
-
-/************************************************************************
- *                 DEMO CODE                                            *
- ************************************************************************/
-
-static void
-on_axis_value_change (GtkAdjustment *adjustment,
-                      gpointer       data)
-{
-  GtkGears *gears = GTK_GEARS (data);
-  int axis = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (adjustment), "axis"));
-
-  gtk_gears_set_axis (gears, axis, gtk_adjustment_get_value (adjustment));
-}
-
-
-static GtkWidget *
-create_axis_slider (GtkGears *gears,
-                    int axis)
-{
-  GtkWidget *box, *label, *slider;
-  GtkAdjustment *adj;
-  const char *text;
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-
-  switch (axis)
-    {
-    case GTK_GEARS_X_AXIS:
-      text = "X";
-      break;
-
-    case GTK_GEARS_Y_AXIS:
-      text = "Y";
-      break;
-
-    case GTK_GEARS_Z_AXIS:
-      text = "Z";
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-
-  label = gtk_label_new (text);
-  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);
-  g_object_set_data (G_OBJECT (adj), "axis", GINT_TO_POINTER (axis));
-  g_signal_connect (adj, "value-changed",
-                    G_CALLBACK (on_axis_value_change),
-                    gears);
-  slider = gtk_scale_new (GTK_ORIENTATION_VERTICAL, adj);
-  gtk_scale_set_draw_value (GTK_SCALE (slider), FALSE);
-  gtk_container_add (GTK_CONTAINER (box), slider);
-  gtk_widget_set_vexpand (slider, TRUE);
-  gtk_widget_show (slider);
-
-  gtk_widget_show (box);
-
-  return box;
-}
-
-GtkWidget *
-do_gears (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *box, *hbox, *fps_label, *gears, *overlay, *frame;
-  int i;
-
-  if (!window)
-    {
-      window = gtk_window_new ();
-      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_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-
-      overlay = gtk_overlay_new ();
-      gtk_widget_set_margin_start (overlay, 12);
-      gtk_widget_set_margin_end (overlay, 12);
-      gtk_widget_set_margin_top (overlay, 12);
-      gtk_widget_set_margin_bottom (overlay, 12);
-
-      gtk_window_set_child (GTK_WINDOW (window), overlay);
-
-      frame = gtk_frame_new (NULL);
-      gtk_widget_set_halign (frame, GTK_ALIGN_START);
-      gtk_widget_set_valign (frame, GTK_ALIGN_START);
-      gtk_widget_add_css_class (frame, "app-notification");
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), frame);
-
-      fps_label = gtk_label_new ("");
-      gtk_widget_set_halign (fps_label, GTK_ALIGN_START);
-      gtk_frame_set_child (GTK_FRAME (frame), fps_label);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-      gtk_box_set_spacing (GTK_BOX (box), 6);
-      gtk_overlay_set_child (GTK_OVERLAY (overlay), box);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
-      gtk_box_set_spacing (GTK_BOX (box), 6);
-      gtk_container_add (GTK_CONTAINER (box), hbox);
-
-      gears = gtk_gears_new ();
-      gtk_widget_set_hexpand (gears, TRUE);
-      gtk_widget_set_vexpand (gears, TRUE);
-      gtk_container_add (GTK_CONTAINER (hbox), gears);
-
-      for (i = 0; i < GTK_GEARS_N_AXIS; 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_container_add (GTK_CONTAINER (box), hbox);
-
-      gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label));
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/geninclude.py
+++ b/demos/gtk-demo/geninclude.py
@@ -17,9 +17,9 @@ typedef struct _Demo Demo;

 struct _Demo
 {
-  const char *name;
-  const char *title;
-  const char *filename;
+  gchar *name;
+  gchar *title;
+  gchar *filename;
  GDoDemoFunc func;
  Demo *children;
 };
--- a/demos/gtk-demo/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -153,7 +153,7 @@ do_gestures (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);

      drawing_area = gtk_drawing_area_new ();
-      gtk_window_set_child (GTK_WINDOW (window), drawing_area);
+      gtk_container_add (GTK_CONTAINER (window), drawing_area);

      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
                                      drawing_area_draw,
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -1,4 +1,4 @@
-/* OpenGL/OpenGL Area
+/* OpenGL Area
 *
 * GtkGLArea is a widget that allows custom drawing using OpenGL calls.
 */
@@ -383,7 +383,7 @@ close_window (GtkWidget *widget)
  rotation_angles[Z_AXIS] = 0.0;
 }

-static GtkWidget *
+GtkWidget *
 create_glarea_window (GtkWidget *do_widget)
 {
  GtkWidget *window, *box, *button, *controls;
@@ -401,7 +401,7 @@ create_glarea_window (GtkWidget *do_widget)
  gtk_widget_set_margin_top (box, 12);
  gtk_widget_set_margin_bottom (box, 12);
  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_window_set_child (GTK_WINDOW (window), box);
+  gtk_container_add (GTK_CONTAINER (window), box);

  gl_area = gtk_gl_area_new ();
  gtk_widget_set_hexpand (gl_area, TRUE);
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -2,8 +2,9 @@
 *
 * GtkHeaderBar is a container that is suitable for implementing
 * window titlebars. One of its features is that it can position
- * a title centered with regard to the full width, regardless of
- * variable-width content at the left or right.
+ * a title (and optional subtitle) centered with regard to the
+ * full width, regardless of variable-width content at the left
+ * or right.
 *
 * It is commonly used with gtk_window_set_titlebar()
 */
@@ -24,35 +25,36 @@ 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_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 ();
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Welcome to Facebook - Log in, sign up or learn more");
+      gtk_header_bar_set_has_subtitle (GTK_HEADER_BAR (header), FALSE);

      button = gtk_button_new ();
      icon = g_themed_icon_new ("mail-send-receive-symbolic");
      image = gtk_image_new_from_gicon (icon);
      g_object_unref (icon);
-      gtk_button_set_child (GTK_BUTTON (button), image);
+      gtk_container_add (GTK_CONTAINER (button), image);
      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_widget_add_css_class (box, "linked");
+      gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked");
      button = gtk_button_new ();
-      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
+      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
      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_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
      gtk_container_add (GTK_CONTAINER (box), button);

      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

      gtk_window_set_titlebar (GTK_WINDOW (window), header);

-      gtk_window_set_child (GTK_WINDOW (window), gtk_text_view_new ());
+      gtk_container_add (GTK_CONTAINER (window), gtk_text_view_new ());
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/help-overlay.ui
+++ b/demos/gtk-demo/help-overlay.ui
@@ -1,25 +0,0 @@
-<interface>
-  <object class="GtkShortcutsWindow" id="help_overlay">
-    <child>
-      <object class="GtkShortcutsSection">
-        <child>
-          <object class="GtkShortcutsGroup">
-            <property name="title">General</property>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="accelerator">F1</property>
-                <property name="title">Show About Dialog</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkShortcutsShortcut">
-                <property name="accelerator">&lt;Control&gt;q</property>
-                <property name="title">Quit</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -17,7 +17,7 @@
 static void
 insert_link (GtkTextBuffer *buffer,
             GtkTextIter   *iter,
-             const char    *text,
+             gchar         *text,
             gint           page)
 {
  GtkTextTag *tag;
@@ -266,8 +266,8 @@ do_hypertext (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_window_set_child (GTK_WINDOW (window), sw);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
+      gtk_container_add (GTK_CONTAINER (window), sw);
+      gtk_container_add (GTK_CONTAINER (sw), view);

      show_page (buffer, 1);
    }
--- a/demos/gtk-demo/iconscroll.c
+++ b/demos/gtk-demo/iconscroll.c
@@ -68,7 +68,7 @@ populate_icons (void)
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
 		                  GTK_POLICY_NEVER,
 		                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), grid);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow), grid);
 }

 static char *content;
@@ -104,7 +104,7 @@ populate_text (gboolean hilight)
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
 		                  GTK_POLICY_NEVER,
 		                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), textview);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
 }

 static void
@@ -128,7 +128,7 @@ populate_image (void)
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
 		                  GTK_POLICY_AUTOMATIC,
 		                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), image);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow), image);
 }

 static void
@@ -137,8 +137,9 @@ set_widget_type (int type)
  if (tick_cb)
    gtk_widget_remove_tick_callback (window, tick_cb);

-  if (gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (scrolledwindow)))
-    gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), NULL);
+  if (gtk_bin_get_child (GTK_BIN (scrolledwindow)))
+    gtk_container_remove (GTK_CONTAINER (scrolledwindow),
+                          gtk_bin_get_child (GTK_BIN (scrolledwindow)));

  selected = type;

--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -263,7 +263,7 @@ do_iconview (GtkWidget *do_widget)
      load_pixbufs ();

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      tool_bar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_container_add (GTK_CONTAINER (vbox), tool_bar);
@@ -277,7 +277,8 @@ do_iconview (GtkWidget *do_widget)


      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
+      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+                                           GTK_SHADOW_ETCHED_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
@@ -312,7 +313,7 @@ do_iconview (GtkWidget *do_widget)
      /* Connect to the "item-activated" signal */
      g_signal_connect (icon_view, "item-activated",
                        G_CALLBACK (item_activated), store);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), icon_view);
+      gtk_container_add (GTK_CONTAINER (sw), icon_view);

      gtk_widget_grab_focus (icon_view);
    }
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -146,7 +146,7 @@ do_iconview_edit (GtkWidget *do_widget)
                                      "text", COL_TEXT,
                                      NULL);

-      gtk_window_set_child (GTK_WINDOW (window), icon_view);
+      gtk_container_add (GTK_CONTAINER (window), icon_view);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -346,7 +346,7 @@ do_images (GtkWidget *do_widget)
      gtk_widget_set_margin_end (base_vbox, 16);
      gtk_widget_set_margin_top (base_vbox, 16);
      gtk_widget_set_margin_bottom (base_vbox, 16);
-      gtk_window_set_child (GTK_WINDOW (window), base_vbox);
+      gtk_container_add (GTK_CONTAINER (window), base_vbox);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
      gtk_container_add (GTK_CONTAINER (base_vbox), hbox);
@@ -360,6 +360,7 @@ do_images (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
      gtk_container_add (GTK_CONTAINER (vbox), frame);
@@ -367,7 +368,7 @@ do_images (GtkWidget *do_widget)
      image = gtk_image_new_from_icon_name ("gtk3-demo");
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);

-      gtk_frame_set_child (GTK_FRAME (frame), image);
+      gtk_container_add (GTK_CONTAINER (frame), image);


      /* Animation */
@@ -378,13 +379,14 @@ do_images (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
      gtk_container_add (GTK_CONTAINER (vbox), frame);

      picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");

-      gtk_frame_set_child (GTK_FRAME (frame), picture);
+      gtk_container_add (GTK_CONTAINER (frame), picture);

      /* Symbolic icon */

@@ -394,6 +396,7 @@ do_images (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
      gtk_container_add (GTK_CONTAINER (vbox), frame);
@@ -402,7 +405,7 @@ do_images (GtkWidget *do_widget)
      image = gtk_image_new_from_gicon (gicon);
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);

-      gtk_frame_set_child (GTK_FRAME (frame), image);
+      gtk_container_add (GTK_CONTAINER (frame), image);


      /* Progressive */
@@ -415,6 +418,7 @@ do_images (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
      gtk_container_add (GTK_CONTAINER (vbox), frame);
@@ -423,7 +427,7 @@ do_images (GtkWidget *do_widget)
       * will create the pixbuf and fill it in.
       */
      picture = gtk_picture_new ();
-      gtk_frame_set_child (GTK_FRAME (frame), picture);
+      gtk_container_add (GTK_CONTAINER (frame), picture);

      start_progressive_loading (picture);

@@ -437,13 +441,14 @@ do_images (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
      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);
-      gtk_frame_set_child (GTK_FRAME (frame), video);
+      gtk_container_add (GTK_CONTAINER (frame), video);

      /* Widget paintables */
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -44,6 +44,7 @@ do_infobar (GtkWidget *do_widget)
  GtkWidget *frame;
  GtkWidget *bar;
  GtkWidget *vbox;
+  GtkWidget *vbox2;
  GtkWidget *label;
  GtkWidget *actions;
  GtkWidget *button;
@@ -51,13 +52,11 @@ do_infobar (GtkWidget *do_widget)
  if (!window)
    {
      actions = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_widget_add_css_class (actions, "linked");

      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);

      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

@@ -66,7 +65,7 @@ do_infobar (GtkWidget *do_widget)
      gtk_widget_set_margin_end (vbox, 8);
      gtk_widget_set_margin_top (vbox, 8);
      gtk_widget_set_margin_bottom (vbox, 8);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      bar = gtk_info_bar_new ();
      gtk_container_add (GTK_CONTAINER (vbox), bar);
@@ -132,18 +131,23 @@ do_infobar (GtkWidget *do_widget)
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
      gtk_container_add (GTK_CONTAINER (actions), button);

-      frame = gtk_frame_new ("An example of different info bars");
+      frame = gtk_frame_new ("Info bars");
      gtk_widget_set_margin_top (frame, 8);
      gtk_widget_set_margin_bottom (frame, 8);
      gtk_container_add (GTK_CONTAINER (vbox), frame);

-      gtk_widget_set_halign (actions, GTK_ALIGN_CENTER);
+      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+      gtk_widget_set_margin_start (vbox2, 8);
+      gtk_widget_set_margin_end (vbox2, 8);
+      gtk_widget_set_margin_top (vbox2, 8);
+      gtk_widget_set_margin_bottom (vbox2, 8);
+      gtk_container_add (GTK_CONTAINER (frame), vbox2);

-      gtk_widget_set_margin_start (actions, 8);
-      gtk_widget_set_margin_end (actions, 8);
-      gtk_widget_set_margin_top (actions, 8);
-      gtk_widget_set_margin_bottom (actions, 8);
-      gtk_frame_set_child (GTK_FRAME (frame), actions);
+      /* Standard message dialog */
+      label = gtk_label_new ("An example of different info bars");
+      gtk_container_add (GTK_CONTAINER (vbox2), label);
+
+      gtk_container_add (GTK_CONTAINER (vbox2), actions);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -1,7 +1,7 @@
 /* Links
 *
 * GtkLabel can show hyperlinks. The default action is to call
- * gtk_show_uri() on their URI, but it is possible to override
+ * gtk_show_uri_on_window() on their URI, but it is possible to override
 * this with a custom handler.
 */

@@ -30,8 +30,6 @@ activate_link (GtkWidget   *label,
                 GTK_DIALOG_DESTROY_WITH_PARENT,
                 GTK_MESSAGE_INFO,
                 GTK_BUTTONS_OK,
-                 "Keyboard navigation");
-      gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
                 "The term <i>keynav</i> is a shorthand for "
                 "keyboard navigation and refers to the process of using "
                 "a program (exclusively) via keyboard input.");
@@ -58,30 +56,22 @@ do_links (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Links");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
      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 "
-                             "as hyperlinks, which can be clicked "
-                             "or activated via <a href=\"keynav\">keynav</a> "
-                             "and they work fine with other markup, like when "
+                             "title=\"plain text\">text</a> may be marked up\n"
+                             "as hyperlinks, which can be clicked\n"
+                             "or activated via <a href=\"keynav\">keynav</a>\n"
+                             "and they work fine with other markup, like when\n"
                             "searching on <a href=\"http://www.google.com/\">"
                             "<span color=\"#0266C8\">G</span><span color=\"#F90101\">o</span>"
                             "<span color=\"#F2B50F\">o</span><span color=\"#0266C8\">g</span>"
                             "<span color=\"#00933B\">l</span><span color=\"#F90101\">e</span>"
                             "</a>.");
      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      gtk_label_set_max_width_chars (GTK_LABEL (label), 40);
-      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
-      gtk_label_set_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD);
      g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
-      gtk_widget_set_margin_start (label, 20);
-      gtk_widget_set_margin_end (label, 20);
-      gtk_widget_set_margin_top (label, 20);
-      gtk_widget_set_margin_bottom (label, 20);
-      gtk_window_set_child (GTK_WINDOW (window), label);
+      gtk_container_add (GTK_CONTAINER (window), label);
      gtk_widget_show (label);
    }

--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -16,9 +16,10 @@ typedef struct
 {
  const gboolean  fixed;
  const guint     number;
-  const char     *severity;
-  const char     *description;
-} Bug;
+  const gchar    *severity;
+  const gchar    *description;
+}
+Bug;

 enum
 {
@@ -33,7 +34,7 @@ enum
  NUM_COLUMNS
 };

-static Bug bugs[] =
+static Bug data[] =
 {
  { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
  { FALSE, 60620, "Critical",   "gdk_surface_clear_area (gdksurface-win32.c) is not thread-safe" },
@@ -97,9 +98,9 @@ create_model (void)
                              G_TYPE_BOOLEAN);

  /* add data to the list store */
-  for (i = 0; i < G_N_ELEMENTS (bugs); i++)
+  for (i = 0; i < G_N_ELEMENTS (data); i++)
    {
-      const char *icon_name;
+      gchar *icon_name;
      gboolean sensitive;

      if (i == 1 || i == 3)
@@ -112,10 +113,10 @@ create_model (void)
        sensitive = TRUE;
      gtk_list_store_append (store, &iter);
      gtk_list_store_set (store, &iter,
-                          COLUMN_FIXED, bugs[i].fixed,
-                          COLUMN_NUMBER, bugs[i].number,
-                          COLUMN_SEVERITY, bugs[i].severity,
-                          COLUMN_DESCRIPTION, bugs[i].description,
+                          COLUMN_FIXED, data[i].fixed,
+                          COLUMN_NUMBER, data[i].number,
+                          COLUMN_SEVERITY, data[i].severity,
+                          COLUMN_DESCRIPTION, data[i].description,
                          COLUMN_PULSE, 0,
                          COLUMN_ICON, icon_name,
                          COLUMN_ACTIVE, FALSE,
@@ -128,23 +129,23 @@ create_model (void)

 static void
 fixed_toggled (GtkCellRendererToggle *cell,
-               char                  *path_str,
+               gchar                 *path_str,
               gpointer               data)
 {
-  GtkTreeModel *tree_model = (GtkTreeModel *)data;
+  GtkTreeModel *model = (GtkTreeModel *)data;
  GtkTreeIter  iter;
  GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
  gboolean fixed;

  /* get toggled iter */
-  gtk_tree_model_get_iter (tree_model, &iter, path);
-  gtk_tree_model_get (tree_model, &iter, COLUMN_FIXED, &fixed, -1);
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_model_get (model, &iter, COLUMN_FIXED, &fixed, -1);

  /* do something with the value */
  fixed ^= 1;

  /* set new value */
-  gtk_list_store_set (GTK_LIST_STORE (tree_model), &iter, COLUMN_FIXED, fixed, -1);
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_FIXED, fixed, -1);

  /* clean up */
  gtk_tree_path_free (path);
@@ -155,6 +156,7 @@ add_columns (GtkTreeView *treeview)
 {
  GtkCellRenderer *renderer;
  GtkTreeViewColumn *column;
+  GtkTreeModel *model = gtk_tree_view_get_model (treeview);

  /* column for fixed toggles */
  renderer = gtk_cell_renderer_toggle_new ();
@@ -266,13 +268,14 @@ do_list_store (GtkWidget *do_widget)
      gtk_widget_set_margin_end (vbox, 8);
      gtk_widget_set_margin_top (vbox, 8);
      gtk_widget_set_margin_bottom (vbox, 8);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (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_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_shadow_type (GTK_SCROLLED_WINDOW (sw),
+                                           GTK_SHADOW_ETCHED_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
@@ -289,7 +292,7 @@ do_list_store (GtkWidget *do_widget)

      g_object_unref (model);

-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
+      gtk_container_add (GTK_CONTAINER (sw), treeview);

      /* add columns to the tree view */
      add_columns (GTK_TREE_VIEW (treeview));
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -360,7 +360,7 @@ do_listbox (GtkWidget *do_widget)
                        &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);
      label = gtk_label_new ("Messages from GTK and friends");
      gtk_container_add (GTK_CONTAINER (vbox), label);
      scrolled = gtk_scrolled_window_new (NULL, NULL);
@@ -368,7 +368,7 @@ do_listbox (GtkWidget *do_widget)
      gtk_widget_set_vexpand (scrolled, TRUE);
      gtk_container_add (GTK_CONTAINER (vbox), scrolled);
      listbox = gtk_list_box_new ();
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), listbox);
+      gtk_container_add (GTK_CONTAINER (scrolled), listbox);

      gtk_list_box_set_sort_func (GTK_LIST_BOX (listbox), (GtkListBoxSortFunc)gtk_message_row_sort, listbox, NULL);
      gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (listbox), FALSE);
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -38,9 +38,10 @@
            <property name="baseline-position">top</property>
            <child>
              <object class="GtkButton" id="button2">
+                <property name="can-focus">1</property>
                <property name="receives-default">1</property>
                <property name="valign">baseline</property>
-                <property name="has-frame">0</property>
+                <property name="relief">none</property>
                <child>
                  <object class="GtkLabel" id="source_name">
                    <property name="valign">baseline</property>
@@ -108,8 +109,9 @@
            <child>
              <object class="GtkLinkButton" id="resent_by_button">
                <property name="label" translatable="0">reshareer</property>
+                <property name="can-focus">1</property>
                <property name="receives-default">1</property>
-                <property name="has-frame">0</property>
+                <property name="relief">none</property>
                <property name="uri">http://www.gtk.org</property>
              </object>
            </child>
@@ -125,8 +127,9 @@
            <child>
              <object class="GtkButton" id="expand_button">
                <property name="label" translatable="yes">Expand</property>
+                <property name="can-focus">1</property>
                <property name="receives-default">1</property>
-                <property name="has-frame">0</property>
+                <property name="relief">none</property>
                <signal name="clicked" handler="expand_clicked" swapped="yes"/>
              </object>
            </child>
@@ -137,31 +140,35 @@
                <child>
                  <object class="GtkButton" id="reply-button">
                    <property name="label" translatable="yes">Reply</property>
+                    <property name="can-focus">1</property>
                    <property name="receives-default">1</property>
-                    <property name="has-frame">0</property>
+                    <property name="relief">none</property>
                  </object>
                </child>
                <child>
                  <object class="GtkButton" id="reshare-button">
                    <property name="label" translatable="yes">Reshare</property>
+                    <property name="can-focus">1</property>
                    <property name="receives-default">1</property>
-                    <property name="has-frame">0</property>
+                    <property name="relief">none</property>
                    <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
                  </object>
                </child>
                <child>
                  <object class="GtkButton" id="favorite-buttton">
                    <property name="label" translatable="yes">Favorite</property>
+                    <property name="can-focus">1</property>
                    <property name="receives-default">1</property>
-                    <property name="has-frame">0</property>
+                    <property name="relief">none</property>
                    <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
                  </object>
                </child>
                <child>
                  <object class="GtkMenuButton" id="more-button">
+                    <property name="can-focus">1</property>
                    <property name="receives-default">1</property>
                    <property name="menu-model">menu1</property>
-                    <property name="has-frame">0</property>
+                    <property name="relief">none</property>
                    <property name="label" translatable="yes">More...</property>
                  </object>
                </child>
@@ -185,6 +192,7 @@
                    <property name="spacing">8</property>
                    <child>
                      <object class="GtkFrame" id="frame1">
+                        <property name="shadow-type">none</property>
                        <child>
                          <object class="GtkLabel" id="n_reshares_label">
                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
@@ -197,6 +205,7 @@ Reshares</property>
                    </child>
                    <child>
                      <object class="GtkFrame" id="frame2">
+                        <property name="shadow-type">none</property>
                        <child>
                          <object class="GtkLabel" id="n_favorites_label">
                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
@@ -222,8 +231,9 @@ FAVORITES</property>
                    <child>
                      <object class="GtkButton" id="button5">
                        <property name="label" translatable="yes">Details</property>
+                        <property name="can-focus">1</property>
                        <property name="receives-default">1</property>
-                        <property name="has-frame">0</property>
+                        <property name="relief">none</property>
                        <style>
                          <class name="dim-label"/>
                        </style>
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -17,7 +17,7 @@ static gchar *current_file = NULL;

 static GtkWidget *notebook;
 static GtkWidget *treeview;
-static GtkWidget *toplevel;
+static GtkWidget *headerbar;

 enum {
  NAME_COLUMN,
@@ -55,8 +55,6 @@ activate_about (GSimpleAction *action,
                          glib_major_version,
                          glib_minor_version,
                          glib_micro_version);
-  g_string_append_printf (s, "\tPango\t%s\n",
-                          pango_version_string ());
  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
@@ -72,7 +70,7 @@ activate_about (GSimpleAction *action,
  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
                         "program-name", "GTK Demo",
                         "version", version,
-                         "copyright", "© 1997—2020 The GTK Team",
+                         "copyright", "© 1997—2019 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK widgets",
@@ -207,14 +205,14 @@ enum {
  STATE_IN_COMMENT
 };

-static const char *tokens[] =
+static gchar *tokens[] =
 {
  "/*",
  "\"",
  NULL
 };

-static const char *types[] =
+static gchar *types[] =
 {
  "static",
  "const ",
@@ -312,6 +310,7 @@ static const char *types[] =
  "GtkIconView ",
  "GtkCellRendererText ",
  "GtkContainer ",
+  "GtkAccelGroup ",
  "GtkPaned ",
  "GtkPrintOperation ",
  "GtkPrintContext ",
@@ -338,7 +337,7 @@ static const char *types[] =
  NULL
 };

-static const char *control[] =
+static gchar *control[] =
 {
  " if ",
  " while ",
@@ -355,7 +354,7 @@ void
 parse_chars (gchar     *text,
             gchar    **end_ptr,
             gint      *state,
-             const char **tag,
+             gchar    **tag,
             gboolean   start)
 {
  gint i;
@@ -495,7 +494,7 @@ fontify (GtkTextBuffer *source_buffer)
  gint state;
  gchar *text;
  gchar *start_ptr, *end_ptr;
-  const char *tag;
+  gchar *tag;

  gtk_text_buffer_create_tag (source_buffer, "source",
                              "font", "monospace",
@@ -571,7 +570,7 @@ display_image (const char *resource)
  gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
  gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), image);
+  gtk_container_add (GTK_CONTAINER (sw), image);

  return sw;
 }
@@ -614,7 +613,9 @@ display_text (const char *resource)
  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), textview);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
+                                       GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (sw), textview);

  return sw;
 }
@@ -867,7 +868,7 @@ load_file (const gchar *demoname,

          p = lines[i];
          state++;
-          G_GNUC_FALLTHROUGH;
+          /* Fall through */

        case 3:
          /* Reading program body */
@@ -875,9 +876,6 @@ load_file (const gchar *demoname,
          if (lines[i+1] != NULL)
            gtk_text_buffer_insert (source_buffer, &start, "\n", 1);
          break;
-
-        default:
-          g_assert_not_reached ();
        }
    }

@@ -915,7 +913,7 @@ selection_cb (GtkTreeSelection *selection,
  if (filename)
    load_file (name, filename);

-  gtk_window_set_title (GTK_WINDOW (toplevel), title);
+  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar), title);

  g_free (name);
  g_free (title);
@@ -977,7 +975,7 @@ startup (GApplication *app)
 {
  GtkBuilder *builder;
  GMenuModel *appmenu;
-  const char *ids[] = { "appmenu", NULL };
+  gchar *ids[] = { "appmenu", NULL };

  builder = gtk_builder_new ();
  gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);
@@ -1030,9 +1028,9 @@ activate (GApplication *app)

  info_view = (GtkWidget *)gtk_builder_get_object (builder, "info-textview");
  source_view = (GtkWidget *)gtk_builder_get_object (builder, "source-textview");
+  headerbar = (GtkWidget *)gtk_builder_get_object (builder, "headerbar");
  treeview = (GtkWidget *)gtk_builder_get_object (builder, "treeview");
  model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
-  toplevel = GTK_WIDGET (window);

  load_file (gtk_demos[0].name, gtk_demos[0].filename);

@@ -1186,14 +1184,6 @@ main (int argc, char **argv)
    { "quit", activate_quit, NULL, NULL, NULL },
    { "inspector", activate_inspector, NULL, NULL, NULL },
  };
-  struct {
-    const gchar *action_and_target;
-    const gchar *accelerators[2];
-  } accels[] = {
-    { "app.about", { "F1", NULL } },
-    { "app.quit", { "<Control>q", NULL } },
-  };
-  int i;

  /* Most code in gtk-demo is intended to be exemplary, but not
   * these few lines, which are just a hack so gtk-demo will work
@@ -1211,9 +1201,6 @@ main (int argc, char **argv)
                                   app_entries, G_N_ELEMENTS (app_entries),
                                   app);

-  for (i = 0; i < G_N_ELEMENTS (accels); i++)
-    gtk_application_set_accels_for_action (app, accels[i].action_and_target, accels[i].accelerators);
-
  g_application_add_main_option (G_APPLICATION (app), "version", 0, 0, G_OPTION_ARG_NONE, "Show program version", NULL);
  g_application_add_main_option (G_APPLICATION (app), "run", 0, 0, G_OPTION_ARG_STRING, "Run an example", "EXAMPLE");
  g_application_add_main_option (G_APPLICATION (app), "list", 0, 0, G_OPTION_ARG_NONE, "List examples", NULL);
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -6,10 +6,6 @@
        <attribute name="label" translatable="yes">_Inspector</attribute>
        <attribute name="action">app.inspector</attribute>
      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
-        <attribute name="action">win.show-help-overlay</attribute>
-      </item>
      <item>
        <attribute name="label" translatable="yes">_About GTK Demo</attribute>
        <attribute name="action">app.about</attribute>
@@ -31,12 +27,14 @@
    </style>
    <property name="default-width">800</property>
    <property name="default-height">600</property>
+    <property name="title">GTK Demo</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar">
        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkButton">
            <property name="valign">center</property>
+            <property name="can-focus">1</property>
            <property name="action-name">win.run</property>
            <style>
              <class name="text-button"/>
@@ -64,10 +62,12 @@
            <child>
              <object class="GtkScrolledWindow">
                <property name="width-request">120</property>
+                <property name="can-focus">1</property>
                <property name="hscrollbar-policy">never</property>
                <property name="min-content-width">150</property>
                <child>
                  <object class="GtkTreeView" id="treeview">
+                    <property name="can-focus">1</property>
                    <property name="model">treestore</property>
                    <property name="headers-visible">0</property>
                    <child internal-child="selection">
@@ -99,6 +99,7 @@
        </child>
        <child>
          <object class="GtkNotebook" id="notebook">
+            <property name="can-focus">1</property>
            <property name="scrollable">1</property>
            <property name="enable-popup">1</property>
            <property name="show-border">0</property>
@@ -109,8 +110,10 @@
                <property name="tab-expand">1</property>
                <property name="child">
                  <object class="GtkScrolledWindow">
+                    <property name="can-focus">1</property>
                    <child>
                      <object class="GtkTextView" id="info-textview">
+                        <property name="can-focus">1</property>
                        <property name="left-margin">20</property>
                        <property name="right-margin">20</property>
                        <property name="top-margin">20</property>
@@ -138,8 +141,10 @@
                <property name="tab-expand">1</property>
                <property name="child">
                  <object class="GtkScrolledWindow" id="source-scrolledwindow">
+                    <property name="can-focus">1</property>
                    <child>
                      <object class="GtkTextView" id="source-textview">
+                        <property name="can-focus">1</property>
                        <property name="left-margin">20</property>
                        <property name="right-margin">20</property>
                        <property name="top-margin">20</property>
--- a/demos/gtk-demo/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -63,7 +63,7 @@ do_markup (GtkWidget *do_widget)

      stack = gtk_stack_new ();
      gtk_widget_show (stack);
-      gtk_window_set_child (GTK_WINDOW (window), stack);
+      gtk_container_add (GTK_CONTAINER (window), stack);

      show_source = gtk_check_button_new_with_label ("Source");
      gtk_widget_set_valign (show_source, GTK_ALIGN_CENTER);
@@ -78,7 +78,7 @@ do_markup (GtkWidget *do_widget)

      view = gtk_text_view_new ();
      gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
-      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD_CHAR);
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
      gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 10);
      gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 10);

@@ -86,7 +86,7 @@ do_markup (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
+      gtk_container_add (GTK_CONTAINER (sw), view);

      gtk_stack_add_named (GTK_STACK (stack), sw, "formatted");

@@ -99,7 +99,7 @@ do_markup (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view2);
+      gtk_container_add (GTK_CONTAINER (sw), view2);

      gtk_stack_add_named (GTK_STACK (stack), sw, "source");

--- a/demos/gtk-demo/markup.txt
+++ b/demos/gtk-demo/markup.txt
@@ -14,7 +14,3 @@ Superscripts and subscripts: 𝜀<span rise="-6000" size="x-small" font_desc="it
 OpenType font features: <span font_desc="sans regular" font_features="dlig=0">feast</span> versus <span font_desc="sans regular" font_features="dlig=1">feast</span>

 Shortcuts: <tt>Monospace</tt> – <b>Bold</b> – <i>Italic</i> – <big>Big</big> – <small>Small</small> – <u>Underlined</u> – <s>Strikethrough</s> – Super<sup>script</sup> – Sub<sub>script</sub>
-
-<span allow_breaks="false">A</span> hyphenation algorithm is a set of rules, especially one codified for implementation in a computer program, that decides at which points a word can be broken over two lines with a hyphen. For example, a hyphenation algorithm might decide that impeachment can be broken as <span allow_breaks="false">impeach‧ment</span> or <span allow_breaks="false">im‧peachment</span> but not <span allow_breaks="false">impe‧achment.</span>
-
-<span insert_hyphens="false">one/two three/four five/six seven/eight nine/ten</span>
--- a/demos/gtk-demo/menus.ui
+++ b/demos/gtk-demo/menus.ui
@@ -5,7 +5,7 @@
      <item>
        <attribute name="label" translatable="yes">_New</attribute>
        <attribute name="action">app.new</attribute>
-        <attribute name="accel">&lt;Control&gt;n</attribute>
+        <attribute name="accel">&lt;Primary&gt;n</attribute>
      </item>
      <item>
        <attribute name="label" translatable="yes">_Open</attribute>
@@ -14,19 +14,19 @@
      <item>
        <attribute name="label" translatable="yes">_Save</attribute>
        <attribute name="action">app.save</attribute>
-        <attribute name="accel">&lt;Control&gt;s</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
      </item>
      <item>
        <attribute name="label" translatable="yes">Save _As...</attribute>
        <attribute name="action">app.save-as</attribute>
-        <attribute name="accel">&lt;Control&gt;s</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
      </item>
    </section>
    <section>
      <item>
        <attribute name="label" translatable="yes">_Quit</attribute>
        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Control&gt;q</attribute>
+        <attribute name="accel">&lt;Primary&gt;q</attribute>
      </item>
    </section>
  </menu>
@@ -45,19 +45,19 @@
              <attribute name="label" translatable="yes">_Red</attribute>
              <attribute name="action">app.color</attribute>
              <attribute name="target">red</attribute>
-              <attribute name="accel">&lt;Control&gt;r</attribute>
+              <attribute name="accel">&lt;Primary&gt;r</attribute>
            </item>
            <item>
              <attribute name="label" translatable="yes">_Green</attribute>
              <attribute name="action">app.color</attribute>
              <attribute name="target">green</attribute>
-              <attribute name="accel">&lt;Control&gt;g</attribute>
+              <attribute name="accel">&lt;Primary&gt;g</attribute>
            </item>
            <item>
              <attribute name="label" translatable="yes">_Blue</attribute>
              <attribute name="action">app.color</attribute>
              <attribute name="target">blue</attribute>
-              <attribute name="accel">&lt;Control&gt;b</attribute>
+              <attribute name="accel">&lt;Primary&gt;b</attribute>
            </item>
          </section>
        </submenu>
@@ -68,26 +68,26 @@
              <attribute name="label" translatable="yes">_Square</attribute>
              <attribute name="action">win.shape</attribute>
              <attribute name="target">square</attribute>
-              <attribute name="accel">&lt;Control&gt;s</attribute>
+              <attribute name="accel">&lt;Primary&gt;s</attribute>
            </item>
            <item>
              <attribute name="label" translatable="yes">_Rectangle</attribute>
              <attribute name="action">win.shape</attribute>
              <attribute name="target">rectangle</attribute>
-              <attribute name="accel">&lt;Control&gt;r</attribute>
+              <attribute name="accel">&lt;Primary&gt;r</attribute>
            </item>
            <item>
              <attribute name="label" translatable="yes">_Oval</attribute>
              <attribute name="action">win.shape</attribute>
              <attribute name="target">oval</attribute>
-              <attribute name="accel">&lt;Control&gt;o</attribute>
+              <attribute name="accel">&lt;Primary&gt;o</attribute>
            </item>
          </section>
        </submenu>
        <item>
          <attribute name="label" translatable="yes">_Bold</attribute>
          <attribute name="action">win.bold</attribute>
-          <attribute name="accel">&lt;Control&gt;&lt;Shift&gt;b</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;b</attribute>
        </item>
      </section>
    </submenu>
@@ -96,7 +96,7 @@
      <item>
        <attribute name="label" translatable="yes">_About</attribute>
        <attribute name="action">win.about</attribute>
-        <attribute name="accel">&lt;Control&gt;a</attribute>
+        <attribute name="accel">&lt;Primary&gt;a</attribute>
      </item>
    </submenu>
  </menu>
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -5,6 +5,7 @@ demos = files([
  'assistant.c',
  'builder.c',
  'clipboard.c',
+  'colorsel.c',
  'combobox.c',
  'constraints.c',
  'constraints2.c',
@@ -27,7 +28,6 @@ demos = files([
  'fishbowl.c',
  'fixed.c',
  'fontrendering.c',
-  'gears.c',
  'gestures.c',
  'glarea.c',
  'headerbar.c',
@@ -51,9 +51,9 @@ demos = files([
  'paintable_mediastream.c',
  'panes.c',
  'password_entry.c',
-  'peg_solitaire.c',
  'pickers.c',
  'pixbufs.c',
+  'popover.c',
  'printing.c',
  'revealer.c',
  'rotated_text.c',
@@ -61,7 +61,6 @@ demos = files([
  'search_entry.c',
  'search_entry2.c',
  'shortcuts.c',
-  'shortcut_triggers.c',
  'sidebar.c',
  'sizegroup.c',
  'sliding_puzzle.c',
@@ -89,7 +88,6 @@ extra_demo_sources = files(['main.c',
                            'gtkgears.c',
                            'puzzlepiece.c',
                            'bluroverlay.c',
-                            'demoimage.c',
                            'demotaggedentry.c'])

 if harfbuzz_dep.found() and pangoft_dep.found()
@@ -113,16 +111,9 @@ gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
                                            'demo.gresource.xml',
                                            source_dir: '.')

-demo_cflags = []
-foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
-    demo_cflags += flag
-  endif
-endforeach
-
 executable('gtk4-demo',
           demos, demos_h, extra_demo_sources, gtkdemo_resources,
-           c_args: gtkdemo_args + demo_cflags,
+           c_args: gtkdemo_args,
           dependencies: gtkdemo_deps,
           include_directories: confinc,
           gui_app: true,
@@ -131,7 +122,7 @@ executable('gtk4-demo',

 executable('gtk4-demo-application',
           'application.c', gtkdemo_resources,
-           c_args: gtkdemo_args + common_cflags,
+           c_args: gtkdemo_args,
           dependencies: gtkdemo_deps,
           include_directories: confinc,
           gui_app: true,
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <object class="GtkWindow" id="window1">
-    <property name="title" translatable="yes">Model Button</property>
-    <property name="resizable">0</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
        <property name="show-title-buttons">1</property>
+        <property name="title" translatable="yes">Model Button</property>
      </object>
    </child>
    <child>
@@ -18,33 +17,31 @@
        <child>
          <object class="GtkMenuButton">
            <property name="popover">thing_a</property>
-            <property name="label">_Color</property>
-            <property name="use-underline">1</property>
+            <property name="label">Color</property>
          </object>
        </child>
        <child>
          <object class="GtkMenuButton">
            <property name="popover">thing_b</property>
-            <property name="label">_Flavors</property>
-            <property name="use-underline">1</property>
+            <property name="label">Flavors</property>
          </object>
        </child>
        <child>
          <object class="GtkMenuButton">
            <property name="popover">thing_c</property>
-            <property name="label">_Tools</property>
-            <property name="use-underline">1</property>
+            <property name="label">Tools</property>
          </object>
        </child>
      </object>
    </child>
  </object>
  <object class="GtkPopover" id="thing_a">
-    <style>
-      <class name="menu"/>
-    </style>
    <child>
      <object class="GtkBox">
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkModelButton">
@@ -71,12 +68,14 @@
    </child>
  </object>
  <object class="GtkPopover" id="thing_b">
-    <style>
-      <class name="menu"/>
-    </style>
    <child>
      <object class="GtkBox">
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
        <property name="orientation">vertical</property>
+        <property name="spacing">10</property>
        <child>
          <object class="GtkModelButton">
            <property name="action-name">win.chocolate</property>
@@ -102,12 +101,14 @@
    </child>
  </object>
  <object class="GtkPopover" id="thing_c">
-    <style>
-      <class name="menu"/>
-    </style>
    <child>
      <object class="GtkBox">
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
        <property name="orientation">vertical</property>
+        <property name="spacing">10</property>
        <child>
          <object class="GtkModelButton">
            <property name="text">Hammer</property>
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -37,7 +37,7 @@ do_overlay (GtkWidget *do_widget)

      overlay = gtk_overlay_new ();
      grid = gtk_grid_new ();
-      gtk_overlay_set_child (GTK_OVERLAY (overlay), grid);
+      gtk_container_add (GTK_CONTAINER (overlay), grid);

      entry = gtk_entry_new ();

@@ -56,29 +56,27 @@ do_overlay (GtkWidget *do_widget)
        }

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_widget_set_can_target (vbox, FALSE);
      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
+      gtk_widget_set_can_target (vbox, FALSE);
      gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (vbox, GTK_ALIGN_START);
+      gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);

      label = gtk_label_new ("<span foreground='blue' weight='ultrabold' font='40'>Numbers</span>");
      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      gtk_widget_set_can_target (label, FALSE);
      gtk_widget_set_margin_top (label, 8);
-      gtk_widget_set_margin_bottom (label, 8);
+      gtk_widget_set_margin_bottom (label, 50);
      gtk_container_add (GTK_CONTAINER (vbox), label);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
      gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
-
      gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
-      gtk_widget_set_margin_top (entry, 8);
+      gtk_widget_set_margin_top (entry, 50);
      gtk_widget_set_margin_bottom (entry, 8);
      gtk_container_add (GTK_CONTAINER (vbox), entry);

-      gtk_window_set_child (GTK_WINDOW (window), overlay);
+      gtk_container_add (GTK_CONTAINER (window), overlay);

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
--- a/demos/gtk-demo/overlay2.c
+++ b/demos/gtk-demo/overlay2.c
@@ -57,9 +57,9 @@ do_overlay2 (GtkWidget *do_widget)
      gtk_text_iter_forward_word_end (&end);
      gtk_text_buffer_apply_tag (buffer, tag, &start, &end);

-      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);
+      gtk_container_add (GTK_CONTAINER (window), overlay);
+      gtk_container_add (GTK_CONTAINER (overlay), sw);
+      gtk_container_add (GTK_CONTAINER (sw), text);

      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -47,7 +47,6 @@ static const gchar *pad_colors[] = {
  "orange"
 };

-static GType drawing_area_get_type (void);
 G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_WIDGET)

 static void drawing_area_set_color (DrawingArea *area,
@@ -339,10 +338,9 @@ drawing_area_init (DrawingArea *area)
  gtk_widget_add_controller (GTK_WIDGET (area), GTK_EVENT_CONTROLLER (gesture));

  area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
-  area->brush_size = 1;
 }

-static GtkWidget *
+GtkWidget *
 drawing_area_new (void)
 {
  return g_object_new (drawing_area_get_type (), NULL);
@@ -389,9 +387,10 @@ do_paint (GtkWidget *toplevel)
      window = gtk_window_new ();

      draw_area = drawing_area_new ();
-      gtk_window_set_child (GTK_WINDOW (window), draw_area);
+      gtk_container_add (GTK_CONTAINER (window), draw_area);

      headerbar = gtk_header_bar_new ();
+      gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar), "Paint");
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (headerbar), TRUE);

      colorbutton = gtk_color_button_new ();
@@ -404,7 +403,6 @@ 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_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -164,7 +164,7 @@ do_paintable (GtkWidget *do_widget)

      nuclear = gtk_nuclear_icon_new (0.0);
      image = gtk_image_new_from_paintable (nuclear);
-      gtk_window_set_child (GTK_WINDOW (window), image);
+      gtk_container_add (GTK_CONTAINER (window), image);
      g_object_unref (nuclear);
    }

--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -196,7 +196,7 @@ do_paintable_animated (GtkWidget *do_widget)

      nuclear = gtk_nuclear_animation_new ();
      image = gtk_image_new_from_paintable (nuclear);
-      gtk_window_set_child (GTK_WINDOW (window), image);
+      gtk_container_add (GTK_CONTAINER (window), image);
      g_object_unref (nuclear);
    }

--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -298,7 +298,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
      gtk_media_stream_set_loop (GTK_MEDIA_STREAM (nuclear), TRUE);

      video = gtk_video_new_for_media_stream (nuclear);
-      gtk_window_set_child (GTK_WINDOW (window), video);
+      gtk_container_add (GTK_CONTAINER (window), video);

      g_object_unref (nuclear);
    }
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -13,7 +13,7 @@

 #include <gtk/gtk.h>

-static void
+void
 toggle_resize (GtkWidget *widget,
               GtkWidget *child)
 {
@@ -47,7 +47,7 @@ toggle_resize (GtkWidget *widget,
  g_object_unref (child);
 }

-static void
+void
 toggle_shrink (GtkWidget *widget,
               GtkWidget *child)
 {
@@ -81,7 +81,7 @@ toggle_shrink (GtkWidget *widget,
  g_object_unref (child);
 }

-static GtkWidget *
+GtkWidget *
 create_pane_options (GtkPaned    *paned,
                     const gchar *frame_label,
                     const gchar *label1,
@@ -103,7 +103,7 @@ create_pane_options (GtkPaned    *paned,
  gtk_widget_set_margin_bottom (frame, 4);

  table = gtk_grid_new ();
-  gtk_frame_set_child (GTK_FRAME (frame), table);
+  gtk_container_add (GTK_CONTAINER (frame), table);

  label = gtk_label_new (label1);
  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
@@ -159,7 +159,7 @@ do_panes (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      gtk_widget_set_margin_start (vpaned, 5);
@@ -172,17 +172,20 @@ do_panes (GtkWidget *do_widget)
      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
      gtk_widget_set_size_request (frame, 60, 60);
      gtk_paned_add1 (GTK_PANED (hpaned), frame);

      button = gtk_button_new_with_mnemonic ("_Hi there");
-      gtk_frame_set_child (GTK_FRAME (frame), button);
+      gtk_container_add (GTK_CONTAINER(frame), button);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
      gtk_widget_set_size_request (frame, 80, 60);
      gtk_paned_add2 (GTK_PANED (hpaned), frame);

      frame = gtk_frame_new (NULL);
+      gtk_frame_set_shadow_type (GTK_FRAME(frame), GTK_SHADOW_IN);
      gtk_widget_set_size_request (frame, 60, 80);
      gtk_paned_add2 (GTK_PANED (vpaned), frame);

--- a/demos/gtk-demo/password_entry.c
+++ b/demos/gtk-demo/password_entry.c
@@ -40,9 +40,9 @@ do_password_entry (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      header = gtk_header_bar_new ();
+      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Choose a Password");
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-      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_signal_connect (window, "destroy",
@@ -53,7 +53,7 @@ do_password_entry (GtkWidget *do_widget)
      gtk_widget_set_margin_end (box, 18);
      gtk_widget_set_margin_top (box, 18);
      gtk_widget_set_margin_bottom (box, 18);
-      gtk_window_set_child (GTK_WINDOW (window), box);
+      gtk_container_add (GTK_CONTAINER (window), box);

      entry = gtk_password_entry_new ();
      gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry), TRUE);
@@ -74,7 +74,7 @@ do_password_entry (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (box), entry2);

      button = gtk_button_new_with_mnemonic ("_Done");
-      gtk_widget_add_css_class (button, "suggested-action");
+      gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action");
      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);
--- a/demos/gtk-demo/peg_solitaire.c
+++ b/demos/gtk-demo/peg_solitaire.c
@@ -1,355 +0,0 @@
-/* Peg Solitaire
- *
- * This demo demonstrates how to use drag'n'drop to implement peg solitaire.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* Create an object for the pegs that get moved around in the game.
- *
- * We implement the GdkPaintable interface for them, so we can use GtkPicture
- * objects for the wholes we put the pegs into.
- */
-#define SOLITAIRE_TYPE_PEG (solitaire_peg_get_type ())
-G_DECLARE_FINAL_TYPE (SolitairePeg, solitaire_peg, SOLITAIRE, PEG, GObject)
-
-/* Declare the struct. */
-struct _SolitairePeg
-{
-  GObject parent_instance;
-
-  int x;
-  int y;
-};
-
-struct _SolitairePegClass
-{
-  GObjectClass parent_class;
-};
-
-/* Here, we implement the functionality required by the GdkPaintable interface */
-static void
-solitaire_peg_snapshot (GdkPaintable *paintable,
-                        GdkSnapshot  *snapshot,
-                        double        width,
-                        double        height)
-{
-  /* The snapshot function is the only function we need to implement.
-   * It does the actual drawing of the paintable.
-   */
-  gtk_snapshot_append_color (snapshot,
-                             &(GdkRGBA) { 0.6, 0.3, 0.0, 1.0 },
-                             &GRAPHENE_RECT_INIT (0, 0, width, height));
-}
-
-static GdkPaintableFlags
-solitaire_peg_get_flags (GdkPaintable *paintable)
-{
-  /* The flags are very useful to let GTK know that this image
-   * is never going to change.
-   * This allows many optimizations and should therefore always
-   * be set.
-   */
-  return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
-}
-
-static void
-solitaire_peg_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = solitaire_peg_snapshot;
-  iface->get_flags = solitaire_peg_get_flags;
-}
-
-/* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (SolitairePeg, solitaire_peg, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                solitaire_peg_paintable_init))
-
-/* Here's the boilerplate for the GObject declaration.
- * We don't need to do anything special here, because we keep no
- * data of our own.
- */
-static void
-solitaire_peg_class_init (SolitairePegClass *klass)
-{
-}
-
-static void
-solitaire_peg_init (SolitairePeg *peg)
-{
-}
-
-/* Add a little setter for the peg's position.
- * We want to track those so that we can check for legal moves
- * during drag'n'drop operations.
- */
-static void
-solitaire_peg_set_position (SolitairePeg *peg,
-                            guint         x,
-                            guint         y)
-{
-  peg->x = x;
-  peg->y = y;
-}
-
-/* And finally, we add a simple constructor.
- */
-static SolitairePeg *
-solitaire_peg_new (void)
-{
-  return g_object_new (SOLITAIRE_TYPE_PEG, NULL);
-}
-
-/*** DRAG AND DROP ***/
-
-/* The user tries to start a drag operation.
- * We check if the image contains a peg, and if so, we return the
- * peg as the content to be dragged.
- */
-static GdkContentProvider *
-drag_prepare (GtkDragSource *source,
-              double         x,
-              double         y,
-              GtkWidget     *image)
-{
-  GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
-
-  if (!SOLITAIRE_IS_PEG (paintable))
-    return NULL;
-
-  return gdk_content_provider_new_typed (SOLITAIRE_TYPE_PEG, paintable);
-}
-
-/* This notifies us that the drag has begun.
- * We can now set up the icon and the widget for the ongoing drag.
- */
-static void
-drag_begin (GtkDragSource *source,
-            GdkDrag       *drag,
-            GtkWidget     *image)
-{
-  GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
-
-  /* We guaranteed in the drag_prepare function above that we
-   * only start a drag if a peg is available.
-   * So let's make sure we did not screw that up.
-   */
-  g_assert (SOLITAIRE_IS_PEG (paintable));
-
-  /* We use the peg as the drag icon.
-   */
-  gtk_drag_source_set_icon (source, paintable, -2, -2);
-
-  /* We also attach it to the drag operation as custom user data,
-   * so that we can get it back later if the drag fails.
-   */
-  g_object_set_data (G_OBJECT (drag), "the peg", paintable);
-
-  /* Because we are busy dragging the peg, we want to unset it
-   * on the image.
-   */
-  gtk_image_clear (GTK_IMAGE (image));
-}
-
-/* Thie is called once a drag operation has ended (successfully or not).
- * We want to undo what we did in drag_begin() above and react
- * to a potential move of the peg.
- */
-static void
-drag_end (GtkDragSource *source,
-          GdkDrag       *drag,
-          gboolean       delete_data,
-          GtkWidget     *image)
-{
-  SolitairePeg *peg;
-
-  /* If the drag was successful, we should now delete the peg.
-   * We did this in drag_begin() above to prepare for the drag, so
-   * there's no need to do anything anymore.
-   */
-  if (delete_data)
-    return;
-
-  /* However, if the drag did not succeed, we need to undo what
-   * we did in drag_begin() and reinsert the peg here.
-   * Because we used it as the drag data
-   */
-  peg = g_object_get_data (G_OBJECT (drag), "the peg");
-  gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (peg));
-}
-
-/* Whenever a new drop operation starts, we need to check if we can
- * accept it.
- * The default check unfortunately is not good enough, because it only
- * checks the data type. But we also need to check if our image can
- * even accept data.
- */
-static gboolean
-drop_accept (GtkDropTarget *target,
-             GdkDrop       *drop,
-             GtkWidget     *image)
-{
-  /* First, check the drop is actually trying to drop a peg */
-  if (!gdk_content_formats_contain_gtype (gdk_drop_get_formats (drop), SOLITAIRE_TYPE_PEG))
-    return FALSE;
-
-  /* If the image already contains a peg, we cannot accept another one */
-  if (SOLITAIRE_IS_PEG (gtk_image_get_paintable (GTK_IMAGE (image))))
-    return FALSE;
-
-  return TRUE;
-}
-
-static gboolean
-drop_drop (GtkDropTarget *target,
-           const GValue  *value,
-           double         x,
-           double         y,
-           GtkWidget     *image)
-{
-  GtkGrid *grid;
-  SolitairePeg *peg;
-  int image_x, image_y;
-  GtkWidget *jumped;
-
-  grid = GTK_GRID (gtk_widget_get_parent (image));
-  /* The value contains the data in the type we demanded.
-   * We demanded a SolitairePeg, so that's what we get.
-   */
-  peg = g_value_get_object (value);
-
-  /* Make sure this was a legal move. */
-  /* First, figure out the image's position in the grid. */
-  gtk_grid_query_child (grid,
-                        image,
-                        &image_x, &image_y,
-                        NULL, NULL);
-
-  /* If the peg was not moved 2 spaces horizontally or vertically,
-   * this was not a valid jump. Reject it.
-   */
-  if (!((ABS (image_x - peg->x) == 2 && image_y == peg->y) ||
-        (ABS (image_y - peg->y) == 2 && image_x == peg->x)))
-    return FALSE;
-
-  /* Get the widget that was jumped over
-   */
-  jumped = gtk_grid_get_child_at (grid,
-                                  (image_x + peg->x) / 2,
-                                  (image_y + peg->y) / 2);
-  /* If the jumped widget does not have a peg in it, this move
-   * isn't valid.
-   */
-  if (!SOLITAIRE_IS_PEG (gtk_image_get_paintable (GTK_IMAGE (jumped))))
-    return FALSE;
-
-  /* Finally, we know it's a legal move. */
-
-  /* Clear the peg of the jumped-over image */
-  gtk_image_clear (GTK_IMAGE (jumped));
-
-  /* Add the peg to this image */
-  solitaire_peg_set_position (peg, image_x, image_y);
-  gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (peg));
-
-  /* Success! */
-  return TRUE;
-}
-
-GtkWidget *
-do_peg_solitaire (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *header;
-      GtkWidget *restart;
-      GtkWidget *grid;
-      GtkWidget *image;
-      int x, y;
-      GtkDragSource *source;
-      GtkDropTarget *target;
-
-      restart = gtk_button_new_from_icon_name ("view-refresh-symbolic");
-      g_signal_connect (restart, "clicked", G_CALLBACK (restart), NULL);
-
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
-      window = gtk_window_new ();
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (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_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      grid = gtk_grid_new ();
-      gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (grid, GTK_ALIGN_CENTER);
-      gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-      gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-      gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
-      gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
-      gtk_window_set_child (GTK_WINDOW (window), grid);
-
-      for (x = 0; x < 7; x++)
-        {
-          for (y = 0; y < 7; y++)
-            {
-              if ((x < 2 || x >= 5) && (y < 2 || y >= 5))
-                continue;
-
-              image = gtk_image_new ();
-              if (x != 3 || y != 3)
-                {
-                  SolitairePeg *peg = solitaire_peg_new ();
-                  solitaire_peg_set_position (peg, x, y);
-                  gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (peg));
-                }
-
-              gtk_grid_attach (GTK_GRID (grid), image, x, y, 1, 1);
-
-              /* Set up the drag source.
-               * This is rather straightforward: Set the supported actions
-               * (in our case, pegs can only be moved) and connect all the
-               * relevant signals.
-               * And because all drag'n'drop handling is done via event controllers,
-               * we need to add the controller to the widget.
-               */
-              source = gtk_drag_source_new ();
-              gtk_drag_source_set_actions (source, GDK_ACTION_MOVE);
-              g_signal_connect (source, "prepare", G_CALLBACK (drag_prepare), image);
-              g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-              g_signal_connect (source, "drag-end", G_CALLBACK (drag_end), image);
-              gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
-
-              /* Set up the drop target.
-               * This is more involved, because the game logic goes here.
-               */
-
-              /* First we specify the data we accept: pegs.
-               * And we only want moves.
-               */
-              target = gtk_drop_target_new (SOLITAIRE_TYPE_PEG, GDK_ACTION_MOVE);
-              /* Then we connect our signals.
-               */
-              g_signal_connect (target, "accept", G_CALLBACK (drop_accept), image);
-              g_signal_connect (target, "drop", G_CALLBACK (drop_drop), image);
-              /* Finally, like above, we add it to the widget.
-               */
-              gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (target));
-            }
-        }
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -29,7 +29,7 @@ do_pickers (GtkWidget *do_widget)
    gtk_widget_set_margin_bottom (table, 20);
    gtk_grid_set_row_spacing (GTK_GRID (table), 3);
    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
-    gtk_window_set_child (GTK_WINDOW (window), table);
+    gtk_container_add (GTK_CONTAINER (window), table);

    label = gtk_label_new ("Color:");
    gtk_widget_set_halign (label, GTK_ALIGN_START);
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -212,7 +212,7 @@ do_pixbufs (GtkWidget *do_widget)
          gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), back_height);
          gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_func, NULL, NULL);

-          gtk_window_set_child (GTK_WINDOW (window), da);
+          gtk_container_add (GTK_CONTAINER (window), da);

          gtk_widget_add_tick_callback (da, on_tick, NULL, NULL);
        }
--- a/demos/gtk-demo/popover.c
+++ b/demos/gtk-demo/popover.c
@@ -0,0 +1,185 @@
+/* Popovers
+ *
+ * A bubble-like window containing contextual information or options.
+ * GtkPopovers can be attached to any widget, and will be displayed
+ * within the same window, but on top of all its content.
+ */
+
+#include <gtk/gtk.h>
+
+static void
+toggle_changed_cb (GtkToggleButton *button,
+                   GtkWidget       *popover)
+{
+  gtk_widget_set_visible (popover,
+                          gtk_toggle_button_get_active (button));
+}
+
+static GtkWidget *
+create_popover (GtkWidget       *parent,
+                GtkWidget       *child,
+                GtkPositionType  pos)
+{
+  GtkWidget *popover;
+
+  popover = gtk_popover_new ();
+  gtk_widget_set_parent (popover, parent);
+  gtk_popover_set_position (GTK_POPOVER (popover), pos);
+  gtk_container_add (GTK_CONTAINER (popover), child);
+  gtk_widget_set_margin_start (child, 6);
+  gtk_widget_set_margin_end (child, 6);
+  gtk_widget_set_margin_top (child, 6);
+  gtk_widget_set_margin_bottom (child, 6);
+  gtk_widget_show (child);
+
+  return popover;
+}
+
+static GtkWidget *
+create_complex_popover (GtkWidget       *parent,
+                        GtkPositionType  pos)
+{
+  GtkWidget *popover, *window, *content;
+  GtkBuilder *builder;
+
+  builder = gtk_builder_new ();
+  gtk_builder_add_from_resource (builder, "/popover/popover.ui", NULL);
+  window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+  content = gtk_bin_get_child (GTK_BIN (window));
+  g_object_ref (content);
+  gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (content)),
+                        content);
+  gtk_widget_destroy (window);
+  g_object_unref (builder);
+
+  popover = create_popover (parent, content, GTK_POS_BOTTOM);
+  g_object_unref (content);
+
+  return popover;
+}
+
+static void
+entry_size_allocate_cb (GtkEntry *entry,
+                        int       width,
+                        int       height,
+                        int       baseline,
+                        gpointer  user_data)
+{
+  GtkEntryIconPosition popover_pos;
+  GtkPopover *popover = user_data;
+  cairo_rectangle_int_t rect;
+
+  if (gtk_widget_is_visible (GTK_WIDGET (popover)))
+    {
+      popover_pos =
+        GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (entry),
+                                             "popover-icon-pos"));
+      gtk_entry_get_icon_area (entry, popover_pos, &rect);
+      gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+    }
+}
+
+static void
+entry_icon_press_cb (GtkEntry             *entry,
+                     GtkEntryIconPosition  icon_pos,
+                     gpointer              user_data)
+{
+  GtkWidget *popover = user_data;
+  cairo_rectangle_int_t rect;
+
+  gtk_entry_get_icon_area (entry, icon_pos, &rect);
+  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+  gtk_widget_show (popover);
+
+  g_object_set_data (G_OBJECT (entry), "popover-icon-pos",
+                     GUINT_TO_POINTER (icon_pos));
+}
+
+static void
+day_selected_cb (GtkCalendar *calendar,
+                 gpointer     user_data)
+{
+  cairo_rectangle_int_t rect;
+  GtkWidget *popover;
+  GdkEvent *event;
+  gdouble x, y;
+  GtkWidget *widget;
+
+  event = gtk_get_current_event ();
+
+  if (gdk_event_get_event_type (event) != GDK_BUTTON_PRESS)
+    return;
+
+  gdk_event_get_position (event, &x, &y);
+  widget = gtk_native_get_for_surface (gdk_event_get_surface (event));
+  gtk_widget_translate_coordinates (widget,
+                                    GTK_WIDGET (calendar),
+                                    x, y,
+                                    &rect.x, &rect.y);
+  rect.width = rect.height = 1;
+
+  popover = create_popover (GTK_WIDGET (calendar),
+                            gtk_entry_new (),
+                            GTK_POS_BOTTOM);
+  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &rect);
+
+  gtk_widget_show (popover);
+
+  gdk_event_unref (event);
+}
+
+GtkWidget *
+do_popover (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *popover, *box, *widget;
+
+  if (!window)
+    {
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Popovers");
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
+      gtk_widget_set_margin_start (box, 24);
+      gtk_widget_set_margin_end (box, 24);
+      gtk_widget_set_margin_top (box, 24);
+      gtk_widget_set_margin_bottom (box, 24);
+      gtk_container_add (GTK_CONTAINER (window), box);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      widget = gtk_toggle_button_new_with_label ("Button");
+      popover = create_popover (widget,
+                                gtk_label_new ("This popover does not grab input"),
+                                GTK_POS_TOP);
+      gtk_popover_set_autohide (GTK_POPOVER (popover), FALSE);
+      g_signal_connect (widget, "toggled",
+                        G_CALLBACK (toggle_changed_cb), popover);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+
+      widget = gtk_entry_new ();
+      popover = create_complex_popover (widget, GTK_POS_TOP);
+      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget),
+                                         GTK_ENTRY_ICON_PRIMARY, "edit-find");
+      gtk_entry_set_icon_from_icon_name (GTK_ENTRY (widget),
+                                         GTK_ENTRY_ICON_SECONDARY, "edit-clear");
+
+      g_signal_connect (widget, "icon-press",
+                        G_CALLBACK (entry_icon_press_cb), popover);
+      g_signal_connect (widget, "size-allocate",
+                        G_CALLBACK (entry_size_allocate_cb), popover);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+
+      widget = gtk_calendar_new ();
+      g_signal_connect (widget, "day-selected",
+                        G_CALLBACK (day_selected_cb), NULL);
+      gtk_container_add (GTK_CONTAINER (box), widget);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Item 1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 3</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 5</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 6</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 7</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 8</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 9</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Item 10</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkWindow" id="window">
+    <child>
+      <object class="GtkBox" id="box">
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
+        <child>
+          <object class="GtkEntry" id="entry1">
+            <property name="can-focus">1</property>
+            <property name="primary-icon-name">edit-find</property>
+            <property name="secondary-icon-name">edit-clear</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="can-focus">1</property>
+            <property name="shadow-type">in</property>
+            <property name="max-content-height">100</property>
+            <child>
+              <object class="GtkTreeView" id="treeview1">
+                <property name="can-focus">1</property>
+                <property name="vexpand">1</property>
+                <property name="model">liststore1</property>
+                <property name="headers-visible">0</property>
+                <property name="enable-search">0</property>
+                <property name="search-column">2</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection1"/>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="column1">
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderer1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -28,7 +28,9 @@ fancy_shape_renderer (cairo_t        *cr,
               (double) attr->ink_rect.width  / PANGO_SCALE,
               (double) attr->ink_rect.height / PANGO_SCALE);

-  if (GPOINTER_TO_UINT (attr->data) == 0x2665) /* U+2665 BLACK HEART SUIT */
+  switch (GPOINTER_TO_UINT (attr->data))
+    {
+    case 0x2665: /* U+2665 BLACK HEART SUIT */
      {
        cairo_move_to (cr, .5, .0);
        cairo_line_to (cr, .9, -.4);
@@ -36,15 +38,16 @@ fancy_shape_renderer (cairo_t        *cr,
        cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
        cairo_close_path (cr);
      }
+      break;
+    }

-  if (!do_path)
-    {
+  if (!do_path) {
    cairo_set_source_rgb (cr, 1., 0., 0.);
    cairo_fill (cr);
  }
 }

-static PangoAttrList *
+PangoAttrList *
 create_fancy_attr_list_for_layout (PangoLayout *layout)
 {
  PangoAttrList *attrs;
@@ -142,13 +145,13 @@ rotated_text_draw (GtkDrawingArea *da,
  /* Draw the layout N_WORDS times in a circle */
  for (i = 0; i < N_WORDS; i++)
    {
-      int layout_width, layout_height;
+      int width, height;

      /* Inform Pango to re-layout the text with the new transformation matrix */
      pango_cairo_update_layout (cr, layout);

-      pango_layout_get_pixel_size (layout, &layout_width, &layout_height);
-      cairo_move_to (cr, - layout_width / 2, - RADIUS * .9);
+      pango_layout_get_pixel_size (layout, &width, &height);
+      cairo_move_to (cr, - width / 2, - RADIUS * .9);
      pango_cairo_show_layout (cr, layout);

      /* Rotate for the next turn */
@@ -185,12 +188,13 @@ do_rotated_text (GtkWidget *do_widget)

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
-      gtk_window_set_child (GTK_WINDOW (window), box);
+      gtk_container_add (GTK_CONTAINER (window), box);

      /* Add a drawing area */
      drawing_area = gtk_drawing_area_new ();
      gtk_container_add (GTK_CONTAINER (box), drawing_area);
-      gtk_widget_add_css_class (drawing_area, GTK_STYLE_CLASS_VIEW);
+      gtk_style_context_add_class (gtk_widget_get_style_context (drawing_area),
+                                   GTK_STYLE_CLASS_VIEW);

      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
                                      rotated_text_draw,
--- a/demos/gtk-demo/scale.c
+++ b/demos/gtk-demo/scale.c
@@ -1,4 +1,4 @@
-/* Scales
+/* Scale
 *
 * GtkScale is a way to select a value from a range.
 * Scales can have marks to help pick special values,
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -20,7 +20,6 @@
  </object>
  <object class="GtkWindow" id="window1">
    <property name="title" translatable="yes">Scales</property>
-    <property name="resizable">0</property>
    <child>
      <object class="GtkGrid" id="grid1">
        <property name="row-spacing">10</property>
@@ -44,6 +43,7 @@
        </child>
        <child>
          <object class="GtkScale" id="scale_plain">
+            <property name="can-focus">1</property>
            <property name="width-request">200</property>
            <property name="draw-value">0</property>
            <property name="adjustment">adjustment1</property>
@@ -72,6 +72,7 @@
        </child>
        <child>
          <object class="GtkScale" id="scale_marks">
+            <property name="can-focus">1</property>
            <property name="width-request">200</property>
            <property name="draw-value">0</property>
            <property name="adjustment">adjustment2</property>
@@ -107,6 +108,7 @@
        </child>
        <child>
          <object class="GtkScale" id="scale_discrete">
+            <property name="can-focus">1</property>
            <property name="width-request">200</property>
            <property name="round-digits">0</property>
            <property name="draw-value">0</property>
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -185,13 +185,13 @@ text_changed (GObject *object,
              gpointer data)
 {
  GtkEntry *entry = GTK_ENTRY (object);
-  GActionMap *action_map = data;
+  GActionMap *actions = data;
  GAction *action;
  gboolean has_text;

  has_text = gtk_entry_get_text_length (entry) > 0;

-  action = g_action_map_lookup_action (action_map, "clear");
+  action = g_action_map_lookup_action (actions, "clear");
  g_simple_action_set_enabled (G_SIMPLE_ACTION (action), has_text);
 }

@@ -216,18 +216,11 @@ entry_add_to_context_menu (GtkEntry *entry)
  };
  GMenuModel *submenu;
  GMenuItem *item;
-  GAction *action;
-  GVariant *value;

  actions = g_simple_action_group_new ();
  g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS(entries), entry);
  gtk_widget_insert_action_group (GTK_WIDGET (entry), "search", G_ACTION_GROUP (actions));

-  action = g_action_map_lookup_action (G_ACTION_MAP (actions), "search-by");
-  value = g_variant_ref_sink (g_variant_new_string ("name"));
-  set_search_by (G_SIMPLE_ACTION (action), value, entry);
-  g_variant_unref (value);
-
  menu = g_menu_new ();
  item = g_menu_item_new (_("C_lear"), "search.clear");
  g_menu_item_set_attribute (item, "touch-icon", "s", "edit-clear-symbolic");
@@ -269,7 +262,7 @@ do_search_entry (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_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
@@ -304,6 +297,10 @@ do_search_entry (GtkWidget *do_widget)
      gtk_widget_show (cancel_button);

      /* Set up the search icon */
+      GVariant *value = g_variant_ref_sink (g_variant_new_string ("name"));
+      set_search_by (NULL, value, entry);
+      g_variant_unref (value);
+
      gtk_entry_set_icon_activatable (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, TRUE);
      gtk_entry_set_icon_sensitive (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, TRUE);

--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -78,7 +78,7 @@ do_search_entry2 (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      entry = gtk_search_entry_new ();
      container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
@@ -87,7 +87,7 @@ do_search_entry2 (GtkWidget *do_widget)
      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_container_add (GTK_CONTAINER (searchbar), container);
      gtk_container_add (GTK_CONTAINER (vbox), searchbar);

      /* Hook the search bar to key presses */
--- a/demos/gtk-demo/shortcut_triggers.c
+++ b/demos/gtk-demo/shortcut_triggers.c
@@ -1,94 +0,0 @@
-/* Shortcuts
- *
- * GtkShortcut is the abstraction used by GTK to handle shortcuts from
- * keyboard or other input devices.
- *
- * Shortcut triggers can be used to weave complex sequences of key
- * presses into sophisticated mechanisms to activate shortcuts.
- *
- * This demo code shows creative ways to do that.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static gboolean
-shortcut_activated (GtkWidget *widget,
-                    GVariant  *unused,
-                    gpointer   row)
-{
-  g_print ("activated %s\n", gtk_label_get_label (row));
-  return TRUE;
-}
-
-static GtkShortcutTrigger *
-create_ctrl_g (void)
-{
-  return gtk_keyval_trigger_new (GDK_KEY_g, GDK_CONTROL_MASK);
-}
-
-static GtkShortcutTrigger *
-create_x (void)
-{
-  return gtk_keyval_trigger_new (GDK_KEY_x, 0);
-}
-
-struct {
-  const char *description;
-  GtkShortcutTrigger * (* create_trigger_func) (void);
-} shortcuts[] = {
-  { "Press Ctrl-G", create_ctrl_g },
-  { "Press X", create_x },
-};
-
-GtkWidget *
-do_shortcut_triggers (GtkWidget *do_widget)
-{
-  guint i;
-
-  if (!window)
-    {
-      GtkWidget *list;
-      GtkEventController *controller;
-
-      window = gtk_window_new ();
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Shortcuts");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      list = gtk_list_box_new ();
-      gtk_widget_set_margin_top (list, 6);
-      gtk_widget_set_margin_bottom (list, 6);
-      gtk_widget_set_margin_start (list, 6);
-      gtk_widget_set_margin_end (list, 6);
-      gtk_window_set_child (GTK_WINDOW (window), list);
-
-      for (i = 0; i < G_N_ELEMENTS (shortcuts); i++)
-        {
-          GtkShortcut *shortcut;
-          GtkWidget *row;
-
-          row = gtk_label_new (shortcuts[i].description);
-          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);
-          gtk_widget_add_controller (row, controller);
-
-          shortcut = gtk_shortcut_new (shortcuts[i].create_trigger_func(),
-                                       gtk_callback_action_new (shortcut_activated, row, NULL));
-          gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), shortcut);
-        }
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -63,7 +63,7 @@ do_sidebar (GtkWidget *do_widget)
          if (i == 0)
            {
              widget = gtk_image_new_from_icon_name ("org.gtk.Demo4");
-              gtk_widget_add_css_class (widget, "icon-dropshadow");
+              gtk_style_context_add_class (gtk_widget_get_style_context (widget), "icon-dropshadow");
              gtk_image_set_pixel_size (GTK_IMAGE (widget), 256);
            }
          else
@@ -74,7 +74,7 @@ do_sidebar (GtkWidget *do_widget)
          g_object_set (gtk_stack_get_page (GTK_STACK (stack), widget), "title", c, NULL);
        }

-      gtk_window_set_child (GTK_WINDOW (window), box);
+       gtk_container_add (GTK_CONTAINER (window), box);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -112,7 +112,7 @@ do_sizegroup (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_window_set_child (GTK_WINDOW (window), vbox);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
      g_object_set_data_full (G_OBJECT (window), "size-group", size_group, g_object_unref);
@@ -128,7 +128,7 @@ do_sizegroup (GtkWidget *do_widget)
      gtk_widget_set_margin_bottom (table, 5);
      gtk_grid_set_row_spacing (GTK_GRID (table), 5);
      gtk_grid_set_column_spacing (GTK_GRID (table), 10);
-      gtk_frame_set_child (GTK_FRAME (frame), table);
+      gtk_container_add (GTK_CONTAINER (frame), table);

      add_row (GTK_GRID (table), 0, size_group, "_Foreground", color_options);
      add_row (GTK_GRID (table), 1, size_group, "_Background", color_options);
@@ -144,7 +144,7 @@ do_sizegroup (GtkWidget *do_widget)
      gtk_widget_set_margin_bottom (table, 5);
      gtk_grid_set_row_spacing (GTK_GRID (table), 5);
      gtk_grid_set_column_spacing (GTK_GRID (table), 10);
-      gtk_frame_set_child (GTK_FRAME (frame), table);
+      gtk_container_add (GTK_CONTAINER (frame), table);

      add_row (GTK_GRID (table), 0, size_group, "_Dashing", dash_options);
      add_row (GTK_GRID (table), 1, size_group, "_Line ends", end_options);
--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -160,13 +160,47 @@ check_solved (GtkWidget *grid)
 }

 static gboolean
-puzzle_key_pressed (GtkWidget *grid,
-                    GVariant  *args,
-                    gpointer   unused)
+puzzle_key_pressed (GtkEventControllerKey *controller,
+                    guint                  keyval,
+                    guint                  keycode,
+                    GdkModifierType        state,
+                    GtkWidget             *grid)
 {
  int dx, dy;

-  g_variant_get (args, "(ii)", &dx, &dy);
+  dx = 0;
+  dy = 0;
+
+  switch (keyval)
+    {
+    case GDK_KEY_KP_Left:
+    case GDK_KEY_Left:
+      /* left */
+      dx = -1;
+      break;
+
+    case GDK_KEY_KP_Up:
+    case GDK_KEY_Up:
+      /* up */
+      dy = -1;
+      break;
+
+    case GDK_KEY_KP_Right:
+    case GDK_KEY_Right:
+      /* right */
+      dx = 1;
+      break;
+
+    case GDK_KEY_KP_Down:
+    case GDK_KEY_Down:
+      /* down */
+      dy = 1;
+      break;
+
+    default:
+      /* We return FALSE here because we didn't handle the key that was pressed */
+      return FALSE;
+    }

  if (!move_puzzle (grid, dx, dy))
    {
@@ -243,55 +277,33 @@ puzzle_button_pressed (GtkGestureClick *gesture,
 }

 static void
-add_move_binding (GtkShortcutController *controller,
-                  guint                  keyval,
-                  guint                  kp_keyval,
-                  int                    dx,
-                  int                    dy)
-{
-  GtkShortcut *shortcut;
-
-  shortcut = gtk_shortcut_new_with_arguments (
-                 gtk_alternative_trigger_new (gtk_keyval_trigger_new (keyval, 0),
-                                              gtk_keyval_trigger_new (kp_keyval, 0)),
-                 gtk_callback_action_new (puzzle_key_pressed, NULL, NULL),
-                 "(ii)", dx, dy);
-  gtk_shortcut_controller_add_shortcut (controller, shortcut);
-}
-
-static void
-start_puzzle (GdkPaintable *paintable)
+start_puzzle (GdkPaintable *puzzle)
 {
  GtkWidget *picture, *grid;
  GtkEventController *controller;
  guint x, y;
  float aspect_ratio;

+  /* Remove the old grid (if there is one) */
+  grid = gtk_bin_get_child (GTK_BIN (frame));
+  if (grid)
+    gtk_container_remove (GTK_CONTAINER (frame), grid);
+
  /* Create a new grid */
  grid = gtk_grid_new ();
  gtk_widget_set_can_focus (grid, TRUE);
-  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (frame), grid);
-  aspect_ratio = gdk_paintable_get_intrinsic_aspect_ratio (paintable);
+  gtk_container_add (GTK_CONTAINER (frame), grid);
+  aspect_ratio = gdk_paintable_get_intrinsic_aspect_ratio (puzzle);
  if (aspect_ratio == 0.0)
    aspect_ratio = 1.0;
-  gtk_aspect_frame_set_ratio (GTK_ASPECT_FRAME (frame), aspect_ratio);
-  gtk_aspect_frame_set_obey_child (GTK_ASPECT_FRAME (frame), FALSE);
+  gtk_aspect_frame_set (GTK_ASPECT_FRAME (frame), 0.5, 0.5, aspect_ratio, FALSE);

-  /* Add shortcuts so people can use the arrow
+  /* Add a key event controller so people can use the arrow
   * keys to move the puzzle */
-  controller = gtk_shortcut_controller_new ();
-  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
-                    GDK_KEY_Left, GDK_KEY_KP_Left,
-                    -1, 0);
-  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
-                    GDK_KEY_Right, GDK_KEY_KP_Right,
-                    1, 0);
-  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
-                    GDK_KEY_Up, GDK_KEY_KP_Up,
-                    0, -1);
-  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
-                    GDK_KEY_Down, GDK_KEY_KP_Down,
-                    0, 1);
+  controller = gtk_event_controller_key_new ();
+  g_signal_connect (controller, "key-pressed",
+                    G_CALLBACK (puzzle_key_pressed),
+                    grid);
  gtk_widget_add_controller (GTK_WIDGET (grid), controller);

  controller = GTK_EVENT_CONTROLLER (gtk_gesture_click_new ());
@@ -320,7 +332,7 @@ start_puzzle (GdkPaintable *paintable)
          if (x == pos_x && y == pos_y)
            piece = NULL;
          else
-            piece = gtk_puzzle_piece_new (paintable,
+            piece = gtk_puzzle_piece_new (puzzle,
                                          x, y,
                                          width, height);
          picture = gtk_picture_new_for_paintable (piece);
@@ -340,7 +352,7 @@ reshuffle (void)
 {
  GtkWidget *grid;

-  grid = gtk_aspect_frame_get_child (GTK_ASPECT_FRAME (frame));
+  grid = gtk_bin_get_child (GTK_BIN (frame));
  if (solved)
    start_puzzle (puzzle);
  else
@@ -367,19 +379,18 @@ reconfigure (void)
      child = selected->data;
      g_list_free (selected);
    }
-
-  image = gtk_flow_box_child_get_child (GTK_FLOW_BOX_CHILD (child));
+  image = gtk_bin_get_child (GTK_BIN (child));
  puzzle = gtk_image_get_paintable (GTK_IMAGE (image));

  start_puzzle (puzzle); 
  popover = gtk_widget_get_ancestor (size_spin, GTK_TYPE_POPOVER);
  gtk_popover_popdown (GTK_POPOVER (popover));
-  grid = gtk_aspect_frame_get_child (GTK_ASPECT_FRAME (frame));
+  grid = gtk_bin_get_child (GTK_BIN (frame));
  gtk_widget_grab_focus (grid);
 }

 static void
-add_choice (GtkWidget    *container,
+add_choice (GtkWidget    *choices,
            GdkPaintable *paintable)
 {
  GtkWidget *icon;
@@ -387,7 +398,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_container_add (GTK_CONTAINER (container), icon);
+  gtk_container_add (GTK_CONTAINER (choices), icon);
 }

 GtkWidget *
@@ -416,7 +427,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
      gtk_widget_set_margin_bottom (tweaks, 10);

      choices = gtk_flow_box_new ();
-      gtk_widget_add_css_class (choices, GTK_STYLE_CLASS_VIEW);
+      gtk_style_context_add_class (gtk_widget_get_style_context (choices), GTK_STYLE_CLASS_VIEW);
      add_choice (choices, puzzle);
      add_choice (choices, gtk_nuclear_animation_new ());
      media = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
@@ -425,7 +436,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
      gtk_media_stream_play (media);
      add_choice (choices, GDK_PAINTABLE (media));
      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), choices);
+      gtk_container_add (GTK_CONTAINER (sw), choices);
      gtk_grid_attach (GTK_GRID (tweaks), sw, 0, 0, 2, 1);

      label = gtk_label_new ("Size");
@@ -441,7 +452,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
      g_signal_connect (apply, "clicked", G_CALLBACK (reconfigure), NULL);

      popover = gtk_popover_new ();
-      gtk_popover_set_child (GTK_POPOVER (popover), tweaks);
+      gtk_container_add (GTK_CONTAINER (popover), tweaks);

      tweak = gtk_menu_button_new ();
      gtk_menu_button_set_popover (GTK_MENU_BUTTON (tweak), popover);
@@ -463,8 +474,8 @@ do_sliding_puzzle (GtkWidget *do_widget)
      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);
+      frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, (float) gdk_paintable_get_intrinsic_aspect_ratio (puzzle), FALSE);
+      gtk_container_add (GTK_CONTAINER (window), frame);

      start_puzzle (puzzle);
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	c3ccb68da8	Rename gdk_surface_input_shape_combine_region There is no shape combining going on anymore, so call this just gdk_surface_set_input_region, and remove the offset arguments too. All callers pass 0 anyway. Update all callers.	2020-03-01 11:32:24 -08:00
Matthias Clasen	7f0c0cc52d	surface: Drop more toplevel api The wm decorations and functions have been moved to GdkToplevelLayout.	2020-03-01 11:32:24 -08:00
Matthias Clasen	40d2e8cfdf	docs: Stop using gdk_surface_get_decorations	2020-03-01 11:32:24 -08:00
Matthias Clasen	92030880d4	testgtk: Stop using gdk_surface_set_decorations	2020-03-01 11:32:24 -08:00
Matthias Clasen	e6ee71e220	window: Stop using gdk_surface_set_decorations And gdk_surface_set_functions. Instead, use the toplevel layout functionality.	2020-03-01 11:32:24 -08:00
Matthias Clasen	423d4f4a8a	surface: Use toplevel functions and decorations	2020-03-01 11:20:21 -08:00
Matthias Clasen	3079789719	Add wm functions and decorations to GdkToplevelLayout	2020-03-01 11:19:57 -08:00
Matthias Clasen	7e611569e3	window: Use toplevel api to show window menu	2020-03-01 11:04:58 -08:00
Matthias Clasen	ab103da680	surface: Implement new toplevel api	2020-03-01 11:03:50 -08:00
Matthias Clasen	f22310e8a9	toplevel: Add more api	2020-03-01 11:03:42 -08:00
Matthias Clasen	0bd98d13c3	surface: Drop more toplevel api	2020-03-01 10:44:12 -08:00
Matthias Clasen	60c39d7c03	window: Stop using gdk_surface_minimize etc	2020-03-01 10:43:55 -08:00
Matthias Clasen	6c974d5e54	surface: Implement new toplevel layout features	2020-03-01 10:29:10 -08:00
Matthias Clasen	2101f13694	Add more things to GdkToplevelLayout	2020-03-01 10:24:35 -08:00
Matthias Clasen	eed360200a	surface: Drop fullscreen api The fullscreen mode api is still kept internally, since it is used in the x11 backend. This needs some more untangling.	2020-03-01 10:14:08 -08:00
Matthias Clasen	dc365f9c4c	tests: Stop using gdk_surface_fullscreen	2020-03-01 10:10:39 -08:00
Matthias Clasen	71ec829c95	surface: Drop more toplevel api	2020-03-01 12:42:56 -05:00
Matthias Clasen	59e5e0180f	window: Use GdkToplevel for more things	2020-03-01 12:42:56 -05:00
Matthias Clasen	157ebf42cd	testgtk: Stop using gdk_surface_set_icon_name Its not useful api, and will disappear.	2020-03-01 12:42:56 -05:00
Matthias Clasen	bdfc6a0812	wayland: Stop using gdk_surface_set_title Directly call the backend function for this, and for gdk_surface_set_transient_for.	2020-03-01 12:42:56 -05:00
Matthias Clasen	9b20973f12	x11: Stop using gdk_surface_set_title	2020-03-01 12:42:56 -05:00
Matthias Clasen	8aba6f43e3	surface: Implement more toplevel interface	2020-03-01 12:42:56 -05:00
Matthias Clasen	a537ddc841	toplevel: Move more toplevel api over	2020-03-01 12:42:56 -05:00
Matthias Clasen	b6658358f4	Drop gdk_surface_get_state You can now use gdk_toplevel_get_state instead.	2020-03-01 12:42:56 -05:00
Matthias Clasen	f9aaace60b	testgtk: Stop using gdk_surface_get_state	2020-03-01 12:42:56 -05:00
Matthias Clasen	78435e4628	demo: stop using gdk_surface_get_state	2020-03-01 12:37:22 -05:00
Matthias Clasen	e4856e27a4	a11y: Stop using gdk_surface_get_state	2020-03-01 12:37:22 -05:00
Matthias Clasen	7d96a5272c	x11: Stop using gdk_surface_get_state All the surfaces we are dealing with here are toplevels.	2020-03-01 12:37:22 -05:00
Matthias Clasen	2e30389a9a	gtk: use toplevel state getter	2020-03-01 12:37:22 -05:00
Matthias Clasen	2bb1021df0	surface: implement toplevel state getter	2020-02-29 20:31:45 -05:00
Matthias Clasen	457ae1154d	toplevel: add state getter	2020-02-29 20:31:31 -05:00
Matthias Clasen	6259735758	Drop more redundant api	2020-02-29 13:33:43 -05:00
Matthias Clasen	134f3fb0de	Drop redundant toplevel api The toplevel functionality to keep is moving to GdkToplevel, and unused functions can go.	2020-02-29 13:33:43 -05:00
Matthias Clasen	c3b91572ff	window: Use GdkToplevel	2020-02-29 13:33:43 -05:00
Matthias Clasen	c82877d777	surface: Implement GdkToplevel This is not quite right, and only temporary, since it makes GDK_IS_TOPLEVEL (surface) true for every surface. Eventually, the implementation will be moved to the backends.	2020-02-29 13:33:43 -05:00
Matthias Clasen	3546efdf0f	Introduce GdkToplevel This is a new interface for toplevel surfaces.	2020-02-29 13:33:43 -05:00
Matthias Clasen	c9e39f6a82	Introduce GdkToplevelLayout This will be used in a new GdkTopleve interface in the near future.	2020-02-29 13:33:43 -05:00
Matthias Clasen	ab3f08bad9	x11: Stop using gdk_surface_maximize Just use the backend function directly.	2020-02-29 13:33:43 -05:00
Matthias Clasen	33b0413cee	x11: Stop using gdk_surface_set_geometry_hints Just use the backend function directly.	2020-02-29 13:33:43 -05:00
Matthias Clasen	da6498b2e8	wayland: Stop using gdk_surface_set_geometry_hints Just use the backend function directly.	2020-02-29 13:33:43 -05:00
Matthias Clasen	a353254ad4	inspector: Stop raising and lowering windows We should always be composited, so this should not matter in practice.	2020-02-29 13:33:43 -05:00
Matthias Clasen	77f891037e	x11: Stop using gdk_surface_raise Avoid a vfunc roundtrip and just use the backend implementation directly.	2020-02-29 13:33:43 -05:00
Matthias Clasen	090ce0ad3b	broadway: Stop using gdk_surface_raise We don't implement this anyway. Add a shortcut to the backend function in case we ever do.	2020-02-29 13:33:43 -05:00
Matthias Clasen	903840e507	x11: Stop abusing type hints for dnd Nothing in GDK depends on this being set, so just don't do it.	2020-02-29 13:33:43 -05:00
Matthias Clasen	97f8e9fea0	wayland: Stop abusing type hints Instead of misusing window type hints, introduce a private flag for drag surfaces.	2020-02-29 13:33:43 -05:00
Matthias Clasen	85bd0d601d	surface: Drop redundant popup api Now that we have the GdkPopup interface, these functions are no longer needed.	2020-02-29 13:33:43 -05:00
Matthias Clasen	fef15aec4e	tooltip: Use GdkPopup	2020-02-29 13:33:43 -05:00
Matthias Clasen	bb74a85e1b	popover: Use GdkPopup	2020-02-29 13:33:43 -05:00
Matthias Clasen	fb34e9146a	surface: Implement GdkPopup This is not quite right, and only temporary, since it makes GDK_IS_POPUP (surface) true for every surface. Eventually, the implementation will be moved to the backends.	2020-02-29 13:33:43 -05:00
Matthias Clasen	25d19298c9	Introduce GdkPopup This is a new interface for popup surfaces.	2020-02-29 13:33:43 -05:00
Matthias Clasen	726a3abc14	Move GdkSurface autocleanup declaration We need this available after including gdksurface.h.	2020-02-29 13:33:43 -05:00
Matthias Clasen	0b73150a5b	wayland: Stop calling frontend surface api This is an unnecessary vfunc roundtrip, and the frontend api is going away shortly.	2020-02-29 11:37:00 -05:00
Matthias Clasen	bc6d403a9a	Simplify surface move/drag api Drop the with_device variants, and always pass a device.	2020-02-29 11:37:00 -05:00
Matthias Clasen	1d39481c1c	Drop gtk_window_begin_move/resize_drag These are just simple wrappers around GdkSurface api, and we don't need them.	2020-02-29 11:37:00 -05:00