wip: Add a bin with slack

Just an experiment: Make a bin that adds 'slack' around its child, and avoids resizing unless the child size changes more than the slack allows.
gsk: Document blend modes
2020-05-18 21:18:36 -04:00 · 2020-05-18 18:21:39 -04:00 · 2020-05-18 16:38:11 -04:00 · 2020-05-18 16:38:11 -04:00 · 2020-05-18 16:46:12 +00:00 · 2020-05-18 11:31:42 -04:00
1539 changed files with 133572 additions and 118987 deletions
@@ -1,8 +1,9 @@
 stages:
-  - style-check
  - build
-  - deploy
+  - analysis
+  - docs
  - flatpak
+  - deploy

 .cache-paths: &cache-paths
  paths:
@@ -26,14 +27,41 @@ variables:

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

+.build-fedora-default:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
+  artifacts:
+    when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report-x11.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
+        - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
+    name: "gtk-${CI_COMMIT_REF_NAME}"
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
+      - "${CI_PROJECT_DIR}/_build/report*.xml"
+      - "${CI_PROJECT_DIR}/_build/report*.html"
+      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
+      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
+      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
+  cache:
+    key: "$CI_JOB_NAME"
+    paths:
+      - _ccache/
+      - subprojects/gdk-pixbuf/
+      - subprojects/glib/
+      - subprojects/graphene/
+      - subprojects/libepoxy/
+      - subprojects/pango/
+
 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v13
+  extends: .build-fedora-default
  stage: build
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
@@ -46,26 +74,12 @@ fedora-x86_64:
            -Dprofiler=true
            _build
    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report.xml"
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report.xml"
-      - "${CI_PROJECT_DIR}/_build/report.html"
-      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*.syscap"
-  cache:
-    key: "$CI_JOB_NAME"
-    <<: *cache-paths
+    - .gitlab-ci/run-tests.sh _build x11
+    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build broadway

 release-build:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v13
+  extends: .build-fedora-default
  stage: build
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
@@ -77,42 +91,32 @@ release-build:
            -Dvulkan=yes
            _build
    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report.xml"
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report.xml"
-      - "${CI_PROJECT_DIR}/_build/report.html"
-      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*.syscap"
-  cache:
-    key: "$CI_JOB_NAME"
-    <<: *cache-paths
+    - .gitlab-ci/run-tests.sh _build x11

-.mingw-defaults: &mingw-defaults
+.mingw-defaults:
  stage: build
  tags:
-    - win32
+    - win32-ps
  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%"
-    <<: *cache-paths
+    key: "$CI_JOB_NAME"
+    paths:
+      - _ccache/
+      - subprojects/gdk-pixbuf/
+      - subprojects/glib/
+      - subprojects/graphene/
+      - subprojects/libepoxy/
+      - subprojects/pango/

 msys2-mingw32:
+  extends: .mingw-defaults
  variables:
    MSYSTEM: "MINGW32"
    CHERE_INVOKING: "yes"
-  <<: *mingw-defaults

-.flatpak-defaults: &flatpak-defaults
+.flatpak-defaults:
  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
  stage: flatpak
  allow_failure: true
@@ -126,58 +130,79 @@ msys2-mingw32:
    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"

 # Manual jobs, for branches and MRs
-.flatpak-manual: &flatpak-manual
-  <<: *flatpak-defaults
+.flatpak-manual:
+  extends: .flatpak-defaults
  when: manual

 # Only build Flatpak bundles automatically on master
-.flatpak-master: &flatpak-master
-  <<: *flatpak-defaults
+.flatpak-master:
+  extends: .flatpak-defaults
  only:
    - master

 flatpak-manual:demo:
+  extends: .flatpak-manual
  variables:
    APPID: org.gtk.Demo4
-  <<: *flatpak-manual

 flatpak-master:demo:
+  extends: .flatpak-master
  variables:
    APPID: org.gtk.Demo4
-  <<: *flatpak-master

 flatpak-manual:widget-factory:
+  extends: .flatpak-manual
  variables:
    APPID: org.gtk.WidgetFactory4
-  <<: *flatpak-manual

 flatpak-master:widget-factory:
+  extends: .flatpak-master
  variables:
    APPID: org.gtk.WidgetFactory4
-  <<: *flatpak-master

 flatpak-manual:icon-browser:
+  extends: .flatpak-manual
  variables:
    APPID: org.gtk.IconBrowser4
-  <<: *flatpak-manual

 flatpak-master:icon-browser:
+  extends: .flatpak-master
  variables:
    APPID: org.gtk.IconBrowser4
-  <<: *flatpak-master

-pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v13
-  stage: deploy
+static-scan:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  stage: analysis
+  variables:
+    EXTRA_MESON_FLAGS: "--buildtype=debug"
+  script:
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _scan_build
+    - ninja -C _scan_build scan-build
+  artifacts:
+    paths:
+      - _scan_build/meson-logs
+  allow_failure: true
+
+reference:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  stage: docs
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
-    - meson ${COMMON_MESON_FLAGS} -Dgtk_doc=true _build
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true _build
    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-    - mkdir -p public/
-    - mv _build/docs/reference/gdk/html/ public/gdk/
-    - mv _build/docs/reference/gsk/html/ public/gsk/
-    - mv _build/docs/reference/gtk/html/ public/gtk/
+    - mkdir -p _reference/
+    - mv _build/docs/reference/gdk/html/ _reference/gdk/
+    - mv _build/docs/reference/gsk/html/ _reference/gsk/
+    - mv _build/docs/reference/gtk/html/ _reference/gtk/
+  artifacts:
+    paths:
+      - _reference
+
+pages:
+  stage: deploy
+  script:
+    - mv _reference/ public/
  artifacts:
    paths:
      - public
@@ -9,9 +9,11 @@ RUN dnf -y install \
    cairo-gobject-devel \
    ccache \
    clang \
+    clang-analyzer \
    colord-devel \
    cups-devel \
    dbus-daemon \
+    dbus-x11 \
    dejavu-sans-mono-fonts \
    desktop-file-utils \
    diffutils \
@@ -76,11 +78,13 @@ RUN dnf -y install \
    vulkan-devel \
    wayland-devel \
    wayland-protocols-devel \
+    weston \
+    weston-libs \
    which \
    xorg-x11-server-Xvfb \
 && dnf clean all

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

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
@@ -138,12 +138,13 @@ ul.images li {
 </head>
 <body>
  <header>
-    <h1>{{ report.project_name }}/{{ report.branch_name }} :: Test Reports</h1>
+    <h1>{{ report.project_name }}/{{ report.backend }}/{{ report.branch_name }} :: Test Reports</h1>
  </header>

  <article>
    <section>
      <div class="report-meta">
+        <p><strong>Backend:</strong> {{ report.backend }}</p>
        <p><strong>Branch:</strong> {{ report.branch_name }}</p>
        <p><strong>Date:</strong> <time datetime="{{ report.date.isoformat() }}">{{ report.locale_date }}</time></p>
        {% if report.job_id %}<p><strong>Job ID:</strong> {{ report.job_id }}</p>{% endif %}
@@ -174,7 +175,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 [ 'FAIL', 'UNEXPECTEDPASS' ] %}
+            {% for failure in suite_result.failures if failure.result in [ 'ERROR', '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,24 +208,6 @@ 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' %}
@@ -244,6 +227,24 @@ 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>
@@ -259,6 +260,9 @@ aparser = argparse.ArgumentParser(description='Turns a Meson test log into an HT
 aparser.add_argument('--project-name', metavar='NAME',
                     help='The project name',
                     default='Unknown')
+aparser.add_argument('--backend', metavar='NAME',
+                     help='The used backend',
+                     default='unknown')
 aparser.add_argument('--job-id', metavar='ID',
                     help='The job ID for the report',
                     default=None)
@@ -319,6 +323,7 @@ report = {}
 report['date'] = datetime.datetime.utcnow()
 report['locale_date'] = report['date'].strftime("%c")
 report['project_name'] = args.project_name
+report['backend'] = args.backend
 report['job_id'] = args.job_id
 report['branch_name'] = args.branch
 report['total_successes'] = 0
@@ -331,7 +336,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']:
+        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT', 'ERROR',]:
            return True
        return False

@@ -19,6 +19,9 @@ aparser = argparse.ArgumentParser(description='Turns a Meson test log into a JUn
 aparser.add_argument('--project-name', metavar='NAME',
                     help='The project name',
                     default='unknown')
+aparser.add_argument('--backend', metavar='NAME',
+                     help='The used backend',
+                     default='unknown')
 aparser.add_argument('--job-id', metavar='ID',
                     help='The job ID for the report',
                     default='Unknown')
@@ -70,7 +73,7 @@ for name, units in suites.items():
    print('Processing suite {} (units: {})'.format(name, len(units)))

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

@@ -92,18 +95,18 @@ for name, units in suites.items():
    for unit in successes:
        testcase = ET.SubElement(testsuite, 'testcase')
        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', unit['name'])
+        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
        testcase.set('time', str(unit['duration']))

    for unit in failures:
        testcase = ET.SubElement(testsuite, 'testcase')
        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', unit['name'])
+        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
        testcase.set('time', str(unit['duration']))

        failure = ET.SubElement(testcase, 'failure')
        failure.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        failure.set('name', unit['name'])
+        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
        failure.set('type', 'error')
        failure.text = unit['stdout']

@@ -81,24 +81,29 @@ fi

 if [ -z $base_version ]; then
        base_version="latest"
-else
+elif [ $base_version != "latest" ]; then
        base_version="v$base_version"
 fi

-TAG="registry.gitlab.gnome.org/gnome/gtk/${base}:${base_version}"
+if [ ! -x "$(command -v docker)" ] || [ docker --help |& grep -q podman ]; then
+        # Docker is actually implemented by podman, and its OCI output
+        # is incompatible with some of the dockerd instances on GitLab
+        # CI runners.
+        echo "Using: Podman"
+        format="--format docker"
+        CMD="podman"
+else
+        echo "Using: Docker"
+        format=""
+        CMD="sudo docker"
+fi
+
+REGISTRY="registry.gitlab.gnome.org"
+TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"

 if [ $build == 1 ]; then
-        if docker --help |& grep -q podman; then
-                # Docker is actually implemented by podman, and its OCI output
-                # is incompatible with some of the dockerd instances on GitLab
-                # CI runners.
-                format="--format docker"
-        else
-                format=""
-        fi
-
        echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        sudo docker build \
+        ${CMD} build \
                ${format} \
                --build-arg HOST_USER_ID="$UID" \
                --tag "${TAG}" \
@@ -110,16 +115,16 @@ if [ $push == 1 ]; then
        echo -e "\e[1;32mPUSHING\e[0m: ${base} as ${TAG}"

        if [ $no_login == 0 ]; then
-                sudo docker login registry.gitlab.gnome.org
+                ${CMD} login ${REGISTRY}
        fi

-        sudo docker push $TAG
+        ${CMD} push ${TAG}
        exit $?
 fi

 if [ $run == 1 ]; then
        echo -e "\e[1;32mRUNNING\e[0m: ${base} as ${TAG}"
-        sudo docker run \
+        ${CMD} run \
                --rm \
                --volume "$(pwd)/..:/home/user/app" \
                --workdir "/home/user/app" \
@@ -1,6 +1,6 @@
 #!/bin/bash

-set +e
+set -e

 # We need to add a new remote for the upstream master, since this script could
 # be running in a personal fork of the repository which has out of date branches.
@@ -13,8 +13,9 @@ git fetch upstream
 #
 # `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
 # a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
-newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}) <(git rev-list --first-parent HEAD) | head -1)
+newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent HEAD) | head -1)
 git diff -U0 --no-color "${newest_common_ancestor_sha}" | .gitlab-ci/clang-format-diff.py -binary "clang-format" -p1
+exit_status=$?

 # The style check is not infallible. The clang-format configuration cannot
 # perfectly describe GTK’s coding style: in particular, it cannot align
@@ -32,3 +33,5 @@ echo "   https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
 echo "Warnings from this tool can be ignored in favour of the documented "
 echo "coding style, or in favour of matching the style of existing"
 echo "surrounding code."
+
+exit ${exit_status}
@@ -5,30 +5,75 @@ set +e

 srcdir=$( pwd )
 builddir=$1
+backend=$2

-export GDK_BACKEND=x11
-xvfb-run -a -s "-screen 0 1024x768x24" \
-        meson test -C ${builddir} \
+case "${backend}" in
+  x11)
+    xvfb-run -a -s "-screen 0 1024x768x24" \
+          meson test -C ${builddir} \
                --print-errorlogs \
+                --setup=${backend} \
                --suite=gtk \
-                --no-suite=gtk:a11y
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-broadway

-# Store the exit code for the CI run, but always
-# generate the reports
-exit_code=$?
+    # Store the exit code for the CI run, but always
+    # generate the reports
+    exit_code=$?
+    ;;
+
+  wayland)
+    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+    weston --backend=headless-backend.so --socket=wayland-5 &
+    compositor=$!
+    export WAYLAND_DISPLAY=wayland-5
+
+    meson test -C ${builddir} \
+                --print-errorlogs \
+                --setup=${backend} \
+                --suite=gtk \
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-broadway
+
+    exit_code=$?
+    kill ${compositor}
+    ;;
+
+  broadway)
+    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+    ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
+    server=$!
+    export BROADWAY_DISPLAY=:5
+
+    meson test -C ${builddir} \
+                --print-errorlogs \
+                --setup=${backend} \
+                --suite=gtk \
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-opengl
+
+    # don't let Broadway failures fail the run, for now
+    exit_code=0
+    kill ${server}
+    ;;
+esac

 cd ${builddir}

 $srcdir/.gitlab-ci/meson-junit-report.py \
        --project-name=gtk \
+        --backend=${backend} \
        --job-id="${CI_JOB_NAME}" \
-        --output=report.xml \
-        meson-logs/testlog.json
+        --output=report-${backend}.xml \
+        meson-logs/testlog-${backend}.json
 $srcdir/.gitlab-ci/meson-html-report.py \
        --project-name=gtk \
+        --backend=${backend} \
        --job-id="${CI_JOB_NAME}" \
-        --reftest-output-dir="testsuite/reftests/output" \
-        --output=report.html \
-        meson-logs/testlog.json
+        --reftest-output-dir="testsuite/reftests/output/${backend}" \
+        --output=report-${backend}.html \
+        meson-logs/testlog-${backend}.json

 exit $exit_code
@@ -34,9 +34,12 @@ 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/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-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
 pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"

+# https://github.com/msys2/MINGW-packages/pull/6465
+pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli
+
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
@@ -45,11 +48,14 @@ 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
@@ -22,12 +22,7 @@ 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](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
+ - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)

 You can also look at the GTK tag on [Stack
 Overflow](https://stackoverflow.com/questions/tagged/gtk).
@@ -1,3 +1,257 @@
+Overview of Changes in GTK 3.98.4
+=================================
+
+* Themes
+ - Refine menu styling
+ - Tweak visible focus behavior
+ - HighConstrast: Add public colors
+ - HighContrast: Fix scale borders
+
+* CSS:
+ - Drop the nonstandard -gtk-icon-theme property
+ - Add a system_setting_changed vfunc to propagate global changes
+
+* Untangle titlebars from windows:
+ - Add a GtkWindowControls widget
+ - Add a GtkWindowHandle widget
+ - Add actions for window menu items
+ - Remove app menu fallback from GtkHeaderBar
+ - Remove title and subtitle properties from GtkHeaderBar,
+   rename custom-title to title-widget
+
+* GtkWidget
+ - Add a focusable property
+
+* GtkPopover:
+ -  Fix (re-)positioning issues
+
+* GtkStack:
+ - Drop the homogeneous property
+ - Add a use-underline property to stack pages
+
+* GtkScale:
+ - Make area around the trough clickable
+
+* GtkScrolledWindow:
+ - Fix kinetic scrolling
+
+* GtkTreeView:
+ - Break reference cycles in unroot
+
+* Drop GtkBin and GtkContainer. All existing GtkBin subclasses
+  have grown a child property with setter and getter. All
+  existing GtkContainer subclasses have grown widget-specific
+  remove (and in some cases, add) functions. <child> in ui
+  files continues to work as before
+
+* Replace gtk_widget_destroy by gtk_window_destroy
+
+* Drop the ::size-allocate signal. Use a GtkWidgetPaintable
+  if you need to be informed about changes to a widgets
+  content or size
+
+* Remove gtk_dialog_run
+
+* GDK:
+ - Wayland: Provide a builtin cursor of last resort
+ - Change the monitor api to use a GListModel
+
+* GSK:
+ - Don't include renderer-specific headers automatically
+ - GL: Fix nested rounded clips
+
+* Introspection:
+ - Assorted annotation fixes
+
+* Inspector:
+ - Preview media resources
+ - Show media backend information
+
+* gtk4-widget-factory:
+ - Add GtkVideo
+ - Add text styles
+ - Add a print dialog
+ - Add a password entry
+ - Improve toolbar styling
+ - Revamp transition effects
+
+* gtk4-demo:
+ - Replace some demos
+
+* Translation updates:
+ Chinese (Taiwan)
+ Esperanto
+ Japanese
+ Romanian
+ Spanish
+ Ukrainian
+
+
+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
 =================================

@@ -27,9 +27,9 @@ The official developers blog

  - https://blog.gtk.org

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

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

 Nightly documentation can be found at
  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
@@ -140,6 +140,12 @@ 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
 -------------

@@ -156,4 +162,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` file for further information.
+Please, see the [`COPYING`](./COPYING) file for further information.
@@ -146,9 +146,6 @@
 /* Have the Xcursor library */
 #mesondefine HAVE_XCURSOR

-/* Have the XDAMAGE X extension */
-#mesondefine HAVE_XDAMAGE
-
 /* Have the XFIXES X extension */
 #mesondefine HAVE_XFIXES

@@ -308,17 +308,17 @@ save_response_cb (GtkNativeDialog        *dialog,
                               &error);
      if (error != NULL)
        {
-          GtkWidget *dialog;
+          GtkWidget *message_dialog;

-          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 (dialog),
+          message_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),
                                                    "%s", error->message);
-          g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
-          gtk_widget_show (dialog);
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+          gtk_widget_show (message_dialog);
          g_error_free (error);
        }

@@ -403,7 +403,7 @@ constraint_editor_done (ConstraintEditor *editor,

  g_clear_object (&old_constraint);

-  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
+  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
 }

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

  editor = constraint_editor_new (model, constraint);

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

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

@@ -444,7 +444,7 @@ guide_editor_done (GuideEditor            *editor,
                   GtkConstraintGuide     *guide,
                   ConstraintEditorWindow *win)
 {
-  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
+  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
 }

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

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

  g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
  gtk_widget_show (window);
@@ -601,30 +601,33 @@ create_widget_func (gpointer item,
    g_object_bind_property (item, "name",
                            label, "label",
                            G_BINDING_DEFAULT);
-  g_object_set (label, "margin", 10, NULL);
+  gtk_widget_set_margin_start (label, 10);
+  gtk_widget_set_margin_end (label, 10);
+  gtk_widget_set_margin_top (label, 10);
+  gtk_widget_set_margin_bottom (label, 10);
  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
  gtk_widget_set_hexpand (label, TRUE);
-  gtk_container_add (GTK_CONTAINER (row), box);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
+  gtk_box_append (GTK_BOX (box), label);

  if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
    {
      button = gtk_button_new_from_icon_name ("document-edit-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
      g_object_set_data (G_OBJECT (row), "edit", button);
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_box_append (GTK_BOX (box), button);
      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_box_append (GTK_BOX (box), button);
    }
  else if (GTK_IS_WIDGET (item))
    {
      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_box_append (GTK_BOX (box), button);
    }

  g_free (freeme);
@@ -9,7 +9,6 @@
    <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">
@@ -3,7 +3,10 @@
  <template class="ConstraintEditor" parent="GtkWidget">
    <child>
      <object class="GtkGrid" id="grid">
-        <property name="margin">20</property>
+        <property name="margin-start">20</property>
+        <property name="margin-end">20</property>
+        <property name="margin-top">20</property>
+        <property name="margin-bottom">20</property>
        <property name="row-spacing">10</property>
        <property name="column-spacing">10</property>
        <child>
@@ -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", "yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"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", "yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"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_style_context_add_class (gtk_widget_get_style_context (frame), "child");
+  gtk_widget_add_css_class (frame, "child");
  gtk_widget_set_name (frame, name);
-  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_frame_set_child (GTK_FRAME (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_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_add_css_class (frame, "guide");
+  g_object_set_data (G_OBJECT (frame), "internal", (char *)"yes");
+  gtk_frame_set_child (GTK_FRAME (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", "yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
      gtk_constraint_layout_add_constraint (layout, constraint);
      g_object_set_data (G_OBJECT (guide), names[i].name, constraint);
    }
@@ -78,7 +78,7 @@ get_strength (const char *id)
  return strength;
 }

-const char *
+static const char *
 get_strength_nick (GtkConstraintStrength strength)
 {
  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
@@ -45,7 +45,10 @@
  <template class="GuideEditor" parent="GtkWidget">
    <child>
      <object class="GtkGrid" id="grid">
-        <property name="margin">20</property>
+        <property name="margin-start">20</property>
+        <property name="margin-end">20</property>
+        <property name="margin-top">20</property>
+        <property name="margin-bottom">20</property>
        <property name="row-spacing">10</property>
        <property name="column-spacing">10</property>
        <child>
@@ -13,6 +13,7 @@ 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,
@@ -6,6 +6,7 @@
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;

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

 typedef struct {
@@ -25,6 +26,7 @@ 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);
@@ -45,7 +47,7 @@ show_action_dialog (GSimpleAction *action)
                                    name);

  g_signal_connect (dialog, "response",
-                    G_CALLBACK (gtk_widget_destroy), NULL);
+                    G_CALLBACK (gtk_window_destroy), NULL);

  gtk_widget_show (dialog);
 }
@@ -118,7 +120,7 @@ open_response_cb (GtkNativeDialog *dialog,
                                                   "Error loading file: \"%s\"",
                                                   error->message);
          g_signal_connect (message_dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+                            G_CALLBACK (gtk_window_destroy), NULL);
          gtk_widget_show (message_dialog);
          g_error_free (error);
        }
@@ -232,7 +234,7 @@ activate_quit (GSimpleAction *action,
      win = list->data;
      next = list->next;

-      gtk_widget_destroy (GTK_WIDGET (win));
+      gtk_window_destroy (GTK_WINDOW (win));

      list = next;
    }
@@ -428,7 +430,7 @@ demo_application_window_init (DemoApplicationWindow *window)

  gtk_widget_init_template (GTK_WIDGET (window));

-  popover = gtk_popover_menu_new_from_model (window->menubutton, window->toolmenu);
+  popover = gtk_popover_menu_new_from_model (window->toolmenu);
  gtk_menu_button_set_popover (GTK_MENU_BUTTON (window->menubutton), popover);

  g_action_map_add_action_entries (G_ACTION_MAP (window),
@@ -477,7 +479,7 @@ surface_state_changed (GtkWidget *widget)
  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
  GdkSurfaceState new_state;

-  new_state = gdk_surface_get_state (gtk_native_get_surface (GTK_NATIVE (widget)));
+  new_state = gdk_toplevel_get_state (GDK_TOPLEVEL (gtk_native_get_surface (GTK_NATIVE (widget))));
  window->maximized = (new_state & GDK_SURFACE_STATE_MAXIMIZED) != 0;
  window->fullscreen = (new_state & GDK_SURFACE_STATE_FULLSCREEN) != 0;
 }
@@ -501,13 +503,13 @@ demo_application_window_unrealize (GtkWidget *widget)
 }

 static void
-demo_application_window_destroy (GtkWidget *widget)
+demo_application_window_dispose (GObject *object)
 {
-  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
+  DemoApplicationWindow *window = (DemoApplicationWindow *)object;

  demo_application_window_store_state (window);

-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (demo_application_window_parent_class)->dispose (object);
 }

 static void
@@ -517,11 +519,11 @@ demo_application_window_class_init (DemoApplicationWindowClass *class)
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);

  object_class->constructed = demo_application_window_constructed;
+  object_class->dispose = demo_application_window_dispose;

  widget_class->size_allocate = demo_application_window_size_allocate;
  widget_class->realize = demo_application_window_realize;
  widget_class->unrealize = demo_application_window_unrealize;
-  widget_class->destroy = demo_application_window_destroy;

  gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");
  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, message);
@@ -61,7 +61,7 @@
        </child>
        <child>
          <object class="GtkScrolledWindow">
-            <property name="shadow-type">in</property>
+            <property name="has-frame">1</property>
            <child>
              <object class="GtkTextView">
                <property name="hexpand">1</property>
@@ -31,12 +31,7 @@ on_name_vanished (GDBusConnection *connection,
  if (!name_seen)
    return;

-  if (placeholder)
-    {
-      gtk_widget_destroy (placeholder);
-      g_object_unref (placeholder);
-      placeholder = NULL;
-    }
+  g_clear_object (&placeholder);
 }

 #ifdef G_OS_WIN32
@@ -11,7 +11,7 @@
      <item>
        <attribute name="label" translatable="yes">_Quit</attribute>
        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
+        <attribute name="accel">&lt;Control&gt;q</attribute>
      </item>
    </section>
  </menu>
@@ -7,7 +7,6 @@

 #include <gtk/gtk.h>

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

 static gboolean
@@ -27,8 +26,7 @@ apply_changes_gradually (gpointer data)
  else
    {
      /* Close automatically once changes are fully applied. */
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
+      gtk_window_destroy (GTK_WINDOW (data));
      return G_SOURCE_REMOVE;
    }
 }
@@ -37,16 +35,13 @@ 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, NULL);
+  g_timeout_add (100, apply_changes_gradually, widget);
 }

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

 static void
@@ -94,15 +89,18 @@ create_page1 (GtkWidget *assistant)
  GtkWidget *box, *label, *entry;

  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (box, "margin", 12, NULL);
+  gtk_widget_set_margin_start (box, 12);
+  gtk_widget_set_margin_end (box, 12);
+  gtk_widget_set_margin_top (box, 12);
+  gtk_widget_set_margin_bottom (box, 12);

  label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);

  entry = gtk_entry_new ();
  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_container_add (GTK_CONTAINER (box), entry);
+  gtk_box_append (GTK_BOX (box), entry);
  g_signal_connect (G_OBJECT (entry), "changed",
                    G_CALLBACK (on_entry_changed), assistant);

@@ -117,12 +115,15 @@ create_page2 (GtkWidget *assistant)
  GtkWidget *box, *checkbutton;

  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (box, "margin", 12, NULL);
+  gtk_widget_set_margin_start (box, 12);
+  gtk_widget_set_margin_end (box, 12);
+  gtk_widget_set_margin_top (box, 12);
+  gtk_widget_set_margin_bottom (box, 12);

  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                 "even if you do not check this");
  gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER);
-  gtk_container_add (GTK_CONTAINER (box), checkbutton);
+  gtk_box_append (GTK_BOX (box), checkbutton);

  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
@@ -167,6 +168,8 @@ create_page4 (GtkWidget *assistant)
 GtkWidget*
 do_assistant (GtkWidget *do_widget)
 {
+  static GtkWidget *assistant;
+
  if (!assistant)
    {
      assistant = gtk_assistant_new ();
@@ -175,6 +178,7 @@ do_assistant (GtkWidget *do_widget)

      gtk_window_set_display (GTK_WINDOW (assistant),
                              gtk_widget_get_display (do_widget));
+      g_object_add_weak_pointer (G_OBJECT (assistant), (gpointer *)&assistant);

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

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

  return assistant;
 }
@@ -25,9 +25,8 @@
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="can-focus">1</property>
            <property name="vexpand">1</property>
-            <property name="shadow-type">in</property>
+            <property name="has-frame">1</property>
            <property name="min-content-width">150</property>
            <layout>
              <property name="left-attach">0</property>
@@ -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_BIN)
+G_DEFINE_TYPE (BlurOverlay, blur_overlay, GTK_TYPE_WIDGET)

 static void
 blur_overlay_set_overlay_child (GtkWidget       *widget,
@@ -131,13 +131,11 @@ 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;

-  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);
+  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);

  is_left = is_right = is_top = is_bottom = FALSE;

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

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

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

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

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

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

-  main_widget = gtk_bin_get_child (GTK_BIN (overlay));
+  main_widget = overlay->main_widget;
  if (main_widget && gtk_widget_get_visible (main_widget))
    gtk_widget_size_allocate (main_widget,
                              &(GtkAllocation) {
@@ -292,43 +290,6 @@ 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)
@@ -422,21 +383,32 @@ 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);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
+
+  object_class->dispose = blur_overlay_dispose;

  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] =
@@ -479,3 +451,11 @@ 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;
+}
@@ -37,14 +37,14 @@ typedef struct _BlurOverlayClass    BlurOverlayClass;

 struct _BlurOverlay
 {
-  GtkBin parent_instance;
+  GtkWidget parent_instance;

  GtkWidget *main_widget;
 };

 struct _BlurOverlayClass
 {
-  GtkBinClass parent_class;
+  GtkWidgetClass parent_class;

  gboolean (*get_child_position) (BlurOverlay   *overlay,
                                  GtkWidget     *widget,
@@ -59,6 +59,9 @@ 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

@@ -12,7 +12,7 @@ quit_activate (GSimpleAction *action,
 {
  GtkWidget *window = user_data;

-  gtk_widget_destroy (window);
+  gtk_window_destroy (GTK_WINDOW (window));
 }

 static void
@@ -26,8 +26,10 @@ about_activate (GSimpleAction *action,

  builder = g_object_get_data (G_OBJECT (window), "builder");
  about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
-  gtk_dialog_run (GTK_DIALOG (about_dlg));
-  gtk_widget_hide (about_dlg);
+  gtk_window_set_transient_for (GTK_WINDOW (about_dlg), GTK_WINDOW (window));
+  gtk_window_set_hide_on_close (GTK_WINDOW (about_dlg), TRUE);
+  g_signal_connect (about_dlg, "response", G_CALLBACK (gtk_widget_hide), NULL);
+  gtk_widget_show (about_dlg);
 }

 static void
@@ -74,8 +76,7 @@ do_builder (GtkWidget *do_widget)
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
      actions = (GActionGroup*)g_simple_action_group_new ();
      g_action_map_add_action_entries (G_ACTION_MAP (actions),
                                       win_entries, G_N_ELEMENTS (win_entries),
@@ -88,7 +89,7 @@ do_builder (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -12,10 +12,11 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
+#include "demoimage.h"

 static GtkWidget *window = NULL;

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

-void
+static void
 paste_received (GObject      *source_object,
                GAsyncResult *result,
                gpointer      user_data)
@@ -68,14 +69,14 @@ paste_received (GObject      *source_object,
                                       "Could not paste text: %s",
                                       error->message);
      g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
+                        G_CALLBACK (gtk_window_destroy), NULL);
      gtk_widget_show (dialog);

      g_error_free (error);
    }
 }

-void
+static void
 paste_button_clicked (GtkWidget *button,
                      gpointer   user_data)
 {
@@ -93,169 +94,6 @@ 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 (image, G_MENU_MODEL (menu));
-
-  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)
 {
@@ -265,133 +103,89 @@ 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),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      g_object_set (vbox, "margin", 8, NULL);
+      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_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);

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

-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);

      /* Create the first entry */
      entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (hbox), entry);
+      gtk_box_append (GTK_BOX (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (copy_button_clicked), entry);

      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);

      /* Create the second entry */
      entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (hbox), entry);
+      gtk_box_append (GTK_BOX (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (paste_button_clicked), entry);

      label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);

      /* Create the first image */
-      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);
+      image = demo_image_new ("dialog-warning");
+      gtk_box_append (GTK_BOX (hbox), image);

      /* Create the second image */
-      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);
+      image = demo_image_new ("process-stop");
+      gtk_box_append (GTK_BOX (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 third image */
+      image = demo_image_new ("weather-clear");
+      gtk_box_append (GTK_BOX (hbox), image);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -1,116 +0,0 @@
-/* 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);
-      g_object_set (vbox, "margin", 12, NULL);
-      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;
-}
@@ -19,7 +19,7 @@ enum
 static GtkTreeModel *
 create_icon_store (void)
 {
-  const gchar *icon_names[6] = {
+  const char *icon_names[6] = {
    "dialog-warning",
    "process-stop",
    "document-new",
@@ -27,7 +27,7 @@ create_icon_store (void)
    NULL,
    "document-open"
  };
-  const gchar *labels[6] = {
+  const char *labels[6] = {
    N_("Warning"),
    N_("Stop"),
    N_("New"),
@@ -111,8 +111,8 @@ static GtkTreeModel *
 create_capital_store (void)
 {
  struct {
-    gchar *group;
-    gchar *capital;
+    const char *group;
+    const char *capital;
  } capitals[] = {
    { "A - B", NULL },
    { NULL, "Albany" },
@@ -234,7 +234,7 @@ typedef struct _MaskEntry MaskEntry;
 struct _MaskEntry
 {
  GtkEntry entry;
-  gchar *mask;
+  const char *mask;
 };

 typedef struct _MaskEntryClass MaskEntryClass;
@@ -246,6 +246,7 @@ 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));
@@ -314,28 +315,32 @@ do_combobox (GtkWidget *do_widget)
    gtk_window_set_display (GTK_WINDOW (window),
                            gtk_widget_get_display (do_widget));
    gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");
-
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
+    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-    g_object_set (vbox, "margin", 10, NULL);
-    gtk_container_add (GTK_CONTAINER (window), vbox);
+    gtk_widget_set_margin_start (vbox, 10);
+    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);

    /* A combobox demonstrating cell renderers, separators and
     *  insensitive rows
     */
    frame = gtk_frame_new ("Items with icons");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_append (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (frame), box);
+    gtk_widget_set_margin_start (box, 5);
+    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);

    model = create_icon_store ();
    combo = gtk_combo_box_new_with_model (model);
    g_object_unref (model);
-    gtk_container_add (GTK_CONTAINER (box), combo);
+    gtk_box_append (GTK_BOX (box), combo);

    renderer = gtk_cell_renderer_pixbuf_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
@@ -367,16 +372,19 @@ do_combobox (GtkWidget *do_widget)
    /* A combobox demonstrating trees.
     */
    frame = gtk_frame_new ("Where are we ?");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_append (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (frame), box);
+    gtk_widget_set_margin_start (box, 5);
+    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);

    model = create_capital_store ();
    combo = gtk_combo_box_new_with_model (model);
    g_object_unref (model);
-    gtk_container_add (GTK_CONTAINER (box), combo);
+    gtk_box_append (GTK_BOX (box), combo);

    renderer = gtk_cell_renderer_text_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
@@ -395,47 +403,52 @@ do_combobox (GtkWidget *do_widget)

    /* A GtkComboBoxEntry with validation */
    frame = gtk_frame_new ("Editable");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_append (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (frame), box);
+    gtk_widget_set_margin_start (box, 5);
+    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);

    combo = gtk_combo_box_text_new_with_entry ();
    fill_combo_entry (combo);
-    gtk_container_add (GTK_CONTAINER (box), combo);
+    gtk_box_append (GTK_BOX (box), combo);

    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";

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

    /* A combobox with string IDs */
    frame = gtk_frame_new ("String IDs");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_append (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (frame), box);
+    gtk_widget_set_margin_start (box, 5);
+    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);

    combo = gtk_combo_box_text_new ();
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
-    gtk_container_add (GTK_CONTAINER (box), combo);
+    gtk_box_append (GTK_BOX (box), combo);

    entry = gtk_entry_new ();
    g_object_bind_property (combo, "active-id",
                            entry, "text",
                            G_BINDING_BIDIRECTIONAL);
-    gtk_container_add (GTK_CONTAINER (box), entry);
+    gtk_box_append (GTK_BOX (box), entry);
  }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -21,23 +21,24 @@ struct _SimpleGrid
 G_DEFINE_TYPE (SimpleGrid, simple_grid, GTK_TYPE_WIDGET)

 static void
-simple_grid_destroy (GtkWidget *widget)
+simple_grid_dispose (GObject *object)
 {
-  SimpleGrid *self = SIMPLE_GRID (widget);
+  SimpleGrid *self = SIMPLE_GRID (object);

-  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_clear_pointer (&self->button1, gtk_widget_unparent);
+  g_clear_pointer (&self->button2, gtk_widget_unparent);
+  g_clear_pointer (&self->button3, gtk_widget_unparent);

-  GTK_WIDGET_CLASS (simple_grid_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (simple_grid_parent_class)->dispose (object);
 }

 static void
 simple_grid_class_init (SimpleGridClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);

-  widget_class->destroy = simple_grid_destroy;
+  object_class->dispose = simple_grid_dispose;

  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -257,33 +258,32 @@ 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);
+     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);

     grid = g_object_new (simple_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
+     gtk_box_append (GTK_BOX (box), grid);

     button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
+     gtk_box_append (GTK_BOX (box), button);
     gtk_widget_set_hexpand (grid, TRUE);
     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
+                               G_CALLBACK (gtk_window_destroy), window);
   }

 if (!gtk_widget_get_visible (window))
   gtk_widget_show (window);
 else
-   gtk_widget_destroy (window);
+   gtk_window_destroy (GTK_WINDOW (window));

 return window;
 }
@@ -22,23 +22,24 @@ struct _InteractiveGrid
 G_DEFINE_TYPE (InteractiveGrid, interactive_grid, GTK_TYPE_WIDGET)

 static void
-interactive_grid_destroy (GtkWidget *widget)
+interactive_grid_dispose (GObject *object)
 {
-  InteractiveGrid *self = INTERACTIVE_GRID (widget);
+  InteractiveGrid *self = INTERACTIVE_GRID (object);

-  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_clear_pointer (&self->button1, gtk_widget_unparent);
+  g_clear_pointer (&self->button2, gtk_widget_unparent);
+  g_clear_pointer (&self->button3, gtk_widget_unparent);

-  GTK_WIDGET_CLASS (interactive_grid_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (interactive_grid_parent_class)->dispose (object);
 }

 static void
 interactive_grid_class_init (InteractiveGridClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);

-  widget_class->destroy = interactive_grid_destroy;
+  object_class->dispose = interactive_grid_dispose;

  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -213,33 +214,32 @@ 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);
+     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);

     grid = g_object_new (interactive_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
+     gtk_box_append (GTK_BOX (box), grid);

     button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
+     gtk_box_append (GTK_BOX (box), button);
     gtk_widget_set_hexpand (grid, TRUE);
     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
+                               G_CALLBACK (gtk_window_destroy), window);
   }

 if (!gtk_widget_get_visible (window))
   gtk_widget_show (window);
 else
-   gtk_widget_destroy (window);
+   gtk_window_destroy (GTK_WINDOW (window));

 return window;
 }
@@ -20,23 +20,24 @@ struct _VflGrid
 G_DEFINE_TYPE (VflGrid, vfl_grid, GTK_TYPE_WIDGET)

 static void
-vfl_grid_destroy (GtkWidget *widget)
+vfl_grid_dispose (GObject *object)
 {
-  VflGrid *self = VFL_GRID (widget);
+  VflGrid *self = VFL_GRID (object);

-  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_clear_pointer (&self->button1, gtk_widget_unparent);
+  g_clear_pointer (&self->button2, gtk_widget_unparent);
+  g_clear_pointer (&self->button3, gtk_widget_unparent);

-  GTK_WIDGET_CLASS (vfl_grid_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (vfl_grid_parent_class)->dispose (object);
 }

 static void
 vfl_grid_class_init (VflGridClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);

-  widget_class->destroy = vfl_grid_destroy;
+  object_class->dispose = vfl_grid_dispose;

  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -133,33 +134,32 @@ 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);
+     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);

     grid = g_object_new (vfl_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
+     gtk_box_append (GTK_BOX (box), grid);

     button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
+     gtk_box_append (GTK_BOX (box), button);
     gtk_widget_set_hexpand (grid, TRUE);
     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
+                               G_CALLBACK (gtk_window_destroy), window);
   }

 if (!gtk_widget_get_visible (window))
   gtk_widget_show (window);
 else
-   gtk_widget_destroy (window);
+   gtk_window_destroy (GTK_WINDOW (window));

 return window;
 }
@@ -9,9 +9,13 @@
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

 GtkWidget *
@@ -28,31 +32,30 @@ do_css_accordion (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "CSS Accordion");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      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_container_add (GTK_CONTAINER (window), container);
+      gtk_window_set_child (GTK_WINDOW (window), container);

      child = gtk_button_new_with_label ("This");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);

      child = gtk_button_new_with_label ("Is");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);

      child = gtk_button_new_with_label ("A");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);

      child = gtk_button_new_with_label ("CSS");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);

      child = gtk_button_new_with_label ("Accordion");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);

      child = gtk_button_new_with_label (":-)");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
      gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), "/css_accordion/css_accordion.css");
@@ -63,7 +66,7 @@ do_css_accordion (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -55,9 +55,13 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

 GtkWidget *
@@ -76,8 +80,7 @@ do_css_basics (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -92,9 +95,9 @@ do_css_basics (GtkWidget *do_widget)
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), container);
+      gtk_window_set_child (GTK_WINDOW (window), container);
      child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);
      g_signal_connect (text, "changed",
                        G_CALLBACK (css_text_changed), provider);

@@ -113,7 +116,7 @@ do_css_basics (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -11,8 +11,8 @@
 * These are the available blend modes.
 */
 struct {
-  gchar *name;
-  gchar *id;
+  const char *name;
+  const char *id;
 } blend_modes[] =
 {
  { "Color", "color" },
@@ -79,7 +79,7 @@ setup_listbox (GtkBuilder       *builder,

  normal_row = NULL;
  listbox = gtk_list_box_new ();
-  gtk_container_add (GTK_CONTAINER (WID ("scrolledwindow")), listbox);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (WID ("scrolledwindow")), listbox);

  g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), provider);

@@ -95,9 +95,8 @@ setup_listbox (GtkBuilder       *builder,
                            "xalign", 0.0,
                            NULL);

-      gtk_container_add (GTK_CONTAINER (row), label);
-
-      gtk_container_add (GTK_CONTAINER (listbox), row);
+      gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), label);
+      gtk_list_box_insert (GTK_LIST_BOX (listbox), row, -1);

      /* The first selected row is "normal" */
      if (g_strcmp0 (blend_modes[i].id, "normal") == 0)
@@ -125,7 +124,7 @@ do_css_blendmodes (GtkWidget *do_widget)

      window = WID ("window");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      /* Setup the CSS provider for window */
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
@@ -140,7 +139,7 @@ do_css_blendmodes (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -69,9 +69,13 @@ drawing_area_draw (GtkDrawingArea *da,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

 GtkWidget *
@@ -90,18 +94,17 @@ do_css_multiplebgs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

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

      child = gtk_drawing_area_new ();
      gtk_widget_set_name (child, "canvas");
      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
                                      drawing_area_draw,
                                      NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);

      child = gtk_button_new ();
      gtk_overlay_add_overlay (GTK_OVERLAY (container), child);
@@ -115,7 +118,7 @@ do_css_multiplebgs (GtkWidget *do_widget)

      /* Need a filler so we get a handle */
      child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (paned), child);
+      gtk_paned_set_start_child (GTK_PANED (paned), child);

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -130,9 +133,9 @@ do_css_multiplebgs (GtkWidget *do_widget)
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
+      gtk_paned_set_end_child (GTK_PANED (paned), container);
      child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
      g_signal_connect (text,
                        "changed",
                        G_CALLBACK (css_text_changed),
@@ -153,7 +156,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -55,9 +55,13 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

 GtkWidget *
@@ -76,15 +80,14 @@ do_css_pixbufs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

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

      /* Need a filler so we get a handle */
      child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (paned), child);
+      gtk_paned_set_start_child (GTK_PANED (paned), child);

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -99,9 +102,9 @@ do_css_pixbufs (GtkWidget *do_widget)
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
+      gtk_paned_set_end_child (GTK_PANED (paned), container);
      child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
      g_signal_connect (text, "changed",
                        G_CALLBACK (css_text_changed), provider);

@@ -120,7 +123,7 @@ do_css_pixbufs (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -53,12 +53,16 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }

-GtkWidget *
+static GtkWidget *
 create_toolbar (void)
 {
  GtkWidget *toolbar;
@@ -68,13 +72,13 @@ create_toolbar (void)
  gtk_widget_set_valign (toolbar, GTK_ALIGN_CENTER);

  item = gtk_button_new_from_icon_name ("go-next");
-  gtk_container_add (GTK_CONTAINER (toolbar), item);
+  gtk_box_append (GTK_BOX (toolbar), item);

  item = gtk_button_new_from_icon_name ("go-previous");
-  gtk_container_add (GTK_CONTAINER (toolbar), item);
+  gtk_box_append (GTK_BOX (toolbar), item);

  item = gtk_button_new_with_label ("Hello World");
-  gtk_container_add (GTK_CONTAINER (toolbar), item);
+  gtk_box_append (GTK_BOX (toolbar), item);

  return toolbar;
 }
@@ -95,14 +99,13 @@ do_css_shadows (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Shadows");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

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

      child = create_toolbar ();
-      gtk_container_add (GTK_CONTAINER (paned), child);
+      gtk_paned_set_start_child (GTK_PANED (paned), child);

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -117,9 +120,9 @@ do_css_shadows (GtkWidget *do_widget)
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
+      gtk_paned_set_end_child (GTK_PANED (paned), container);
      child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
      g_signal_connect (text, "changed",
                        G_CALLBACK (css_text_changed), provider);

@@ -138,7 +141,7 @@ do_css_shadows (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

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

  return window;
@@ -656,7 +656,10 @@
        <child>
          <object class="GtkBox">
            <property name="orientation">vertical</property>
-            <property name="margin">60</property>
+            <property name="margin-start">60</property>
+            <property name="margin-end">60</property>
+            <property name="margin-top">60</property>
+            <property name="margin-bottom">60</property>
            <property name="spacing">10</property>
            <property name="halign">center</property>
            <child>
@@ -672,7 +675,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -729,7 +735,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -786,7 +795,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -856,7 +868,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -913,7 +928,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -970,7 +988,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1027,7 +1048,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1084,7 +1108,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1154,7 +1181,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1211,7 +1241,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1268,7 +1301,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1325,7 +1361,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1395,7 +1434,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1452,7 +1494,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1509,7 +1554,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1566,7 +1614,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1623,7 +1674,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1680,7 +1734,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1737,7 +1794,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1807,7 +1867,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1864,7 +1927,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1921,7 +1987,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -1978,7 +2047,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2035,7 +2107,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2092,7 +2167,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2149,7 +2227,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2206,7 +2287,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2263,7 +2347,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2320,7 +2407,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2377,7 +2467,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2434,7 +2527,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2491,7 +2587,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2548,7 +2647,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2605,7 +2707,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2675,7 +2780,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -2732,7 +2840,10 @@
                        <property name="activatable">0</property>
                        <child>
                          <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <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="spacing">10</property>
                            <child>
                              <object class="GtkImage">
@@ -12,6 +12,10 @@
  <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>
@@ -104,6 +108,10 @@
    <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>
@@ -150,7 +158,6 @@
    <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>
@@ -176,6 +183,7 @@
    <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>
@@ -199,9 +207,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>
@@ -209,6 +217,7 @@
    <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>
@@ -238,9 +247,6 @@
    <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>
@@ -274,9 +280,6 @@
  <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>
@@ -306,4 +309,7 @@
    <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>
@@ -29,29 +29,29 @@
        <item>
          <attribute name="label" translatable="yes">_New</attribute>
          <attribute name="action">win.new</attribute>
-          <attribute name="accel">&lt;Primary&gt;n</attribute>
+          <attribute name="accel">&lt;Control&gt;n</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">_Open</attribute>
          <attribute name="action">win.open</attribute>
-          <attribute name="accel">&lt;Primary&gt;o</attribute>
+          <attribute name="accel">&lt;Control&gt;o</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">_Save</attribute>
          <attribute name="action">win.save</attribute>
-          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="accel">&lt;Control&gt;s</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">Save _As</attribute>
          <attribute name="action">win.save-as</attribute>
-          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="accel">&lt;Control&gt;q</attribute>
        </item>
      </section>
      <section>
        <item>
          <attribute name="label" translatable="yes">_Quit</attribute>
          <attribute name="action">win.quit</attribute>
-          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
+          <attribute name="accel">&lt;Control&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;Primary&gt;c</attribute>
+          <attribute name="accel">&lt;Control&gt;c</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">_Cut</attribute>
          <attribute name="action">win.cut</attribute>
-          <attribute name="accel">&lt;Primary&gt;x</attribute>
+          <attribute name="accel">&lt;Control&gt;x</attribute>
        </item>
        <item>
          <attribute name="label" translatable="yes">_Paste</attribute>
          <attribute name="action">win.paste</attribute>
-          <attribute name="accel">&lt;Primary&gt;v</attribute>
+          <attribute name="accel">&lt;Control&gt;v</attribute>
        </item>
      </section>
    </submenu>
@@ -94,6 +94,7 @@
  <object class="GtkAboutDialog" id="aboutdialog1">
    <property name="program-name" translatable="yes">Builder demo</property>
    <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
+    <property name="modal">True</property>
    <accessibility>
      <relation target="window1" type="subwindow-of"/>
    </accessibility>
@@ -166,8 +167,9 @@
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="shadow-type">in</property>
-            <property name="expand">1</property>
+            <property name="has-frame">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
            <child>
              <object class="GtkTreeView" id="treeview1">
                <property name="model">liststore1</property>
@@ -0,0 +1,259 @@
+#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);
+}
@@ -0,0 +1,13 @@
+#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
@@ -49,7 +49,7 @@ demo_tagged_entry_init (DemoTaggedEntry *entry)
  gtk_widget_set_vexpand (priv->entry, TRUE);
  gtk_widget_set_hexpand (priv->box, FALSE);
  gtk_widget_set_vexpand (priv->box, FALSE);
-  gtk_container_add (GTK_CONTAINER (priv->box), priv->entry);
+  gtk_box_append (GTK_BOX (priv->box), priv->entry);
  gtk_editable_init_delegate (GTK_EDITABLE (entry));
 }

@@ -188,7 +188,7 @@ demo_tagged_entry_add_tag (DemoTaggedEntry *entry,

  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  gtk_container_add (GTK_CONTAINER (priv->box), tag);
+  gtk_box_append (GTK_BOX (priv->box), tag);
 }

 void
@@ -201,7 +201,7 @@ demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

  if (sibling == NULL)
-    gtk_container_add (GTK_CONTAINER (priv->box), tag);
+    gtk_box_append (GTK_BOX (priv->box), tag);
  else
    gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
 }
@@ -214,7 +214,7 @@ demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,

  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  gtk_container_remove (GTK_CONTAINER (priv->box), tag);
+  gtk_box_remove (GTK_BOX (priv->box), tag);
 }

 struct _DemoTaggedEntryTag
@@ -268,7 +268,7 @@ demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
  tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
  tag->label = gtk_label_new ("");
-  gtk_container_add (GTK_CONTAINER (tag->box), tag->label);
+  gtk_box_append (GTK_BOX (tag->box), tag->label);

  gesture = gtk_gesture_click_new ();
  g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag);
@@ -460,7 +460,7 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,

  if (!has_close_button && tag->button)
    {
-      gtk_container_remove (GTK_CONTAINER (tag->box), tag->button);
+      gtk_box_remove (GTK_BOX (tag->box), tag->button);
      tag->button = NULL;
    }
  else if (has_close_button && tag->button == NULL)
@@ -469,11 +469,11 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,

      image = gtk_image_new_from_icon_name ("window-close-symbolic");
      tag->button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (tag->button), image);
+      gtk_box_append (GTK_BOX (tag->button), image);
      gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
-      gtk_button_set_relief (GTK_BUTTON (tag->button), GTK_RELIEF_NONE);
-      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
+      gtk_button_set_has_frame (GTK_BUTTON (tag->button), FALSE);
+      gtk_box_append (GTK_BOX (tag->box), tag->button);
      g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
    }

@@ -25,11 +25,36 @@ message_dialog_clicked (GtkButton *button,
                                   "number of times:");
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            "%d", i);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
+  g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+  gtk_widget_show (dialog);
  i++;
 }

+typedef struct {
+  GtkWidget *local_entry1;
+  GtkWidget *local_entry2;
+  GtkWidget *global_entry1;
+  GtkWidget *global_entry2;
+} ResponseData;
+
+static void
+on_dialog_response (GtkDialog *dialog,
+                    int        response,
+                    gpointer   user_data)
+{
+  ResponseData *data = user_data;
+
+  if (response == GTK_RESPONSE_OK)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (data->global_entry1),
+                             gtk_editable_get_text (GTK_EDITABLE (data->local_entry1)));
+      gtk_editable_set_text (GTK_EDITABLE (data->global_entry2),
+                             gtk_editable_get_text (GTK_EDITABLE (data->local_entry2)));
+    }
+
+  gtk_window_destroy (GTK_WINDOW (dialog));
+}
+
 static void
 interactive_dialog_clicked (GtkButton *button,
                            gpointer   user_data)
@@ -42,7 +67,7 @@ interactive_dialog_clicked (GtkButton *button,
  GtkWidget *local_entry1;
  GtkWidget *local_entry2;
  GtkWidget *label;
-  gint response;
+  ResponseData *data;

  dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
                                        GTK_WINDOW (window),
@@ -56,16 +81,16 @@ interactive_dialog_clicked (GtkButton *button,
  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_container_add (GTK_CONTAINER (content_area), hbox);
+  gtk_box_append (GTK_BOX (content_area), hbox);

  image = gtk_image_new_from_icon_name ("dialog-question");
  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-  gtk_container_add (GTK_CONTAINER (hbox), image);
+  gtk_box_append (GTK_BOX (hbox), image);

  table = gtk_grid_new ();
  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_container_add (GTK_CONTAINER (hbox), table);
+  gtk_box_append (GTK_BOX (hbox), table);
  label = gtk_label_new_with_mnemonic ("_Entry 1");
  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
  local_entry1 = gtk_entry_new ();
@@ -81,15 +106,18 @@ interactive_dialog_clicked (GtkButton *button,
  gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);

-  response = gtk_dialog_run (GTK_DIALOG (dialog));
+  data = g_new (ResponseData, 1);
+  data->local_entry1 = local_entry1;
+  data->local_entry2 = local_entry2;
+  data->global_entry1 = entry1;
+  data->global_entry2 = entry2;

-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_editable_set_text (GTK_EDITABLE (entry1), gtk_editable_get_text (GTK_EDITABLE (local_entry1)));
-      gtk_editable_set_text (GTK_EDITABLE (entry2), gtk_editable_get_text (GTK_EDITABLE (local_entry2)));
-    }
+  g_signal_connect_data (dialog, "response",
+                         G_CALLBACK (on_dialog_response),
+                         data, (GClosureNotify) g_free,
+                         0);

-  gtk_widget_destroy (dialog);
+  gtk_widget_show (dialog);
 }

 GtkWidget *
@@ -109,43 +137,47 @@ do_dialog (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      frame = gtk_frame_new ("Dialogs");
-      g_object_set (frame, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (window), frame);
+      gtk_widget_set_margin_start (frame, 8);
+      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);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (frame), vbox);
+      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);

      /* Standard message dialog */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_append (GTK_BOX (vbox), hbox);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);

-      gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+      gtk_box_append (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));

      /* Interactive dialog*/
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_append (GTK_BOX (vbox), hbox);
      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox2);
-      gtk_container_add (GTK_CONTAINER (vbox2), button);
+      gtk_box_append (GTK_BOX (hbox), vbox2);
+      gtk_box_append (GTK_BOX (vbox2), button);

      table = gtk_grid_new ();
      gtk_grid_set_row_spacing (GTK_GRID (table), 4);
      gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_container_add (GTK_CONTAINER (hbox), table);
+      gtk_box_append (GTK_BOX (hbox), table);

      label = gtk_label_new_with_mnemonic ("_Entry 1");
      gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
@@ -164,7 +196,7 @@ do_dialog (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -1,202 +1,126 @@
 /* Drag-and-Drop
 *
- * I can't believe its not glade!
- *
- * Try right-clicking in the window.
+ * This demo shows dragging colors and widgets.
+ * The items in this demo can be moved, recolored
+ * and rotated.
 */

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

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

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

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

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

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

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

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

-#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)
+static void
+drag_end (GtkDragSource *source,
+          GdkDrag       *drag)
 {
-  GtkDemoWidget *demo;
+  GtkWidget *canvas;
+  GtkWidget *item;

-  demo = g_new0 (GtkDemoWidget, 1);
-  demo->type = G_OBJECT_TYPE (widget);
+  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);

-  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, "active", &demo->active, NULL);
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
-
-  return demo;
+  gtk_widget_set_opacity (item, 1.0);
 }

-static GtkWidget *
-deserialize_widget (GtkDemoWidget *demo)
+static gboolean
+drag_cancel (GtkDragSource       *source,
+             GdkDrag             *drag,
+             GdkDragCancelReason  reason)
 {
-  GtkWidget *widget = NULL;
+  return FALSE;
+}

-  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, "active", 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));
-    }
+typedef struct {
+  double x, y;
+  double angle;
+  double delta;
+} TransformData;

-  return widget;
+static void
+apply_transform (GtkWidget *item)
+{
+  GtkWidget *canvas = gtk_widget_get_parent (item);
+  TransformData *data;
+  GskTransform *transform;
+
+  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);
+}
+
+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;
 }

 static double pos_x, pos_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 GtkWidget * canvas_item_new (double x, double y);

 static void
-new_spinner_cb (GtkWidget *button,
-                gpointer     data)
+new_item_cb (GtkWidget *button, gpointer data)
 {
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
+  GtkWidget *canvas = data;
+  GtkWidget *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");
+  item = canvas_item_new (pos_x, pos_y);
+  gtk_fixed_put (GTK_FIXED (canvas), item, 0, 0);
+  apply_transform (item);

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

-  gtk_fixed_get_child_position (GTK_FIXED (fixed), entry, &x, &y);
+  gtk_fixed_get_child_position (GTK_FIXED (canvas), 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);
+  gtk_fixed_remove (GTK_FIXED (canvas), entry);
 }

 static void
 edit_cb (GtkWidget *button, GtkWidget *child)
 {
-  GtkWidget *fixed = gtk_widget_get_parent (child);
+  GtkWidget *canvas = gtk_widget_get_parent (child);
  int x, y;

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

  if (GTK_IS_LABEL (child))
    {
@@ -233,21 +158,25 @@ 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 (fixed), entry, x, y);
+      gtk_fixed_put (GTK_FIXED (canvas), entry, x, y);
      gtk_widget_grab_focus (entry);
-    }
-  else if (GTK_IS_SPINNER (child))
-    {
-      gboolean active;
-
-      g_object_get (child, "active", &active, NULL);
-      g_object_set (child, "active", !active, NULL);
+      gtk_widget_hide (child);
    }

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

+static void
+delete_cb (GtkWidget *button, GtkWidget *child)
+{
+  GtkWidget *canvas = gtk_widget_get_parent (child);
+
+  gtk_fixed_remove (GTK_FIXED (canvas), child);
+
+  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+}
+
 static void
 pressed_cb (GtkGesture *gesture,
            int         n_press,
@@ -266,60 +195,39 @@ pressed_cb (GtkGesture *gesture,
      GtkWidget *menu;
      GtkWidget *box;
      GtkWidget *item;
-      GdkClipboard *clipboard;

      pos_x = x;
      pos_y = y;

-      menu = gtk_popover_new (widget);
+      menu = gtk_popover_new ();
+      gtk_widget_set_parent (menu, widget);
      gtk_popover_set_has_arrow (GTK_POPOVER (menu), FALSE);
      gtk_popover_set_pointing_to (GTK_POPOVER (menu), &(GdkRectangle){ x, y, 1, 1});
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (menu), box);
+      gtk_popover_set_child (GTK_POPOVER (menu), box);

-      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_button_new_with_label ("New");
+      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
+      g_signal_connect (item, "clicked", G_CALLBACK (new_item_cb), widget);
+      gtk_box_append (GTK_BOX (box), item);

      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      gtk_box_append (GTK_BOX (box), item);

      item = gtk_button_new_with_label ("Edit");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
      gtk_widget_set_sensitive (item, child != NULL && child != widget);
      g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      gtk_box_append (GTK_BOX (box), item);

      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      gtk_box_append (GTK_BOX (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_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
      gtk_widget_set_sensitive (item, child != NULL && child != widget);
      g_signal_connect (item, "clicked", G_CALLBACK (delete_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      gtk_box_append (GTK_BOX (box), item);

      gtk_popover_popup (GTK_POPOVER (menu));
    }
@@ -345,6 +253,165 @@ 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 *
@@ -352,43 +419,82 @@ do_dnd (GtkWidget *do_widget)
 {
  if (!window)
    {
-      GtkWidget *vbox, *fixed;
-      GtkGesture *multipress;
-      GtkCssProvider *provider;
+      GtkWidget *button;
+      GtkWidget *sw;
+      GtkWidget *canvas;
+      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;
+
+      button = gtk_color_button_new ();
+      g_object_unref (g_object_ref_sink (button));

      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_title (GTK_WINDOW (window), "Drag-and-Drop");
+      gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_window_set_child (GTK_WINDOW (window), box);

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

-      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);
+      x = y = 40;
+      for (i = 0; i < 4; i++)
+        {
+          GtkWidget *item;
+
+          item = canvas_item_new (x, y);
+          gtk_fixed_put (GTK_FIXED (canvas), item, 0, 0);
+          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_box_append (GTK_BOX (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_box_append (GTK_BOX (box3), swatch);
+        }
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -1,3 +0,0 @@
-spinner.demo {
-  opacity: 1;
-}
@@ -42,7 +42,9 @@ create_surface (GtkWidget *widget)
 }

 static void
-scribble_size_allocate (GtkWidget *widget)
+scribble_resize (GtkWidget *widget,
+                 int        width,
+                 int        height)
 {
  create_surface (widget);
 }
@@ -123,49 +125,164 @@ drag_end (GtkGestureDrag *gesture,
 }

 static void
-checkerboard_draw (GtkDrawingArea *da,
-                   cairo_t        *cr,
-                   int             width,
-                   int             height,
-                   gpointer        data)
+oval_path (cairo_t *cr,
+           double xc, double yc,
+           double xr, double yr)
 {
-  gint i, j, xcount, ycount;
+  cairo_save (cr);

-#define CHECK_SIZE 10
-#define SPACING 2
+  cairo_translate (cr, xc, yc);
+  cairo_scale (cr, 1.0, yr / xr);
+  cairo_move_to (cr, xr, 0.0);
+  cairo_arc (cr,
+             0, 0,
+             xr,
+             0, 2 * G_PI);
+  cairo_close_path (cr);

-  /* At the start of a draw handler, a clip region has been set on
-   * the Cairo context, and the contents have been cleared to the
-   * widget's background color. The docs for
-   * gdk_surface_begin_paint_region() give more details on how this
-   * works.
-   */
+  cairo_restore (cr);
+}

-  xcount = 0;
-  i = SPACING;
-  while (i < width)
+/* Fill the given area with checks in the standard style
+ * for showing compositing effects.
+ *
+ * It would make sense to do this as a repeating surface,
+ * but most implementations of RENDER currently have broken
+ * implementations of repeat + transform, even when the
+ * transform is a translation.
+ */
+static void
+fill_checks (cairo_t *cr,
+             int x,     int y,
+             int width, int height)
+{
+  int i, j;
+
+#define CHECK_SIZE 16
+
+  cairo_rectangle (cr, x, y, width, height);
+  cairo_set_source_rgb (cr, 0.4, 0.4, 0.4);
+  cairo_fill (cr);
+
+  /* Only works for CHECK_SIZE a power of 2 */
+  j = x & (-CHECK_SIZE);
+
+  for (; j < height; j += CHECK_SIZE)
    {
-      j = SPACING;
-      ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < height)
-        {
-          if (ycount % 2)
-            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
-          else
-            cairo_set_source_rgb (cr, 1, 1, 1);
-
-          /* If we're outside the clip, this will do nothing.
-           */
+      i = y & (-CHECK_SIZE);
+      for (; i < width; i += CHECK_SIZE)
+        if ((i / CHECK_SIZE + j / CHECK_SIZE) % 2 == 0)
          cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
-          cairo_fill (cr);
-
-          j += CHECK_SIZE + SPACING;
-          ++ycount;
-        }
-
-      i += CHECK_SIZE + SPACING;
-      ++xcount;
    }
+
+  cairo_set_source_rgb (cr, 0.7, 0.7, 0.7);
+  cairo_fill (cr);
+
+#undef CHECK_SIZE
+}
+
+/* Draw a red, green, and blue circle equally spaced inside
+ * the larger circle of radius r at (xc, yc)
+ */
+static void
+draw_3circles (cairo_t *cr,
+               double xc, double yc,
+               double radius,
+               double alpha)
+{
+  double subradius = radius * (2 / 3. - 0.1);
+
+  cairo_set_source_rgba (cr, 1., 0., 0., alpha);
+  oval_path (cr,
+             xc + radius / 3. * cos (G_PI * (0.5)),
+             yc - radius / 3. * sin (G_PI * (0.5)),
+             subradius, subradius);
+  cairo_fill (cr);
+
+  cairo_set_source_rgba (cr, 0., 1., 0., alpha);
+  oval_path (cr,
+             xc + radius / 3. * cos (G_PI * (0.5 + 2/.3)),
+             yc - radius / 3. * sin (G_PI * (0.5 + 2/.3)),
+             subradius, subradius);
+  cairo_fill (cr);
+
+  cairo_set_source_rgba (cr, 0., 0., 1., alpha);
+  oval_path (cr,
+             xc + radius / 3. * cos (G_PI * (0.5 + 4/.3)),
+             yc - radius / 3. * sin (G_PI * (0.5 + 4/.3)),
+             subradius, subradius);
+  cairo_fill (cr);
+}
+
+static void
+groups_draw (GtkDrawingArea *darea,
+             cairo_t        *cr,
+             int             width,
+             int             height,
+             gpointer        data)
+{
+  cairo_surface_t *overlay, *punch, *circles;
+  cairo_t *overlay_cr, *punch_cr, *circles_cr;
+
+  /* Fill the background */
+  double radius = 0.5 * (width < height ? width : height) - 10;
+  double xc = width / 2.;
+  double yc = height / 2.;
+
+  overlay = cairo_surface_create_similar (cairo_get_target (cr),
+                                          CAIRO_CONTENT_COLOR_ALPHA,
+                                          width, height);
+
+  punch = cairo_surface_create_similar (cairo_get_target (cr),
+                                        CAIRO_CONTENT_ALPHA,
+                                        width, height);
+
+  circles = cairo_surface_create_similar (cairo_get_target (cr),
+                                          CAIRO_CONTENT_COLOR_ALPHA,
+                                          width, height);
+
+  fill_checks (cr, 0, 0, width, height);
+
+  /* Draw a black circle on the overlay
+   */
+  overlay_cr = cairo_create (overlay);
+  cairo_set_source_rgb (overlay_cr, 0., 0., 0.);
+  oval_path (overlay_cr, xc, yc, radius, radius);
+  cairo_fill (overlay_cr);
+
+  /* Draw 3 circles to the punch surface, then cut
+   * that out of the main circle in the overlay
+   */
+  punch_cr = cairo_create (punch);
+  draw_3circles (punch_cr, xc, yc, radius, 1.0);
+  cairo_destroy (punch_cr);
+
+  cairo_set_operator (overlay_cr, CAIRO_OPERATOR_DEST_OUT);
+  cairo_set_source_surface (overlay_cr, punch, 0, 0);
+  cairo_paint (overlay_cr);
+
+  /* Now draw the 3 circles in a subgroup again
+   * at half intensity, and use OperatorAdd to join up
+   * without seams.
+   */
+  circles_cr = cairo_create (circles);
+
+  cairo_set_operator (circles_cr, CAIRO_OPERATOR_OVER);
+  draw_3circles (circles_cr, xc, yc, radius, 0.5);
+  cairo_destroy (circles_cr);
+
+  cairo_set_operator (overlay_cr, CAIRO_OPERATOR_ADD);
+  cairo_set_source_surface (overlay_cr, circles, 0, 0);
+  cairo_paint (overlay_cr);
+
+  cairo_destroy (overlay_cr);
+
+  cairo_set_source_surface (cr, overlay, 0, 0);
+  cairo_paint (cr);
+
+  cairo_surface_destroy (overlay);
+  cairo_surface_destroy (punch);
+  cairo_surface_destroy (circles);
 }

 static void
@@ -198,28 +315,29 @@ do_drawingarea (GtkWidget *do_widget)
                        G_CALLBACK (close_window), NULL);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox, "margin", 16, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 16);
+      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);

      /*
-       * Create the checkerboard area
+       * Create the groups area
       */
-
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Checkerboard pattern</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+                            "<u>Knockout groups</u>");
+      gtk_box_append (GTK_BOX (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);
+      gtk_box_append (GTK_BOX (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), checkerboard_draw, NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (frame), da);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), groups_draw, NULL, NULL);
+      gtk_frame_set_child (GTK_FRAME (frame), da);

      /*
       * Create the scribble area
@@ -228,21 +346,20 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Scribble area</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);

      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);
+      gtk_box_append (GTK_BOX (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_container_add (GTK_CONTAINER (frame), da);
+      gtk_frame_set_child (GTK_FRAME (frame), da);

-      g_signal_connect (da, "size-allocate",
-                        G_CALLBACK (scribble_size_allocate), NULL);
+      g_signal_connect (da, "resize",
+                        G_CALLBACK (scribble_resize), NULL);

      drag = gtk_gesture_drag_new ();
      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
@@ -257,7 +374,7 @@ do_drawingarea (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
      gtk_widget_show (window);
  else
-      gtk_widget_destroy (window);
+      gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -275,6 +275,9 @@ cell_edited (GtkCellRendererText *cell,
                            g_array_index (articles, Item, i).product, -1);
      }
      break;
+
+    default:
+      g_assert_not_reached ();
    }

  gtk_tree_path_free (path);
@@ -349,23 +352,24 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 5);
+      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 (vbox),
+      gtk_box_append (GTK_BOX (vbox),
                          gtk_label_new ("Shopping list (you can edit the cells!)"));

      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_append (GTK_BOX (vbox), sw);

      /* create models */
      items_model = create_items_model ();
@@ -382,22 +386,22 @@ do_editable_cells (GtkWidget *do_widget)
      g_object_unref (numbers_model);
      g_object_unref (items_model);

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

      /* some buttons */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_append (GTK_BOX (vbox), hbox);

      button = gtk_button_new_with_label ("Add item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (add_item), treeview);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);

      button = gtk_button_new_with_label ("Remove item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (remove_item), treeview);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);

      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
    }
@@ -405,7 +409,7 @@ do_editable_cells (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -9,7 +9,7 @@
 #include <gtk/gtk.h>

 /* Creates a tree model containing the completions */
-GtkTreeModel *
+static GtkTreeModel *
 create_completion_model (void)
 {
  GtkListStore *store;
@@ -50,21 +50,22 @@ do_entry_completion (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 5);
+      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);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);

      /* Create our entry */
      entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_append (GTK_BOX (vbox), entry);

      /* Create the completion object */
      completion = gtk_entry_completion_new ();
@@ -85,7 +86,7 @@ do_entry_completion (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -25,28 +25,30 @@ do_entry_undo (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 5);
+      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);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "Use Primary+z or Primary+Shift+z to undo or redo changes");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);

      /* Create our entry */
      entry = gtk_entry_new ();
      gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_append (GTK_BOX (vbox), entry);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -15,7 +15,7 @@ static GtkWidget *window = NULL;
 static void
 response_cb (GtkDialog *dialog, gint response_id)
 {
-  gtk_widget_destroy (window);
+  gtk_window_destroy (GTK_WINDOW (window));
  window = NULL;
 }

@@ -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_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
+      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
@@ -78,9 +78,9 @@ 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_container_add (GTK_CONTAINER (sw), tv);
-      gtk_container_add (GTK_CONTAINER (expander), sw);
-      gtk_container_add (GTK_CONTAINER (area), expander);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
+      gtk_expander_set_child (GTK_EXPANDER (expander), sw);
+      gtk_box_append (GTK_BOX (area), expander);
      g_signal_connect (expander, "notify::expanded",
                        G_CALLBACK (expander_cb), window);

@@ -90,7 +90,7 @@ do_expander (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -125,8 +125,7 @@ do_filtermodel (GtkWidget *do_widget)
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      store = (GtkListStore*)gtk_builder_get_object (builder, "liststore1");

@@ -199,7 +198,7 @@ do_filtermodel (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -31,7 +31,10 @@
    <property name="title" translatable="yes">Filter Model</property>
    <child>
      <object class="GtkGrid" id="grid1">
-        <property name="margin">10</property>
+        <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="row-spacing">10</property>
        <property name="column-spacing">10</property>
        <property name="column-homogeneous">1</property>
@@ -53,7 +56,6 @@
        </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">
@@ -92,7 +94,6 @@
        </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">
@@ -175,7 +176,6 @@
        </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">
@@ -37,6 +37,7 @@ 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)
 {
@@ -61,7 +62,7 @@ create_blurred_button (void)
 {
  GtkWidget *w = gtk_button_new ();

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

  return w;
 }
@@ -158,9 +159,9 @@ static GtkWidget *
 create_menu_button (void)
 {
  GtkWidget *w = gtk_menu_button_new ();
-  GtkWidget *popover = gtk_popover_new (NULL);
+  GtkWidget *popover = gtk_popover_new ();

-  gtk_container_add (GTK_CONTAINER (popover), gtk_button_new_with_label ("Hey!"));
+  gtk_popover_set_child (GTK_POPOVER (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);
@@ -193,7 +194,7 @@ static void
 set_widget_type (GtkFishbowl *fishbowl,
                 int          widget_type_index)
 {
-  GtkWidget *window, *headerbar;
+  GtkWidget *window;

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

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

 void
@@ -273,15 +273,13 @@ do_fishbowl (GtkWidget *do_widget)

      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
      selected_widget_type = -1;
      set_widget_type (GTK_FISHBOWL (bowl), 0);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_widget_realize (window);
      g_object_unref (builder);
@@ -290,7 +288,7 @@ do_fishbowl (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -49,7 +49,7 @@
        <child type="end">
          <object class="GtkToggleButton" id="changes_allow">
            <property name="icon-name">changes-allow</property>
-            <property name="relief">none</property>
+            <property name="has-frame">0</property>
            <signal name="notify::active" handler="fishbowl_changes_toggled_cb"/>
          </object>
        </child>
@@ -58,6 +58,7 @@
    <child>
      <object class="GtkFishbowl" id="bowl">
        <property name="visible">True</property>
+        <property name="overflow">hidden</property>
        <property name="animating">True</property>
        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean | sync-create"/>
      </object>
@@ -52,8 +52,8 @@ 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_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);
+      gtk_widget_add_css_class (faces[i].face, faces[i].css_class);
+      gtk_fixed_put (GTK_FIXED (fixed), faces[i].face, 0, 0);

      /* Set up the transformation for each face */
      transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w, h));
@@ -131,15 +131,15 @@ create_demo_window (GtkWidget *do_widget)
  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

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

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

  cube = create_faces ();
-  gtk_container_add (GTK_CONTAINER (fixed), cube);
+  gtk_fixed_put (GTK_FIXED (fixed), cube, 0, 0);
  gtk_widget_set_overflow (fixed, GTK_OVERFLOW_VISIBLE);

  provider = gtk_css_provider_new ();
@@ -161,7 +161,7 @@ do_fixed (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (demo_window))
    gtk_widget_show (demo_window);
  else
-    gtk_widget_destroy (demo_window);
+    gtk_window_destroy (GTK_WINDOW (demo_window));

  return demo_window;
 }
@@ -37,7 +37,7 @@ color_swatch_new (const gchar *color)
  gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (area), 24);
  gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (area), 24);
  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (area), draw_color, (gpointer) color, NULL);
-  gtk_container_add (GTK_CONTAINER (button), area);
+  gtk_button_set_child (GTK_BUTTON (button), area);

  return button;
 }
@@ -724,9 +724,7 @@ do_flowbox (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Flow Box");
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -735,17 +733,17 @@ 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_container_add (GTK_CONTAINER (scrolled), flowbox);
-      gtk_container_add (GTK_CONTAINER (window), scrolled);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), flowbox);
+      gtk_window_set_child (GTK_WINDOW (window), scrolled);

      for (i = 0; colors[i]; i++)
-        gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));
+        gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), color_swatch_new (colors[i]), -1);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -4,13 +4,12 @@
  <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"/>
@@ -27,18 +26,19 @@
      <object class="GtkBox">
        <child>
          <object class="GtkScrolledWindow">
-            <property name="can-focus">1</property>
            <property name="hscrollbar-policy">never</property>
            <child>
              <object class="GtkViewport">
                <child>
                  <object class="GtkBox">
-                    <property name="margin">10</property>
+                    <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">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,7 +61,6 @@
                            <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>
@@ -109,7 +108,10 @@
            <property name="orientation">vertical</property>
            <property name="hexpand">1</property>
            <property name="vexpand">1</property>
-            <property name="margin">20</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">20</property>
+            <property name="margin-top">20</property>
+            <property name="margin-bottom">20</property>
            <property name="spacing">20</property>
            <child>
              <object class="GtkStack" id="stack">
@@ -25,14 +25,14 @@

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

-static GtkWidget *label;
+static GtkWidget *the_label;
 static GtkWidget *settings;
 static GtkWidget *description;
 static GtkWidget *font;
 static GtkWidget *script_lang;
 static GtkWidget *resetbutton;
 static GtkWidget *stack;
-static GtkWidget *entry;
+static GtkWidget *the_entry;
 static GtkWidget *variations_heading;
 static GtkWidget *variations_grid;
 static GtkWidget *instance_combo;
@@ -194,7 +194,7 @@ add_check_group (GtkWidget   *box,
  pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
  gtk_label_set_attributes (GTK_LABEL (label), attrs);
  pango_attr_list_unref (attrs);
-  gtk_container_add (GTK_CONTAINER (group), label);
+  gtk_box_append (GTK_BOX (group), label);

  for (i = 0; tags[i]; i++)
    {
@@ -211,7 +211,7 @@ add_check_group (GtkWidget   *box,
      g_signal_connect (feat, "notify::inconsistent", G_CALLBACK (update_display), NULL);
      g_signal_connect (feat, "clicked", G_CALLBACK (feat_clicked), NULL);

-      gtk_container_add (GTK_CONTAINER (group), feat);
+      gtk_box_append (GTK_BOX (group), feat);

      item = g_new (FeatureItem, 1);
      item->name = tags[i];
@@ -223,7 +223,7 @@ add_check_group (GtkWidget   *box,
      feature_items = g_list_prepend (feature_items, item);
    }

-  gtk_container_add (GTK_CONTAINER (box), group);
+  gtk_box_append (GTK_BOX (box), group);
 }

 static void
@@ -248,7 +248,7 @@ add_radio_group (GtkWidget *box,
  pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
  gtk_label_set_attributes (GTK_LABEL (label), attrs);
  pango_attr_list_unref (attrs);
-  gtk_container_add (GTK_CONTAINER (group), label);
+  gtk_box_append (GTK_BOX (group), label);

  for (i = 0; tags[i]; i++)
    {
@@ -268,7 +268,7 @@ add_radio_group (GtkWidget *box,
      g_signal_connect (feat, "notify::active", G_CALLBACK (update_display), NULL);
      g_object_set_data (G_OBJECT (feat), "default", group_button);

-      gtk_container_add (GTK_CONTAINER (group), feat);
+      gtk_box_append (GTK_BOX (group), feat);

      item = g_new (FeatureItem, 1);
      item->name = tags[i];
@@ -280,7 +280,7 @@ add_radio_group (GtkWidget *box,
      feature_items = g_list_prepend (feature_items, item);
    }

-  gtk_container_add (GTK_CONTAINER (box), group);
+  gtk_box_append (GTK_BOX (box), group);
 }

 static void
@@ -301,9 +301,9 @@ update_display (void)
  char *font_desc;
  char *features;

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

-  if (gtk_label_get_selection_bounds (GTK_LABEL (label), &ins, &bound))
+  if (gtk_label_get_selection_bounds (GTK_LABEL (the_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 (label), text);
-  gtk_label_set_attributes (GTK_LABEL (label), attrs);
+  gtk_label_set_text (GTK_LABEL (the_label), text);
+  gtk_label_set_attributes (GTK_LABEL (the_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 iter;
+      GtkTreeIter tree_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, &iter, -1,
+      gtk_list_store_insert_with_values (store, &tree_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 = iter;
+          active_iter = tree_iter;
        }
    }

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

  g_hash_table_iter_init (&iter, axes);
  while (g_hash_table_iter_next (&iter, (gpointer *)NULL, (gpointer *)&axis))
@@ -1025,7 +1025,7 @@ denorm_coord (hb_ot_var_axis_info_t *axis, int coord)
 static void
 update_font_variations (void)
 {
-  GtkWidget *child, *next;
+  GtkWidget *child;
  PangoFont *pango_font = NULL;
  hb_font_t *hb_font;
  hb_face_t *hb_face;
@@ -1037,12 +1037,8 @@ update_font_variations (void)
  int i;

  child = gtk_widget_get_first_child (variations_grid);
-  while (child != NULL)
-    {
-      next = gtk_widget_get_next_sibling (child);
-      gtk_widget_destroy (child);
-      child = next;
-    }
+  while ((child = gtk_widget_get_first_child (variations_grid)))
+    gtk_grid_remove (GTK_GRID (variations_grid), child);

  instance_combo = NULL;

@@ -1129,7 +1125,7 @@ font_features_reset_features (void)
 {
  GList *l;

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

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

 static void
@@ -1217,20 +1213,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"));
-      label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
+      the_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"));
-      entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
+      the_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 (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);
+      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);

      add_check_group (feature_list, _("Kerning"), (const char *[]){ "kern", NULL });
      add_check_group (feature_list, _("Ligatures"), (const char *[]){ "liga",
@@ -1333,8 +1329,7 @@ do_font_features (GtkWidget *do_widget)

      font_features_font_changed ();

-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      g_object_unref (builder);

@@ -1344,7 +1339,7 @@ do_font_features (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_window_present (GTK_WINDOW (window));
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -140,17 +140,6 @@ 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,
@@ -161,13 +150,6 @@ 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);
@@ -207,8 +189,6 @@ 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);
@@ -218,13 +198,6 @@ 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
@@ -43,7 +43,6 @@ 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);
@@ -116,6 +115,7 @@ 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++)
            {
@@ -281,7 +281,7 @@ do_fontrendering (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -193,7 +193,7 @@
        <child>
          <object class="GtkScrolledWindow">
            <property name="propagate-natural-height">1</property>
-            <property name="shadow-type">in</property>
+            <property name="has-frame">1</property>
            <property name="hexpand">1</property>
            <property name="vexpand">1</property>
            <child>
@@ -0,0 +1,137 @@
+/* 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_box_append (GTK_BOX (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_box_append (GTK_BOX (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_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&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_box_append (GTK_BOX (box), hbox);
+
+      gears = gtk_gears_new ();
+      gtk_widget_set_hexpand (gears, TRUE);
+      gtk_widget_set_vexpand (gears, TRUE);
+      gtk_box_append (GTK_BOX (hbox), gears);
+
+      for (i = 0; i < GTK_GEARS_N_AXIS; i++)
+        gtk_box_append (GTK_BOX (hbox), create_axis_slider (GTK_GEARS (gears), i));
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
+      gtk_box_set_spacing (GTK_BOX (hbox), 6);
+      gtk_box_append (GTK_BOX (box), hbox);
+
+      gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label));
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}
@@ -17,9 +17,9 @@ typedef struct _Demo Demo;

 struct _Demo
 {
-  gchar *name;
-  gchar *title;
-  gchar *filename;
+  const char *name;
+  const char *title;
+  const char *filename;
  GDoDemoFunc func;
  Demo *children;
 };
@@ -149,11 +149,10 @@ do_gestures (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
      gtk_window_set_title (GTK_WINDOW (window), "Gestures");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

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

      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
                                      drawing_area_draw,
@@ -210,7 +209,7 @@ do_gestures (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -1,4 +1,4 @@
-/* OpenGL Area
+/* OpenGL/OpenGL Area
 *
 * GtkGLArea is a widget that allows custom drawing using OpenGL calls.
 */
@@ -354,7 +354,7 @@ create_axis_slider (int axis)
    }

  label = gtk_label_new (text);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
  gtk_widget_show (label);

  adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0);
@@ -362,7 +362,7 @@ create_axis_slider (int axis)
                    G_CALLBACK (on_axis_value_change),
                    GINT_TO_POINTER (axis));
  slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adj);
-  gtk_container_add (GTK_CONTAINER (box), slider);
+  gtk_box_append (GTK_BOX (box), slider);
  gtk_widget_set_hexpand (slider, TRUE);
  gtk_widget_show (slider);

@@ -383,7 +383,7 @@ close_window (GtkWidget *widget)
  rotation_angles[Z_AXIS] = 0.0;
 }

-GtkWidget *
+static GtkWidget *
 create_glarea_window (GtkWidget *do_widget)
 {
  GtkWidget *window, *box, *button, *controls;
@@ -396,14 +396,17 @@ create_glarea_window (GtkWidget *do_widget)
  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  g_object_set (box, "margin", 12, NULL);
+  gtk_widget_set_margin_start (box, 12);
+  gtk_widget_set_margin_end (box, 12);
+  gtk_widget_set_margin_top (box, 12);
+  gtk_widget_set_margin_bottom (box, 12);
  gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);

  gl_area = gtk_gl_area_new ();
  gtk_widget_set_hexpand (gl_area, TRUE);
  gtk_widget_set_vexpand (gl_area, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), gl_area);
+  gtk_box_append (GTK_BOX (box), gl_area);

  /* We need to initialize and free GL resources, so we use
   * the realize and unrealize signals on the widget
@@ -415,16 +418,16 @@ create_glarea_window (GtkWidget *do_widget)
  g_signal_connect (gl_area, "render", G_CALLBACK (render), NULL);

  controls = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_container_add (GTK_CONTAINER (box), controls);
+  gtk_box_append (GTK_BOX (box), controls);
  gtk_widget_set_hexpand (controls, TRUE);

  for (i = 0; i < N_AXIS; i++)
-    gtk_container_add (GTK_CONTAINER (controls), create_axis_slider (i));
+    gtk_box_append (GTK_BOX (controls), create_axis_slider (i));

  button = gtk_button_new_with_label ("Quit");
  gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
+  gtk_box_append (GTK_BOX (box), button);
+  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);

  return window;
 }
@@ -438,7 +441,7 @@ do_glarea (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (demo_window))
    gtk_widget_show (demo_window);
  else
-    gtk_widget_destroy (demo_window);
+    gtk_window_destroy (GTK_WINDOW (demo_window));

  return demo_window;
 }
@@ -2,9 +2,8 @@
 *
 * GtkHeaderBar is a container that is suitable for implementing
 * window titlebars. One of its features is that it can position
- * a title (and optional subtitle) centered with regard to the
- * full width, regardless of variable-width content at the left
- * or right.
+ * a title 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()
 */
@@ -25,42 +24,41 @@ do_headerbar (GtkWidget *do_widget)
    {
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_title (GTK_WINDOW (window), "Welcome to Facebook - Log in, sign up or learn more");
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
      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_container_add (GTK_CONTAINER (button), image);
+      gtk_button_set_child (GTK_BUTTON (button), image);
      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked");
+      gtk_widget_add_css_class (box, "linked");
      button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
+      gtk_box_append (GTK_BOX (box), button);
      button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
+      gtk_box_append (GTK_BOX (box), button);

      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

      gtk_window_set_titlebar (GTK_WINDOW (window), header);

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

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -0,0 +1,25 @@
+<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>
@@ -17,7 +17,7 @@
 static void
 insert_link (GtkTextBuffer *buffer,
             GtkTextIter   *iter,
-             gchar         *text,
+             const char    *text,
             gint           page)
 {
  GtkTextTag *tag;
@@ -237,9 +237,7 @@ do_hypertext (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      view = gtk_text_view_new ();
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -266,8 +264,8 @@ do_hypertext (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
+      gtk_window_set_child (GTK_WINDOW (window), sw);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);

      show_page (buffer, 1);
    }
@@ -275,7 +273,7 @@ do_hypertext (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -52,7 +52,10 @@ populate_icons (void)

  grid = gtk_grid_new ();
  gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
-  g_object_set (grid, "margin", 10, NULL);
+  gtk_widget_set_margin_start (grid, 10);
+  gtk_widget_set_margin_end (grid, 10);
+  gtk_widget_set_margin_top (grid, 10);
+  gtk_widget_set_margin_bottom (grid, 10);
  gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
  gtk_grid_set_column_spacing (GTK_GRID (grid), 10);

@@ -63,9 +66,9 @@ populate_icons (void)
  hincrement = 0;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_NEVER,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), grid);
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), grid);
 }

 static char *content;
@@ -99,9 +102,9 @@ populate_text (gboolean hilight)
  hincrement = 0;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_NEVER,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), textview);
 }

 static void
@@ -123,9 +126,9 @@ populate_image (void)
  hincrement = 5;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_AUTOMATIC,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), image);
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), image);
 }

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

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

  selected = type;

@@ -207,23 +209,23 @@ do_iconscroll (GtkWidget *do_widget)

      builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+
      scrolledwindow = GTK_WIDGET (gtk_builder_get_object (builder, "scrolledwindow"));
      gtk_widget_realize (window);
      hadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "hadjustment"));
      vadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "vadjustment"));
      set_widget_type (0);
+
+      g_object_unref (builder);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -228,7 +228,7 @@ home_clicked (GtkButton *item,

 static void close_window(void)
 {
-  gtk_widget_destroy (window);
+  gtk_window_destroy (GTK_WINDOW (window));
  window = NULL;

  g_object_unref (file_pixbuf);
@@ -263,28 +263,27 @@ do_iconview (GtkWidget *do_widget)
      load_pixbufs ();

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

      tool_bar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_container_add (GTK_CONTAINER (vbox), tool_bar);
+      gtk_box_append (GTK_BOX (vbox), tool_bar);

      up_button = gtk_button_new_with_mnemonic ("_Up");
      gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-      gtk_container_add (GTK_CONTAINER (tool_bar), up_button);
+      gtk_box_append (GTK_BOX (tool_bar), up_button);

      home_button = gtk_button_new_with_mnemonic ("_Home");
-      gtk_container_add (GTK_CONTAINER (tool_bar), home_button);
+      gtk_box_append (GTK_BOX (tool_bar), home_button);


      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
      gtk_widget_set_vexpand (sw, TRUE);

-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_append (GTK_BOX (vbox), sw);

      /* Create the store and fill it with the contents of '/' */
      parent = g_strdup ("/");
@@ -313,7 +312,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_container_add (GTK_CONTAINER (sw), icon_view);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), icon_view);

      gtk_widget_grab_focus (icon_view);
    }
@@ -321,7 +320,7 @@ do_iconview (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -111,9 +111,7 @@ do_iconview_edit (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      store = create_store ();
      fill_store (store);
@@ -146,13 +144,13 @@ do_iconview_edit (GtkWidget *do_widget)
                                      "text", COL_TEXT,
                                      NULL);

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

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -91,7 +91,7 @@ progressive_timeout (gpointer data)
          g_error_free (error);

          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+                            G_CALLBACK (gtk_window_destroy), NULL);

          g_object_unref (image_stream);
          image_stream = NULL;
@@ -119,7 +119,7 @@ progressive_timeout (gpointer data)
          g_error_free (error);

          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+                            G_CALLBACK (gtk_window_destroy), NULL);

          g_object_unref (image_stream);
          image_stream = NULL;
@@ -152,7 +152,7 @@ progressive_timeout (gpointer data)
              g_error_free (error);

              g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_widget_destroy), NULL);
+                                G_CALLBACK (gtk_window_destroy), NULL);

              gtk_widget_show (dialog);

@@ -189,7 +189,7 @@ progressive_timeout (gpointer data)
              g_error_free (error);

              g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_widget_destroy), NULL);
+                                G_CALLBACK (gtk_window_destroy), NULL);

              gtk_widget_show (dialog);

@@ -223,7 +223,7 @@ progressive_timeout (gpointer data)
          g_error_free (error);

          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+                            G_CALLBACK (gtk_window_destroy), NULL);

          gtk_widget_show (dialog);

@@ -293,24 +293,16 @@ static void
 toggle_sensitivity_callback (GtkWidget *togglebutton,
                             gpointer   user_data)
 {
-  GtkContainer *container = user_data;
-  GList *list;
-  GList *tmp;
+  GtkWidget *child;

-  list = gtk_container_get_children (container);
-
-  tmp = list;
-  while (tmp != NULL)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (user_data));
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
    {
      /* don't disable our toggle */
-      if (GTK_WIDGET (tmp->data) != togglebutton)
-        gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
-                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
-
-      tmp = tmp->next;
+      if (child != togglebutton)
+        gtk_widget_set_sensitive (child, !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
    }
-
-  g_list_free (list);
 }


@@ -335,37 +327,38 @@ do_images (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Images");
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (cleanup_callback), NULL);

      base_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (base_vbox, "margin", 16, NULL);
-      gtk_container_add (GTK_CONTAINER (window), base_vbox);
+      gtk_widget_set_margin_start (base_vbox, 16);
+      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);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
-      gtk_container_add (GTK_CONTAINER (base_vbox), hbox);
+      gtk_box_append (GTK_BOX (base_vbox), hbox);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      gtk_box_append (GTK_BOX (hbox), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Image loaded from a file</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (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);
+      gtk_box_append (GTK_BOX (vbox), frame);

      image = gtk_image_new_from_icon_name ("gtk3-demo");
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);

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


      /* Animation */
@@ -373,98 +366,94 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Animation loaded from a file</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (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);
+      gtk_box_append (GTK_BOX (vbox), frame);

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

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

      /* Symbolic icon */

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Symbolic themed icon</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (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);
+      gtk_box_append (GTK_BOX (vbox), frame);

      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
      image = gtk_image_new_from_gicon (gicon);
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);

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


      /* Progressive */
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      gtk_box_append (GTK_BOX (hbox), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Progressive image loading</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (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);
+      gtk_box_append (GTK_BOX (vbox), frame);

      /* Create an empty image for now; the progressive loader
       * will create the pixbuf and fill it in.
       */
      picture = gtk_picture_new ();
-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      gtk_frame_set_child (GTK_FRAME (frame), picture);

      start_progressive_loading (picture);

      /* Video */
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      gtk_box_append (GTK_BOX (hbox), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Displaying video</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (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);
+      gtk_box_append (GTK_BOX (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_container_add (GTK_CONTAINER (frame), video);
+      gtk_frame_set_child (GTK_FRAME (frame), video);

      /* Widget paintables */
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      gtk_box_append (GTK_BOX (hbox), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>GtkWidgetPaintable</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);

      paintable = gtk_widget_paintable_new (do_widget);
      picture = gtk_picture_new_for_paintable (paintable);
      gtk_widget_set_size_request (picture, 100, 100);
      gtk_widget_set_valign (picture, GTK_ALIGN_START);
-      gtk_container_add (GTK_CONTAINER (vbox), picture);
+      gtk_box_append (GTK_BOX (vbox), picture);

      /* Sensitivity control */
      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_container_add (GTK_CONTAINER (base_vbox), button);
+      gtk_box_append (GTK_BOX (base_vbox), button);

      g_signal_connect (button, "toggled",
                        G_CALLBACK (toggle_sensitivity_callback),
@@ -474,7 +463,7 @@ do_images (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -29,10 +29,8 @@ on_bar_response (GtkInfoBar *info_bar,
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            "Your response has id %d", response_id);

-  g_signal_connect_swapped (dialog,
-                            "response",
-                            G_CALLBACK (gtk_widget_destroy),
-                            dialog);
+  g_signal_connect_swapped (dialog, "response",
+                            G_CALLBACK (gtk_window_destroy), dialog);

  gtk_widget_show (dialog);
 }
@@ -44,7 +42,6 @@ do_infobar (GtkWidget *do_widget)
  GtkWidget *frame;
  GtkWidget *bar;
  GtkWidget *vbox;
-  GtkWidget *vbox2;
  GtkWidget *label;
  GtkWidget *actions;
  GtkWidget *button;
@@ -52,102 +49,104 @@ 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");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      g_object_set (vbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      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_window_set_child (GTK_WINDOW (window), vbox);

      bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (bar), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);

      button = gtk_toggle_button_new_with_label ("Message");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (bar), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);

      button = gtk_toggle_button_new_with_label ("Warning");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);

      bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
      gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
      g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (bar), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
      gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK);

      button = gtk_toggle_button_new_with_label ("Question");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (bar), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);

      button = gtk_toggle_button_new_with_label ("Error");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);

-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (bar), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);

      button = gtk_toggle_button_new_with_label ("Other");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);

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

-      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox2, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (frame), vbox2);
+      gtk_widget_set_halign (actions, GTK_ALIGN_CENTER);

-      /* 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);
+      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);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -1,7 +1,7 @@
 /* Links
 *
 * GtkLabel can show hyperlinks. The default action is to call
- * gtk_show_uri_on_window() on their URI, but it is possible to override
+ * gtk_show_uri() on their URI, but it is possible to override
 * this with a custom handler.
 */

@@ -12,7 +12,7 @@ response_cb (GtkWidget *dialog,
             gint       response_id,
             gpointer   data)
 {
-  gtk_widget_destroy (dialog);
+  gtk_window_destroy (GTK_WINDOW (dialog));
 }

 static gboolean
@@ -30,6 +30,8 @@ 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.");
@@ -56,29 +58,36 @@ 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");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
-                             "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"
+                             "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 "
                             "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_container_add (GTK_CONTAINER (window), label);
+      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_widget_show (label);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -16,10 +16,9 @@ typedef struct
 {
  const gboolean  fixed;
  const guint     number;
-  const gchar    *severity;
-  const gchar    *description;
-}
-Bug;
+  const char     *severity;
+  const char     *description;
+} Bug;

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

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

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

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

 static void
 fixed_toggled (GtkCellRendererToggle *cell,
-               gchar                 *path_str,
+               char                  *path_str,
               gpointer               data)
 {
-  GtkTreeModel *model = (GtkTreeModel *)data;
+  GtkTreeModel *tree_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 (model, &iter, path);
-  gtk_tree_model_get (model, &iter, COLUMN_FIXED, &fixed, -1);
+  gtk_tree_model_get_iter (tree_model, &iter, path);
+  gtk_tree_model_get (tree_model, &iter, COLUMN_FIXED, &fixed, -1);

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

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

  /* clean up */
  gtk_tree_path_free (path);
@@ -156,7 +155,6 @@ 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 ();
@@ -259,24 +257,24 @@ do_list_store (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "List Store");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      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_window_set_child (GTK_WINDOW (window), vbox);

      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);

      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_append (GTK_BOX (vbox), sw);

      /* create tree model */
      model = create_model ();
@@ -289,7 +287,7 @@ do_list_store (GtkWidget *do_widget)

      g_object_unref (model);

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

      /* add columns to the tree view */
      add_columns (GTK_TREE_VIEW (treeview));
@@ -309,7 +307,7 @@ do_list_store (GtkWidget *do_widget)
    }
  else
    {
-      gtk_widget_destroy (window);
+      gtk_window_destroy (GTK_WINDOW (window));
      window = NULL;
      if (timeout != 0)
        {
@@ -351,24 +351,19 @@ do_listbox (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "List Box");
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   400, 600);
-
-      /* NULL window variable when window is closed */
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &window);
+      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
      label = gtk_label_new ("Messages from GTK and friends");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
      gtk_widget_set_vexpand (scrolled, TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), scrolled);
+      gtk_box_append (GTK_BOX (vbox), scrolled);
      listbox = gtk_list_box_new ();
-      gtk_container_add (GTK_CONTAINER (scrolled), listbox);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (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);
@@ -382,7 +377,7 @@ do_listbox (GtkWidget *do_widget)
          message = gtk_message_new (lines[i]);
          row = gtk_message_row_new (message);
          gtk_widget_show (GTK_WIDGET (row));
-          gtk_container_add (GTK_CONTAINER (listbox), GTK_WIDGET (row));
+          gtk_list_box_insert (GTK_LIST_BOX (listbox), GTK_WIDGET (row), -1);
        }

      g_strfreev (lines);
@@ -392,7 +387,7 @@ do_listbox (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -38,10 +38,9 @@
            <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="relief">none</property>
+                <property name="has-frame">0</property>
                <child>
                  <object class="GtkLabel" id="source_name">
                    <property name="valign">baseline</property>
@@ -109,9 +108,8 @@
            <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="relief">none</property>
+                <property name="has-frame">0</property>
                <property name="uri">http://www.gtk.org</property>
              </object>
            </child>
@@ -127,9 +125,8 @@
            <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="relief">none</property>
+                <property name="has-frame">0</property>
                <signal name="clicked" handler="expand_clicked" swapped="yes"/>
              </object>
            </child>
@@ -140,35 +137,31 @@
                <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="relief">none</property>
+                    <property name="has-frame">0</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="relief">none</property>
+                    <property name="has-frame">0</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="relief">none</property>
+                    <property name="has-frame">0</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="relief">none</property>
+                    <property name="has-frame">0</property>
                    <property name="label" translatable="yes">More...</property>
                  </object>
                </child>
@@ -192,7 +185,6 @@
                    <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;
@@ -205,7 +197,6 @@ 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;
@@ -231,9 +222,8 @@ 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="relief">none</property>
+                        <property name="has-frame">0</property>
                        <style>
                          <class name="dim-label"/>
                        </style>
@@ -17,7 +17,7 @@ static gchar *current_file = NULL;

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

 enum {
  NAME_COLUMN,
@@ -55,6 +55,8 @@ 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 (),
@@ -70,7 +72,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—2019 The GTK Team",
+                         "copyright", "© 1997—2020 The GTK Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK widgets",
@@ -99,7 +101,7 @@ activate_quit (GSimpleAction *action,
      win = list->data;
      next = list->next;

-      gtk_widget_destroy (GTK_WIDGET (win));
+      gtk_window_destroy (GTK_WINDOW (win));

      list = next;
    }
@@ -205,14 +207,14 @@ enum {
  STATE_IN_COMMENT
 };

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

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

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

  gtk_text_buffer_create_tag (source_buffer, "source",
                              "font", "monospace",
@@ -570,7 +571,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_container_add (GTK_CONTAINER (sw), image);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), image);

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

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

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

        case 3:
          /* Reading program body */
@@ -876,6 +875,9 @@ 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 ();
        }
    }

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

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

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

  builder = gtk_builder_new ();
  gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);
@@ -1028,9 +1030,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);

@@ -1184,6 +1186,14 @@ 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
@@ -1201,6 +1211,9 @@ 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);
@@ -6,6 +6,10 @@
        <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>
@@ -27,14 +31,12 @@
    </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"/>
@@ -58,37 +60,31 @@
    <child>
      <object class="GtkBox">
        <child>
-          <object class="GtkFrame">
+          <object class="GtkScrolledWindow">
+            <property name="width-request">120</property>
+            <property name="hscrollbar-policy">never</property>
+            <property name="min-content-width">150</property>
            <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>
+              <object class="GtkTreeView" id="treeview">
+                <property name="model">treestore</property>
+                <property name="headers-visible">0</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection">
+                    <property name="mode">browse</property>
+                  </object>
+                </child>
                <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">
-                      <object class="GtkTreeSelection" id="treeview-selection">
-                        <property name="mode">browse</property>
-                      </object>
+                  <object class="GtkTreeViewColumn">
+                    <child>
+                      <object class="GtkCellRendererText"/>
+                      <attributes>
+                        <attribute name="style">4</attribute>
+                        <attribute name="text">1</attribute>
+                      </attributes>
                    </child>
                    <child>
-                      <object class="GtkTreeViewColumn">
-                        <child>
-                          <object class="GtkCellRendererText"/>
-                          <attributes>
-                            <attribute name="style">4</attribute>
-                            <attribute name="text">1</attribute>
-                          </attributes>
-                        </child>
-                        <child>
-                          <object class="GtkCellRendererText">
-                            <property name="text">  </property>
-                          </object>
-                        </child>
+                      <object class="GtkCellRendererText">
+                        <property name="text">  </property>
                      </object>
                    </child>
                  </object>
@@ -97,22 +93,23 @@
            </child>
          </object>
        </child>
+        <child>
+          <object class="GtkSeparator"/>
+        </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>
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
            <child>
              <object class="GtkNotebookPage">
                <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>
@@ -140,10 +137,8 @@
                <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>
@@ -58,12 +58,11 @@ do_markup (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

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

      show_source = gtk_check_button_new_with_label ("Source");
      gtk_widget_set_valign (show_source, GTK_ALIGN_CENTER);
@@ -78,7 +77,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);
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD_CHAR);
      gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 10);
      gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 10);

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

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

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

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

@@ -126,7 +125,7 @@ do_markup (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -14,3 +14,7 @@ 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>
@@ -5,7 +5,7 @@
      <item>
        <attribute name="label" translatable="yes">_New</attribute>
        <attribute name="action">app.new</attribute>
-        <attribute name="accel">&lt;Primary&gt;n</attribute>
+        <attribute name="accel">&lt;Control&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;Primary&gt;s</attribute>
+        <attribute name="accel">&lt;Control&gt;s</attribute>
      </item>
      <item>
        <attribute name="label" translatable="yes">Save _As...</attribute>
        <attribute name="action">app.save-as</attribute>
-        <attribute name="accel">&lt;Primary&gt;s</attribute>
+        <attribute name="accel">&lt;Control&gt;s</attribute>
      </item>
    </section>
    <section>
      <item>
        <attribute name="label" translatable="yes">_Quit</attribute>
        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
+        <attribute name="accel">&lt;Control&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;Primary&gt;r</attribute>
+              <attribute name="accel">&lt;Control&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;Primary&gt;g</attribute>
+              <attribute name="accel">&lt;Control&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;Primary&gt;b</attribute>
+              <attribute name="accel">&lt;Control&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;Primary&gt;s</attribute>
+              <attribute name="accel">&lt;Control&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;Primary&gt;r</attribute>
+              <attribute name="accel">&lt;Control&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;Primary&gt;o</attribute>
+              <attribute name="accel">&lt;Control&gt;o</attribute>
            </item>
          </section>
        </submenu>
        <item>
          <attribute name="label" translatable="yes">_Bold</attribute>
          <attribute name="action">win.bold</attribute>
-          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;b</attribute>
+          <attribute name="accel">&lt;Control&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;Primary&gt;a</attribute>
+        <attribute name="accel">&lt;Control&gt;a</attribute>
      </item>
    </submenu>
  </menu>
@@ -5,7 +5,6 @@ demos = files([
  'assistant.c',
  'builder.c',
  'clipboard.c',
-  'colorsel.c',
  'combobox.c',
  'constraints.c',
  'constraints2.c',
@@ -28,6 +27,7 @@ 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,6 +61,7 @@ demos = files([
  'search_entry.c',
  'search_entry2.c',
  'shortcuts.c',
+  'shortcut_triggers.c',
  'sidebar.c',
  'sizegroup.c',
  'sliding_puzzle.c',
@@ -88,6 +89,7 @@ extra_demo_sources = files(['main.c',
                            'gtkgears.c',
                            'puzzlepiece.c',
                            'bluroverlay.c',
+                            'demoimage.c',
                            'demotaggedentry.c'])

 if harfbuzz_dep.found() and pangoft_dep.found()
@@ -111,9 +113,16 @@ 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,
+           c_args: gtkdemo_args + demo_cflags,
           dependencies: gtkdemo_deps,
           include_directories: confinc,
           gui_app: true,
@@ -122,7 +131,7 @@ executable('gtk4-demo',

 executable('gtk4-demo-application',
           'application.c', gtkdemo_resources,
-           c_args: gtkdemo_args,
+           c_args: gtkdemo_args + common_cflags,
           dependencies: gtkdemo_deps,
           include_directories: confinc,
           gui_app: true,
@@ -43,8 +43,7 @@ do_modelbutton (GtkWidget *do_widget)
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      actions = (GActionGroup*)g_simple_action_group_new ();
      g_action_map_add_action_entries (G_ACTION_MAP (actions),
@@ -59,7 +58,7 @@ do_modelbutton (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));


  return window;
@@ -1,41 +1,50 @@
 <?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>
      <object class="GtkBox">
        <property name="orientation">vertical</property>
-        <property name="margin">80</property>
+        <property name="margin-start">80</property>
+        <property name="margin-end">80</property>
+        <property name="margin-top">80</property>
+        <property name="margin-bottom">80</property>
        <child>
          <object class="GtkMenuButton">
            <property name="popover">thing_a</property>
-            <property name="label">Color</property>
+            <property name="label">_Color</property>
+            <property name="use-underline">1</property>
          </object>
        </child>
        <child>
          <object class="GtkMenuButton">
            <property name="popover">thing_b</property>
-            <property name="label">Flavors</property>
+            <property name="label">_Flavors</property>
+            <property name="use-underline">1</property>
          </object>
        </child>
        <child>
          <object class="GtkMenuButton">
            <property name="popover">thing_c</property>
-            <property name="label">Tools</property>
+            <property name="label">_Tools</property>
+            <property name="use-underline">1</property>
          </object>
        </child>
      </object>
    </child>
  </object>
  <object class="GtkPopover" id="thing_a">
+    <style>
+      <class name="menu"/>
+    </style>
    <child>
      <object class="GtkBox">
-        <property name="margin">10</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkModelButton">
@@ -62,11 +71,12 @@
    </child>
  </object>
  <object class="GtkPopover" id="thing_b">
+    <style>
+      <class name="menu"/>
+    </style>
    <child>
      <object class="GtkBox">
-        <property name="margin">10</property>
        <property name="orientation">vertical</property>
-        <property name="spacing">10</property>
        <child>
          <object class="GtkModelButton">
            <property name="action-name">win.chocolate</property>
@@ -92,11 +102,12 @@
    </child>
  </object>
  <object class="GtkPopover" id="thing_c">
+    <style>
+      <class name="menu"/>
+    </style>
    <child>
      <object class="GtkBox">
-        <property name="margin">10</property>
        <property name="orientation">vertical</property>
-        <property name="spacing">10</property>
        <child>
          <object class="GtkModelButton">
            <property name="text">Hammer</property>
@@ -37,7 +37,7 @@ do_overlay (GtkWidget *do_widget)

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

      entry = gtk_entry_new ();

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

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
      gtk_widget_set_can_target (vbox, FALSE);
+      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_widget_set_valign (vbox, GTK_ALIGN_START);

      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, 50);
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_widget_set_margin_bottom (label, 8);
+      gtk_box_append (GTK_BOX (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, 50);
+      gtk_widget_set_margin_top (entry, 8);
      gtk_widget_set_margin_bottom (entry, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_append (GTK_BOX (vbox), entry);

-      gtk_container_add (GTK_CONTAINER (window), overlay);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -57,12 +57,10 @@ do_overlay2 (GtkWidget *do_widget)
      gtk_text_iter_forward_word_end (&end);
      gtk_text_buffer_apply_tag (buffer, tag, &start, &end);

-      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);
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
+      gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), text);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      image = gtk_picture_new_for_resource ("/overlay2/decor1.png");
      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), image);
@@ -97,7 +95,7 @@ do_overlay2 (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -11,7 +11,7 @@
 static void
 done_cb (GtkDialog *dialog, gint response, gpointer data)
 {
-  gtk_widget_destroy (GTK_WIDGET (dialog));
+  gtk_window_destroy (GTK_WINDOW (dialog));
 }

 GtkWidget *
@@ -22,14 +22,14 @@ do_pagesetup (GtkWidget *do_widget)
  if (!window)
    {
      window = gtk_page_setup_unix_dialog_new ("Page Setup", GTK_WINDOW (do_widget));
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
      g_signal_connect (window, "response", G_CALLBACK (done_cb), NULL);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -47,6 +47,7 @@ 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,
@@ -338,9 +339,10 @@ 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;
 }

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

      draw_area = drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), draw_area);
+      gtk_window_set_child (GTK_WINDOW (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 ();
@@ -403,16 +404,14 @@ do_paint (GtkWidget *toplevel)

      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
      gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
+      gtk_window_set_title (GTK_WINDOW (window), "Paint");
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -164,14 +164,14 @@ do_paintable (GtkWidget *do_widget)

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

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -196,14 +196,14 @@ do_paintable_animated (GtkWidget *do_widget)

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

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -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_container_add (GTK_CONTAINER (window), video);
+      gtk_window_set_child (GTK_WINDOW (window), video);

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

  return window;
 }
@@ -13,75 +13,39 @@

 #include <gtk/gtk.h>

-void
+static void
 toggle_resize (GtkWidget *widget,
               GtkWidget *child)
 {
  GtkWidget *parent;
  GtkPaned *paned;
-  gboolean is_child1;
-  gboolean resize, shrink;

  parent = gtk_widget_get_parent (child);
  paned = GTK_PANED (parent);

-  is_child1 = (child == gtk_paned_get_child1 (paned));
-
-  if (is_child1)
-    g_object_get (paned,
-                  "resize-child1", &resize,
-                  "shrink-child1", &shrink,
-                  NULL);
+  if (child == gtk_paned_get_start_child (paned))
+    gtk_paned_set_resize_start_child (paned, !gtk_paned_get_resize_start_child (paned));
  else
-    g_object_get (paned,
-                  "resize-child2", &resize,
-                  "shrink-child2", &shrink,
-                  NULL);
-
-  g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (parent), child);
-  if (is_child1)
-    gtk_paned_pack1 (paned, child, !resize, shrink);
-  else
-    gtk_paned_pack2 (paned, child, !resize, shrink);
-  g_object_unref (child);
+    gtk_paned_set_resize_end_child (paned, !gtk_paned_get_resize_end_child (paned));
 }

-void
+static void
 toggle_shrink (GtkWidget *widget,
               GtkWidget *child)
 {
  GtkWidget *parent;
  GtkPaned *paned;
-  gboolean is_child1;
-  gboolean resize, shrink;

  parent = gtk_widget_get_parent (child);
  paned = GTK_PANED (parent);

-  is_child1 = (child == gtk_paned_get_child1 (paned));
-
-  if (is_child1)
-    g_object_get (paned,
-                  "resize-child1", &resize,
-                  "shrink-child1", &shrink,
-                  NULL);
+  if (child == gtk_paned_get_start_child (paned))
+    gtk_paned_set_shrink_start_child (paned, !gtk_paned_get_shrink_start_child (paned));
  else
-    g_object_get (paned,
-                  "resize-child2", &resize,
-                  "shrink-child2", &shrink,
-                  NULL);
-
-  g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (parent), child);
-  if (is_child1)
-    gtk_paned_pack1 (paned, child, resize, !shrink);
-  else
-    gtk_paned_pack2 (paned, child, resize, !shrink);
-  g_object_unref (child);
+    gtk_paned_set_shrink_end_child (paned, !gtk_paned_get_shrink_end_child (paned));
 }

-GtkWidget *
+static GtkWidget *
 create_pane_options (GtkPaned    *paned,
                     const gchar *frame_label,
                     const gchar *label1,
@@ -93,14 +57,17 @@ create_pane_options (GtkPaned    *paned,
  GtkWidget *label;
  GtkWidget *check_button;

-  child1 = gtk_paned_get_child1 (paned);
-  child2 = gtk_paned_get_child2 (paned);
+  child1 = gtk_paned_get_start_child (paned);
+  child2 = gtk_paned_get_end_child (paned);

  frame = gtk_frame_new (frame_label);
-  g_object_set (frame, "margin", 4, NULL);
+  gtk_widget_set_margin_start (frame, 4);
+  gtk_widget_set_margin_end (frame, 4);
+  gtk_widget_set_margin_top (frame, 4);
+  gtk_widget_set_margin_bottom (frame, 4);

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

  label = gtk_label_new (label1);
  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
@@ -149,49 +116,47 @@ do_panes (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");

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

      vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      g_object_set (vpaned, "margin", 5, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), vpaned);
+      gtk_widget_set_margin_start (vpaned, 5);
+      gtk_widget_set_margin_end (vpaned, 5);
+      gtk_widget_set_margin_top (vpaned, 5);
+      gtk_widget_set_margin_bottom (vpaned, 5);
+      gtk_box_append (GTK_BOX (vbox), vpaned);

      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
+      gtk_paned_set_start_child (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);
+      gtk_paned_set_start_child (GTK_PANED (hpaned), frame);

      button = gtk_button_new_with_mnemonic ("_Hi there");
-      gtk_container_add (GTK_CONTAINER(frame), button);
+      gtk_frame_set_child (GTK_FRAME (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);
+      gtk_paned_set_end_child (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);
+      gtk_paned_set_end_child (GTK_PANED (vpaned), frame);

      /* Now create toggle buttons to control sizing */

-      gtk_container_add (GTK_CONTAINER (vbox),
+      gtk_box_append (GTK_BOX (vbox),
                          create_pane_options (GTK_PANED (hpaned),
                                               "Horizontal",
                                               "Left",
                                               "Right"));

-      gtk_container_add (GTK_CONTAINER (vbox),
+      gtk_box_append (GTK_BOX (vbox),
                          create_pane_options (GTK_PANED (vpaned),
                                               "Vertical",
                                               "Top",
@@ -201,7 +166,7 @@ do_panes (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -40,17 +40,19 @@ 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",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-      g_object_set (box, "margin", 18, NULL);
-      gtk_container_add (GTK_CONTAINER (window), box);
+      gtk_widget_set_margin_start (box, 18);
+      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);

      entry = gtk_password_entry_new ();
      gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry), TRUE);
@@ -59,7 +61,7 @@ do_password_entry (GtkWidget *do_widget)
                    "activates-default", TRUE,
                    NULL);
      g_signal_connect (entry, "notify::text", G_CALLBACK (update_button), NULL);
-      gtk_container_add (GTK_CONTAINER (box), entry);
+      gtk_box_append (GTK_BOX (box), entry);

      entry2 = gtk_password_entry_new ();
      gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry2), TRUE);
@@ -68,11 +70,11 @@ do_password_entry (GtkWidget *do_widget)
                    "activates-default", TRUE,
                    NULL);
      g_signal_connect (entry2, "notify::text", G_CALLBACK (update_button), NULL);
-      gtk_container_add (GTK_CONTAINER (box), entry2);
+      gtk_box_append (GTK_BOX (box), entry2);

      button = gtk_button_new_with_mnemonic ("_Done");
-      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_add_css_class (button, "suggested-action");
+      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
      gtk_widget_set_sensitive (button, FALSE);
      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);

@@ -82,7 +84,7 @@ do_password_entry (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));

  return window;
 }
@@ -0,0 +1,354 @@
+/* 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_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&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_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}
--- a/Show More
+++ b/Show More