node-editor: Don't use the ::query-tooltip signal

Use the vfunc, the signal is going away.
inspector: Don't use the ::query-tooltip signal
2020-05-09 23:24:59 -04:00 · 2020-05-09 22:49:55 -04:00 · 2020-05-09 22:31:00 -04:00 · 2020-05-09 22:31:00 -04:00 · 2020-05-09 22:30:59 -04:00 · 2020-05-09 22:30:59 -04:00
2258 changed files with 170137 additions and 281680 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,13 +16,8 @@ stages:

 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "--fatal-meson-warnings -Dgtk:werror=true"
-  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
-  FEATURE_FLAGS: "-Dcloudproviders=true"
-  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v22"
-  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
-  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"
+  COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
+  MESON_TEST_TIMEOUT_MULTIPLIER: 2

 .only-default:
  only:
@@ -32,91 +27,76 @@ variables:

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

-.build-fedora-default:
-  image: $FEDORA_IMAGE
+fedora-x86_64:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
+  stage: build
+  variables:
+    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
+  script:
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
+            -Dx11-backend=true
+            -Dwayland-backend=true
+            -Dbroadway-backend=true
+            -Dvulkan=yes
+            -Dprofiler=true
+            _build
+    - ninja -C _build
+    - .gitlab-ci/run-tests.sh _build
  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"
+        - "${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"
+      - "${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:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
-  script:
-    - meson subprojects update
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-            -Dprofiler=true
-            _build
-    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build x11
-    - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build broadway
+    <<: *cache-paths

 release-build:
-  extends: .build-fedora-default
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
  stage: build
-  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
-    - meson subprojects update
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
+            -Dx11-backend=true
+            -Dwayland-backend=true
+            -Dbroadway-backend=true
+            -Dvulkan=yes
            _build
    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build x11
-
-installed-tests:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
-  script:
-    - meson subprojects update
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-            _build
-    - ninja -C _build
-    - sudo ninja -C _build install
-    - dbus-run-session xvfb-run -a -s "-screen 0 1024x768x24"
-            gnome-desktop-testing-runner
-                   --report-directory=_build/installed-tests-report/failed/
-                   --parallel=0
-                   gtk-4.0
+    - .gitlab-ci/run-tests.sh _build
  artifacts:
+    when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report.xml"
+    name: "gtk-${CI_COMMIT_REF_NAME}"
    paths:
-      - "_build/installed-tests-report/"
+      - "${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

-
-.mingw-defaults:
+.mingw-defaults: &mingw-defaults
  stage: build
  tags:
    - win32-ps
@@ -125,23 +105,16 @@ installed-tests:
    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
  cache:
    key: "$CI_JOB_NAME"
-    paths:
-      - _ccache/
-      - subprojects/gdk-pixbuf/
-      - subprojects/glib/
-      - subprojects/graphene/
-      - subprojects/libepoxy/
-      - subprojects/pango/
+    <<: *cache-paths

-msys2-mingw64:
-  extends: .mingw-defaults
-  needs: []
+msys2-mingw32:
  variables:
-    MSYSTEM: "MINGW64"
+    MSYSTEM: "MINGW32"
    CHERE_INVOKING: "yes"
+  <<: *mingw-defaults

-.flatpak-defaults:
-  image: $FLATPAK_IMAGE
+.flatpak-defaults: &flatpak-defaults
+  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
  stage: flatpak
  allow_failure: true
  tags:
@@ -154,56 +127,49 @@ msys2-mingw64:
    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"

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

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

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

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

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

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

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

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

 static-scan:
-  image: $FEDORA_IMAGE
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
  stage: analysis
-  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=debug"
  script:
@@ -214,27 +180,9 @@ static-scan:
      - _scan_build/meson-logs
  allow_failure: true

-# Run tests with the address sanitizer. We need to turn off introspection,
-# since it is incompatible with asan
-asan-build:
-  image: $FEDORA_IMAGE
-  tags: [ asan ]
-  stage: analysis
-  needs: []
-  variables:
-  script:
-    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
-    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build wayland
-  artifacts:
-    paths:
-      - _build/meson-logs
-  allow_failure: true
-
 reference:
-  image: $DOCS_IMAGE
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
  stage: docs
-  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
@@ -250,7 +198,6 @@ reference:

 pages:
  stage: deploy
-  needs: ['reference']
  script:
    - mv _reference/ public/
  artifacts:
--- a/.gitlab-ci/.lock
+++ b/.gitlab-ci/.lock
--- a/.gitlab-ci/README.md
+++ b/.gitlab-ci/README.md
@@ -35,13 +35,4 @@ branch, as well as their available versions.
 - [ ] Add the new job to `.gitlab-ci.yml` referencing the image
 - [ ] Open a merge request with your changes and let it run

-### Checklist for Adding a new dependency to a CI image
-
-Our images are layered, and the base (called fedora-base) contains
-all the rpm payload. Therefore, adding a new dependency is a 2-step
-process:
-
- 1. [ ] Build and upload fedora-base:$version+1
- 1. [ ] Build and upload fedora:$version+1 based on fedora-base:version+1
-
 [registry]: https://gitlab.gnome.org/GNOME/gtk/container_registry
--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -1,90 +0,0 @@
-FROM fedora:31
-
-RUN dnf -y install \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    clang \
-    clang-analyzer \
-    colord-devel \
-    cups-devel \
-    dbus-daemon \
-    dbus-x11 \
-    dejavu-sans-mono-fonts \
-    desktop-file-utils \
-    diffutils \
-    elfutils-libelf-devel \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    git \
-    glib2-devel \
-    glib2-static \
-    glibc-devel \
-    glibc-headers \
-    gnome-desktop-testing \
-    gobject-introspection-devel \
-    graphene-devel \
-    gstreamer1-devel \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-base-devel \
-    gtk-doc \
-    hicolor-icon-theme \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    lcov \
-    libasan \
-    libattr-devel \
-    libepoxy-devel \
-    libffi-devel \
-    libmount-devel \
-    librsvg2 \
-    libselinux-devel \
-    libubsan \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    libXtst-devel \
-    libxslt \
-    mesa-dri-drivers \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    ninja-build \
-    pango-devel \
-    pcre-devel \
-    pcre-static \
-    python3 \
-    python3-jinja2 \
-    python3-pip \
-    python3-pygments \
-    python3-wheel \
-    redhat-rpm-config \
-    sassc \
-    systemtap-sdt-devel \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    weston \
-    weston-libs \
-    which \
-    xorg-x11-server-Xvfb \
- && dnf clean all
-
-RUN pip3 install meson==0.53.1
-
--- a/.gitlab-ci/fedora-docs.Dockerfile
+++ b/.gitlab-ci/fedora-docs.Dockerfile
@@ -1,12 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
-
-RUN dnf -y install pandoc
-
-ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-
-USER user
-WORKDIR /home/user
-
-ENV LANG C.UTF-8
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,11 +1,92 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v21
+FROM fedora:31

-# Enable sudo for wheel users
-RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
+RUN dnf -y install \
+    adwaita-icon-theme \
+    atk-devel \
+    at-spi2-atk-devel \
+    avahi-gobject-devel \
+    cairo-devel \
+    cairo-gobject-devel \
+    ccache \
+    clang \
+    clang-analyzer \
+    colord-devel \
+    cups-devel \
+    dbus-daemon \
+    dbus-x11 \
+    dejavu-sans-mono-fonts \
+    desktop-file-utils \
+    diffutils \
+    elfutils-libelf-devel \
+    fribidi-devel \
+    gcc \
+    gcc-c++ \
+    gdk-pixbuf2-devel \
+    gdk-pixbuf2-modules \
+    gettext \
+    git \
+    glib2-devel \
+    glib2-static \
+    glibc-devel \
+    glibc-headers \
+    gobject-introspection-devel \
+    graphene-devel \
+    gstreamer1-devel \
+    gstreamer1-plugins-good \
+    gstreamer1-plugins-bad-free-devel \
+    gstreamer1-plugins-base-devel \
+    gtk-doc \
+    hicolor-icon-theme \
+    iso-codes \
+    itstool \
+    json-glib-devel \
+    lcov \
+    libattr-devel \
+    libepoxy-devel \
+    libffi-devel \
+    libmount-devel \
+    librsvg2 \
+    libselinux-devel \
+    libXcomposite-devel \
+    libXcursor-devel \
+    libXcursor-devel \
+    libXdamage-devel \
+    libXfixes-devel \
+    libXi-devel \
+    libXinerama-devel \
+    libxkbcommon-devel \
+    libXrandr-devel \
+    libXrender-devel \
+    libXtst-devel \
+    libxslt \
+    mesa-dri-drivers \
+    mesa-libEGL-devel \
+    mesa-libwayland-egl-devel \
+    ninja-build \
+    pango-devel \
+    pcre-devel \
+    pcre-static \
+    python3 \
+    python3-jinja2 \
+    python3-pip \
+    python3-pygments \
+    python3-wheel \
+    redhat-rpm-config \
+    sassc \
+    sysprof-devel \
+    systemtap-sdt-devel \
+    vulkan-devel \
+    wayland-devel \
+    wayland-protocols-devel \
+    which \
+    xorg-x11-server-Xvfb \
+ && dnf clean all
+
+RUN pip3 install meson==0.53.1

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user

 USER user
 WORKDIR /home/user
--- a/.gitlab-ci/meson-html-report.py
+++ b/.gitlab-ci/meson-html-report.py
@@ -138,13 +138,12 @@ ul.images li {
 </head>
 <body>
  <header>
-    <h1>{{ report.project_name }}/{{ report.backend }}/{{ report.branch_name }} :: Test Reports</h1>
+    <h1>{{ report.project_name }}/{{ 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 %}
@@ -260,9 +259,6 @@ 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)
@@ -323,7 +319,6 @@ 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
--- a/.gitlab-ci/meson-junit-report.py
+++ b/.gitlab-ci/meson-junit-report.py
@@ -19,9 +19,6 @@ 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')
@@ -95,18 +92,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', '{}/{}'.format(args.backend, unit['name']))
+        testcase.set('name', 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', '{}/{}'.format(args.backend, unit['name']))
+        testcase.set('name', unit['name'])
        testcase.set('time', str(unit['duration']))

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

--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -81,7 +81,7 @@ fi

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

@@ -95,7 +95,7 @@ if [ ! -x "$(command -v docker)" ] || [ docker --help |& grep -q podman ]; then
 else
        echo "Using: Docker"
        format=""
-        CMD="sudo docker"
+        CMD="sudo socker"
 fi

 REGISTRY="registry.gitlab.gnome.org"
--- a/.gitlab-ci/run-style-check-diff.sh
+++ b/.gitlab-ci/run-style-check-diff.sh
@@ -4,15 +4,8 @@ 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.
-if [ "${CI_PROJECT_NAMESPACE}" != "GNOME" ]; then
-    echo "Retrieving the current upstream repository from ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}..."
-    git remote add upstream https://gitlab.gnome.org/GNOME/gtk.git
-    git fetch upstream
-    ORIGIN="upstream"
-else
-    echo "Reusing the existing repository on ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}"
-    ORIGIN="origin"
-fi
+git remote add upstream https://gitlab.gnome.org/GNOME/gtk.git
+git fetch upstream

 # Work out the newest common ancestor between the detached HEAD that this CI job
 # has checked out, and the upstream target branch (which will typically be
@@ -20,7 +13,7 @@ fi
 #
 # `${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 "${ORIGIN}/${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=$?

--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -5,78 +5,30 @@ set +e

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

-# Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp
-
-case "${backend}" in
-  x11)
-    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
-          meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+export GDK_BACKEND=x11
+xvfb-run -a -s "-screen 0 1024x768x24" \
+        meson test -C ${builddir} \
                --print-errorlogs \
-                --setup=${backend} \
                --suite=gtk \
-                --no-suite=gsk-compare-broadway
+                --no-suite=gtk:a11y

-    # 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 --idle-time=0 &
-    compositor=$!
-    export WAYLAND_DISPLAY=wayland-5
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --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} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --no-suite=gsk-compare-opengl
-
-    # don't let Broadway failures fail the run, for now
-    exit_code=0
-    kill ${server}
-    ;;
-esac
+# Store the exit code for the CI run, but always
+# generate the reports
+exit_code=$?

 cd ${builddir}

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

 exit $exit_code
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -33,29 +33,14 @@ pacman --noconfirm -S --needed \
    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
    mingw-w64-$MSYS2_ARCH-shared-mime-info

+# https://gitlab.gnome.org/GNOME/gtk/issues/2243
+wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
+pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
+
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"

-# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
-# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002
-
-if ! pkg-config --atleast-version=2.65.0 glib-2.0; then
-    git clone https://gitlab.gnome.org/GNOME/glib.git _glib
-    meson setup _glib_build _glib
-    meson compile -C _glib_build
-    meson install -C _glib_build
-fi
-pkg-config --modversion glib-2.0
-
-if ! pkg-config --atleast-version=1.45.4 pango; then
-    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
-    meson setup _pango_build _pango
-    meson compile -C _pango_build
-    meson install -C _pango_build
-fi
-pkg-config --modversion pango
-
 # Build
 ccache --zero-stats
 ccache --show-stats
@@ -68,7 +53,7 @@ meson \
    -Dwin32-backend=true \
    -Dvulkan=no \
    -Dintrospection=false \
-    -Dgtk:werror=true \
+    --werror \
    _build
 unset CCACHE_DISABLE

--- a/317
+++ b/317
@@ -1,320 +1,3 @@
-Overview of Changes in GTK 3.99.1
-=================================
-
-* GtkGridLayout: Rename left-/top-attach to column/row
-
-* Drop GtkAccelLabel - it is no longer used
-
-* GtkTextView:
- - Fix redraw issues with selections
- - Make insert-emoji replace the selection
-
-* GtkTreeView:
- - Fix selection handling in cell editables
-
-* CSS:
- - Hexadecimal colors can now specify alpha
-
-* Documentation:
- - Refresh the widget gallery
- - Add images for new widgets to the gallery
- - Fix many cross-references
-
-* Demos:
- - Numerous crash- and bug fixes
-
-* Fix build with cups < 2.3
-
-* win32:
- - Default to the GL renderer when we can
-
-* Translation updates:
-  Catalan
-  Polish
-  Romanian
-  Spanish
-  Ukrainian
-
-
-Overview of Changes in GTK 3.99.0
-=================================
-
-* Remove the old accessibility implementation and
-  add the foundations for a new one that is based
-  on ARIA. The relevant widget api is GtkAccessible,
-  the backend implementations will use GtkATContext.
-  Currently, there is just a nascent test backend.
-
-* Update the GTK headers to use char *, int, float and
-  double instead of the corresponding GLib types.
-
-* Add GtkEditableLabel, a label that can be edited
-
-* Add GtkBookmarkList, a list model for bookmarks
-
-* Add GtkStringList, a list model for strings
-
-* Add GtkBitset, and use it for representing selections
-
-* GtkTreeView:
- - Make cell editing work again
-
-* GtkSpinButton:
- - Make autosizing work again
-
-* Printing:
- - Use GtkDropDown in the print dialog
-
-* GtkApplication
- - Support opening files on OS X
-
-* GtkFileChooser:
- - Fix libcloudproviders support
- - Turn GtkFileFilter into a GtkFilter
- - Simplify the api
-
-* GtkGridView, GtkListView:
- - Improve scrolling behavior
- - Autoscroll and autoexpand during DND
-
-* GtkScrolledWindow:
- - Make autoscrolling work again
-
-* GtkFilterListModel:
- - Add incremental filtering
- - Add a boolean filter, GtkBoolFilter
-
-* GtkSortListModel:
- - Use timsort
- - Add various tweaks that massively speed up sorting
- - Add incremental sorting
-
-* GtkWidget:
- - Massively speed up action handling
-
-* GtkEntry:
- - Make entry completion work again
- - Drop action support from GtkEntryCompletion
-
-* Inspector:
- - Improve list model support
- - Add direct navigation between objects
- - Show accessibility information
-
-* GDK:
- - Compress scroll events
- - Keep a scroll history
- - Clean up GdkDevice api
- - Drop the master/slave device split
- - Move axes to GdkDeviceTool
- - Change monitor workarea to be per-backend API
- - Improve frame clock accuracy
- - Add a new macOS backend
- - Add an ANGLE-based GLES renderer for Windows
-
-* GSK:
- - Use GL_ARB_framebuffer_object
-
-* gtk-demo:
- - Add incremental refill to the color grid
- - Improve performance of the color grid
- - Add an incrementally filtering word list
- - Improve the sidebar
-
-* Install print-editor as another demo
-
-* Translation updates
- Basque
- Catalan
- Chinese
- Japanese
- Kazakh
- Lithuanian
- Polish
- Romanian
- Spanish
- Turkish
- Ukrainian
-
-
-Overview of Changes in GTK 3.98.5
-=================================
-
-* Introduce new list widgets and supporting infrastructure.
-  The main APIs are:
- - GtkListView
- - GtkGridView
- - GtkColumnView and GtkColumnViewColumn
- - GtkDropDown
- - GtkListItemFactory and implementations
- - GtkExpression
- - GtkFilter and subclasses, and GtkFilterListModel
- - GtkSorter and subclasses, and GtkSortListModel
- - GtkSelectionModel and subclasses
- - GtkTreeListModel, GtkTreeExpander and GtkTreeListRowSorter
-
-* GtkFileChooser:
- - Add a tracker3-based search engine implementation
- - Rate-limit updates from the trash monitor
-
-* GtkWindow:
- - Redo the css node setup. There is now a single 'window' node
- - Fix rounded corners on tiled windows
-
-* GtkApplication:
- - Drop app menu support. Menubar support is still there
-
-* GtkFixed:
- - Change coordinate APIs to take doubles
-
-* GtkOverlay:
- - Make GtkOverlayLayout public
-
-* GtkTooltips:
- - Fix line wrapping of tooltips
-
-* Shortcuts:
- - Fix mnemonic cycling
- - Fix using '0' as a mnemonic
-
-* Menus:
- - Differentiate keypad keys in accelerators
-
-* GtkIMContext:
- - Add gtk_im_context_filter_key to allow event reinjection
-
-* Themes:
- - Adwaita: Limit the scope of backdrop
-
-* Accessibility:
- - Clean up and reorganize the code to prepare for the
-   dropping of ATK
-
-* GDK:
- - Drop unused enum and struct definitions from headers
- - Make keymap translation API public again. Still needed
- - Frameclock: Always use compositor refresh rate info
- - Frameclock: Use quadratic correction for frame time jitter
- - Frameclock: Ensure monotonicity
- - Frameclock: Track resason for paint
- - X11: Improve sync when the Nvidia driver is used
-
-* GSK:
- - GL renderer: Fix blurred outset shadows
- - GL renderer: handle nested transform nodes properly
- - GL renderer: Optimize clip handling
-
-* gtk-demo:
- - Improve the Drag-and-Drop demo with proper drag icons
- - Don't show the main window if --run is given
- - Add demos for list widgets and GtkDropDrown
-
-* Documentation:
- - Convert freestanding sections to markdown
- - Drop the glossary
- - Expand and improve the migration guide
-
-* Build:
- - We require pandoc now, for building the documentation
- - Require Pango 1.45
-
-* Translation updates:
- Polish
- Romanian
- Slovenian
- Turkish
- Ukrainian
-
-
-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
 =================================

--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ building for:
  - [Pango](https://download.gnome.org/sources/pango)
  - [Epoxy](https://github.com/anholt/libepoxy)
  - [Graphene](https://github.com/ebassi/graphene)
+  - [ATK](https://download.gnome.org/sources/atk)
  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)

 If you are building the X11 backend, you will also need:
@@ -69,6 +70,7 @@ If you are building the X11 backend, you will also need:
    - xcursor
    - xdamage
    - xcomposite
+  - [atk-bridge-2.0](https://download.gnome.org/sources/at-spi2-atk)

 If you are building the Wayland backend, you will also need:

--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -1,38 +1,29 @@
 {
-    "app-id" : "org.gtk.Demo4",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-demo",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
+    "app-id": "org.gtk.Demo4",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "gtk4-demo",
+    "tags": ["devel", "development", "nightly"],
+    "desktop-file-name-prefix": "(Development) ",
+    "finish-args": [
        "--device=dri",
        "--share=ipc",
        "--socket=fallback-x11",
        "--socket=wayland",
-        "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
    ],
-    "cleanup" : [
+    "cleanup": [
        "/include",
-        "/lib/pkgconfig",
-        "/share/pkgconfig",
+        "/lib/pkgconfig", "/share/pkgconfig",
        "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "*.la",
-        ".a",
+        "/man", "/share/man", "/share/gtk-doc",
+        "*.la", ".a",
        "/lib/girepository-1.0",
        "/share/gir-1.0",
        "/share/doc"
    ],
-    "modules" : [
+    "modules": [
        {
            "name" : "wayland",
            "buildsystem" : "autotools",
@@ -48,18 +39,18 @@
            ]
        },
        {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
+            "name": "graphene",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
                "--libdir=/app/lib",
                "-Dtests=false",
                "-Dbenchmarks=false"
            ],
-            "sources" : [
+            "sources": [
                {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
+                    "type": "git",
+                    "url": "https://github.com/ebassi/graphene.git"
                }
            ]
        },
@@ -67,7 +58,7 @@
            "name" : "libsass",
            "buildsystem" : "meson",
            "builddir" : true,
-            "config-opts" : [
+            "config-opts": [
                "--libdir=/app/lib"
            ],
            "sources" : [
@@ -82,7 +73,7 @@
            "name" : "sassc",
            "buildsystem" : "meson",
            "builddir" : true,
-            "config-opts" : [
+            "config-opts": [
                "--libdir=/app/lib"
            ],
            "sources" : [
@@ -94,25 +85,18 @@
            ]
        },
        {
-            "name" : "gtk",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized"
+            "name": "gtk",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
+                "--libdir=/app/lib"
            ],
-            "sources" : [
+            "sources": [
                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
                }
            ]
        }
-    ],
-    "build-options" : {
-        "env" : {
-            "GSK_RENDERER" : "opengl"
-        }
-    }
+    ]
 }
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -1,38 +1,29 @@
 {
-    "app-id" : "org.gtk.IconBrowser4",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-icon-browser",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
+    "app-id": "org.gtk.IconBrowser4",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "gtk4-icon-browser",
+    "tags": ["devel", "development", "nightly"],
+    "desktop-file-name-prefix": "(Development) ",
+    "finish-args": [
        "--device=dri",
        "--share=ipc",
        "--socket=fallback-x11",
        "--socket=wayland",
-        "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
    ],
-    "cleanup" : [
+    "cleanup": [
        "/include",
-        "/lib/pkgconfig",
-        "/share/pkgconfig",
+        "/lib/pkgconfig", "/share/pkgconfig",
        "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "*.la",
-        ".a",
+        "/man", "/share/man", "/share/gtk-doc",
+        "*.la", ".a",
        "/lib/girepository-1.0",
        "/share/gir-1.0",
        "/share/doc"
    ],
-    "modules" : [
+    "modules": [
        {
            "name" : "wayland",
            "buildsystem" : "autotools",
@@ -48,18 +39,18 @@
            ]
        },
        {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
+            "name": "graphene",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
                "--libdir=/app/lib",
                "-Dtests=false",
                "-Dbenchmarks=false"
            ],
-            "sources" : [
+            "sources": [
                {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
+                    "type": "git",
+                    "url": "https://github.com/ebassi/graphene.git"
                }
            ]
        },
@@ -67,7 +58,7 @@
            "name" : "libsass",
            "buildsystem" : "meson",
            "builddir" : true,
-            "config-opts" : [
+            "config-opts": [
                "--libdir=/app/lib"
            ],
            "sources" : [
@@ -82,7 +73,7 @@
            "name" : "sassc",
            "buildsystem" : "meson",
            "builddir" : true,
-            "config-opts" : [
+            "config-opts": [
                "--libdir=/app/lib"
            ],
            "sources" : [
@@ -94,24 +85,18 @@
            ]
        },
        {
-            "name" : "gtk",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized"
+            "name": "gtk",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
+                "--libdir=/app/lib"
            ],
-            "sources" : [
+            "sources": [
                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
                }
            ]
        }
-    ],
-    "build-options" : {
-        "env" : {
-        }
-    }
+    ]
 }
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -1,38 +1,29 @@
 {
-    "app-id" : "org.gtk.WidgetFactory4",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gtk4-widget-factory",
-    "tags" : [
-        "devel",
-        "development",
-        "nightly"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
+    "app-id": "org.gtk.WidgetFactory4",
+    "runtime": "org.gnome.Platform",
+    "runtime-version": "master",
+    "sdk": "org.gnome.Sdk",
+    "command": "gtk4-widget-factory",
+    "tags": ["devel", "development", "nightly"],
+    "desktop-file-name-prefix": "(Development) ",
+    "finish-args": [
        "--device=dri",
        "--share=ipc",
        "--socket=fallback-x11",
        "--socket=wayland",
-        "--talk-name=org.gtk.vfs",
-        "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
    ],
-    "cleanup" : [
+    "cleanup": [
        "/include",
-        "/lib/pkgconfig",
-        "/share/pkgconfig",
+        "/lib/pkgconfig", "/share/pkgconfig",
        "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "*.la",
-        ".a",
+        "/man", "/share/man", "/share/gtk-doc",
+        "*.la", ".a",
        "/lib/girepository-1.0",
        "/share/gir-1.0",
        "/share/doc"
    ],
-    "modules" : [
+    "modules": [
        {
            "name" : "wayland",
            "buildsystem" : "autotools",
@@ -48,18 +39,18 @@
            ]
        },
        {
-            "name" : "graphene",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
+            "name": "graphene",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
                "--libdir=/app/lib",
                "-Dtests=false",
                "-Dbenchmarks=false"
            ],
-            "sources" : [
+            "sources": [
                {
-                    "type" : "git",
-                    "url" : "https://github.com/ebassi/graphene.git"
+                    "type": "git",
+                    "url": "https://github.com/ebassi/graphene.git"
                }
            ]
        },
@@ -67,7 +58,7 @@
            "name" : "libsass",
            "buildsystem" : "meson",
            "builddir" : true,
-            "config-opts" : [
+            "config-opts": [
                "--libdir=/app/lib"
            ],
            "sources" : [
@@ -82,7 +73,7 @@
            "name" : "sassc",
            "buildsystem" : "meson",
            "builddir" : true,
-            "config-opts" : [
+            "config-opts": [
                "--libdir=/app/lib"
            ],
            "sources" : [
@@ -94,28 +85,18 @@
            ]
        },
        {
-            "name" : "gtk",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib",
-                "-Denable_vulkan=no",
-                "-Dbuildtype=debugoptimized"
+            "name": "gtk",
+            "buildsystem": "meson",
+            "builddir": true,
+            "config-opts": [
+                "--libdir=/app/lib"
            ],
-            "sources" : [
+            "sources": [
                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
                }
            ]
        }
-    ],
-    "build-options" : {
-        "env" : {
-            "DBUS_SESSION_BUS_ADDRESS" : "''",
-            "GSK_RENDERER" : "opengl",
-            "GDK_DEBUG" : "vulkan-disable",
-            "G_ENABLE_DEBUG" : "true"
-        }
-    }
+    ]
 }
--- a/build-aux/meson/post-install.py
+++ b/build-aux/meson/post-install.py
@@ -15,13 +15,7 @@ if 'DESTDIR' not in os.environ:
    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')

    print('Compiling GSettings schemas...')
-    glib_compile_schemas = subprocess.check_output(['pkg-config',
-                                                   '--variable=glib_compile_schemas',
-                                                   'gio-2.0']).strip()
-    if not os.path.exists(glib_compile_schemas):
-        # pkg-config variables only available since GLib 2.62.0.
-        glib_compile_schemas = 'glib-compile-schemas'
-    subprocess.call([glib_compile_schemas,
+    subprocess.call(['glib-compile-schemas',
                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])

    print('Updating icon cache...')
@@ -30,14 +24,8 @@ if 'DESTDIR' not in os.environ:

    print('Updating module cache for print backends...')
    os.makedirs(gtk_printmodule_dir, exist_ok=True)
-    gio_querymodules = subprocess.check_output(['pkg-config',
-                                                '--variable=gio_querymodules',
-                                                'gio-2.0']).strip()
-    if not os.path.exists(gio_querymodules):
-        # pkg-config variables only available since GLib 2.62.0.
-        gio_querymodules = 'gio-querymodules'
-    subprocess.call([gio_querymodules, gtk_printmodule_dir])
+    subprocess.call(['gio-querymodules', gtk_printmodule_dir])

    print('Updating module cache for input methods...')
    os.makedirs(gtk_immodule_dir, exist_ok=True)
-    subprocess.call([gio_querymodules, gtk_immodule_dir])
+    subprocess.call(['gio-querymodules', gtk_immodule_dir])
--- a/config.h.meson
+++ b/config.h.meson
@@ -27,6 +27,14 @@
 /* Define to 1 if you have the `dcgettext' function. */
 #mesondefine HAVE_DCGETTEXT

+/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
+   */
+#mesondefine HAVE_DECL_ISINF
+
+/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
+   */
+#mesondefine HAVE_DECL_ISNAN
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #mesondefine HAVE_DLFCN_H

@@ -72,6 +80,9 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #mesondefine HAVE_MMAP

+/* Define to 1 if you have the `nearbyint' function. */
+#mesondefine HAVE_NEARBYINT
+
 /* Define to 1 if you have the `posix_fallocate' function. */
 #mesondefine HAVE_POSIX_FALLOCATE

@@ -81,9 +92,21 @@
 /* Have the Xrandr 1.5 extension library */
 #mesondefine HAVE_RANDR15

+/* Define to 1 if you have the `rint' function. */
+#mesondefine HAVE_RINT
+
+/* Define to 1 if you have the `round' function. */
+#mesondefine HAVE_ROUND
+
 /* Define to 1 if you have the `sincos' function. */
 #mesondefine HAVE_SINCOS

+/* Define to 1 if you have the `log2` function */
+#mesondefine HAVE_LOG2
+
+/* Define to 1 if you ahve the `exp2` function */
+#mesondefine HAVE_EXP2
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #mesondefine HAVE_STDINT_H

@@ -272,6 +295,3 @@
 #mesondefine HAVE_PANGOFT

 #mesondefine ISO_CODES_PREFIX
-
-/* Define if tracker3 is available */
-#mesondefine HAVE_TRACKER3
--- a/demos/constraint-editor/constraint-editor-application.c
+++ b/demos/constraint-editor/constraint-editor-application.c
@@ -81,11 +81,11 @@ constraint_editor_application_activate (GApplication *app)
 static void
 constraint_editor_application_open (GApplication  *app,
                                    GFile        **files,
-                                    int            n_files,
-                                    const char    *hint)
+                                    gint           n_files,
+                                    const gchar   *hint)
 {
  ConstraintEditorWindow *win;
-  int i;
+  gint i;

  for (i = 0; i < n_files; i++)
    {
--- a/demos/constraint-editor/constraint-editor-window.c
+++ b/demos/constraint-editor/constraint-editor-window.c
@@ -193,7 +193,7 @@ constraint_editor_window_load (ConstraintEditorWindow *self,

 static void
 open_response_cb (GtkNativeDialog        *dialog,
-                  int                     response,
+                  gint                    response,
                  ConstraintEditorWindow *self)
 {
  gtk_native_dialog_hide (dialog);
@@ -285,7 +285,7 @@ serialize_model (GListModel *list)

 static void
 save_response_cb (GtkNativeDialog        *dialog,
-                  int                     response,
+                  gint                    response,
                  ConstraintEditorWindow *self)
 {
  gtk_native_dialog_hide (dialog);
@@ -317,7 +317,7 @@ save_response_cb (GtkNativeDialog        *dialog,
                                                   "Saving failed");
          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog),
                                                    "%s", error->message);
-          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
          gtk_widget_show (message_dialog);
          g_error_free (error);
        }
@@ -403,7 +403,7 @@ constraint_editor_done (ConstraintEditor *editor,

  g_clear_object (&old_constraint);

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

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

 static void
@@ -487,6 +487,8 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
  GObjectClass *object_class = G_OBJECT_CLASS (class);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);

+  g_type_ensure (CONSTRAINT_VIEW_TYPE);
+
  object_class->finalize = constraint_editor_window_finalize;

  gtk_widget_class_set_template_from_resource (widget_class,
@@ -605,8 +607,8 @@ create_widget_func (gpointer item,
  gtk_widget_set_margin_bottom (label, 10);
  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
  gtk_widget_set_hexpand (label, TRUE);
-  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_container_add (GTK_CONTAINER (box), label);

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

  g_free (freeme);
--- a/demos/constraint-editor/constraint-editor-window.ui
+++ b/demos/constraint-editor/constraint-editor-window.ui
@@ -9,6 +9,7 @@
    <property name="default-height">768</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
+        <property name="show-title-buttons">1</property>
        <child type="start">
          <object class="GtkButton">
            <property name="icon-name">document-open-symbolic</property>
--- a/demos/constraint-editor/constraint-editor.ui
+++ b/demos/constraint-editor/constraint-editor.ui
@@ -13,8 +13,8 @@
          <object class="GtkLabel">
            <property name="label">Target</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -23,8 +23,8 @@
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <signal name="changed" handler="update_button" swapped="yes"/>
            <layout>
-              <property name="column">1</property>
-              <property name="row">1</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -32,8 +32,8 @@
          <object class="GtkComboBoxText" id="target_attr">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
-              <property name="column">2</property>
-              <property name="row">1</property>
+              <property name="left-attach">2</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -41,8 +41,8 @@
          <object class="GtkLabel">
            <property name="label">Relation</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">2</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
            </layout>
          </object>
        </child>
@@ -50,8 +50,8 @@
          <object class="GtkComboBoxText" id="relation">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
-              <property name="column">1</property>
-              <property name="row">2</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
            </layout>
          </object>
        </child>
@@ -59,8 +59,8 @@
          <object class="GtkLabel">
            <property name="label">Source</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">3</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
@@ -69,8 +69,8 @@
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <signal name="changed" handler="update_button" swapped="yes"/>
            <layout>
-              <property name="column">1</property>
-              <property name="row">3</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
@@ -79,8 +79,8 @@
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <signal name="changed" handler="source_attr_changed" swapped="yes"/>
            <layout>
-              <property name="column">2</property>
-              <property name="row">3</property>
+              <property name="left-attach">2</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
@@ -88,8 +88,8 @@
          <object class="GtkLabel">
            <property name="label">Multiplier</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">4</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">4</property>
            </layout>
          </object>
        </child>
@@ -97,8 +97,8 @@
          <object class="GtkEntry" id="multiplier">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
-              <property name="column">1</property>
-              <property name="row">4</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">4</property>
            </layout>
          </object>
        </child>
@@ -106,8 +106,8 @@
          <object class="GtkLabel">
            <property name="label">Constant</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">5</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">5</property>
            </layout>
          </object>
        </child>
@@ -115,8 +115,8 @@
          <object class="GtkEntry" id="constant">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
-              <property name="column">1</property>
-              <property name="row">5</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">5</property>
            </layout>
          </object>
        </child>
@@ -124,16 +124,16 @@
          <object class="GtkLabel">
            <property name="label">Strength</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">6</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">6</property>
            </layout>
          </object>
        </child>
        <child>
          <object class="GtkComboBoxText" id="strength">
            <layout>
-              <property name="column">1</property>
-              <property name="row">6</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">6</property>
            </layout>
          </object>
        </child>
@@ -141,8 +141,8 @@
          <object class="GtkLabel" id="preview">
            <property name="xalign">0</property>
            <layout>
-              <property name="column">1</property>
-              <property name="row">7</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">7</property>
              <property name="column-span">2</property>
            </layout>
            <attributes>
@@ -155,8 +155,8 @@
            <property name="label">Create</property>
            <signal name="clicked" handler="create_constraint"/>
            <layout>
-              <property name="column">2</property>
-              <property name="row">8</property>
+              <property name="left-attach">2</property>
+              <property name="top-attach">8</property>
            </layout>
          </object>
        </child>
--- a/demos/constraint-editor/constraint-view.c
+++ b/demos/constraint-editor/constraint-view.c
@@ -169,30 +169,28 @@ constraint_view_init (ConstraintView *self)
  GListModel *guides;
  GListModel *children;
  GListModel *constraints;
-  GtkFilter *filter;

  manager = gtk_constraint_layout_new ();
  gtk_widget_set_layout_manager (GTK_WIDGET (self), manager);

-  guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
-
-  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
-  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
-  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, filter);
-
  all_children = gtk_widget_observe_children (GTK_WIDGET (self));
-  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
-  children = (GListModel *)gtk_filter_list_model_new (all_children, filter);
+  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
+  guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
+  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, omit_internal, NULL, NULL);
+  children = (GListModel *)gtk_filter_list_model_new (all_children, omit_internal, NULL, NULL);

  list = g_list_store_new (G_TYPE_LIST_MODEL);
  g_list_store_append (list, children);
  g_list_store_append (list, guides);
  g_list_store_append (list, constraints);
+  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_TYPE_OBJECT, G_LIST_MODEL (list)));
  g_object_unref (children);
  g_object_unref (guides);
  g_object_unref (constraints);
+  g_object_unref (all_children);
+  g_object_unref (all_constraints);
+  g_object_unref (list);

-  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (list)));

  controller = (GtkEventController *)gtk_gesture_drag_new ();
  g_signal_connect (controller, "drag-begin", G_CALLBACK (drag_begin), self);
--- a/demos/constraint-editor/constraint-view.h
+++ b/demos/constraint-editor/constraint-view.h
@@ -23,7 +23,6 @@

 #define CONSTRAINT_VIEW_TYPE (constraint_view_get_type ())

-G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE (ConstraintView, constraint_view, CONSTRAINT, VIEW, GtkWidget)

 ConstraintView * constraint_view_new (void);
--- a/demos/constraint-editor/guide-editor.c
+++ b/demos/constraint-editor/guide-editor.c
@@ -184,6 +184,58 @@ max_input (GtkSpinButton *spin_button,
  return FALSE;
 }

+static gboolean
+min_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  double value;
+  GtkWidget *box, *text;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  value = gtk_adjustment_get_value (adjustment);
+
+  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
+  text = gtk_widget_get_first_child (box);
+
+  if (value == 0.0)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
+      return TRUE;
+    }
+  else
+    {
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
+      return FALSE;
+    }
+}
+
+static gboolean
+max_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  double value;
+  GtkWidget *box, *text;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  value = gtk_adjustment_get_value (adjustment);
+
+  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
+  text = gtk_widget_get_first_child (box);
+
+  if (value == (double)G_MAXINT)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
+      return TRUE;
+    }
+  else
+    {
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
+      return FALSE;
+    }
+}
+
 static void
 guide_editor_constructed (GObject *object)
 {
@@ -192,12 +244,16 @@ guide_editor_constructed (GObject *object)
  guide_strength_combo (editor->strength);

  g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
+  g_signal_connect (editor->min_width, "output", G_CALLBACK (min_output), NULL);

  g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
+  g_signal_connect (editor->min_height, "output", G_CALLBACK (min_output), NULL);

  g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
+  g_signal_connect (editor->max_width, "output", G_CALLBACK (max_output), NULL);

  g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
+  g_signal_connect (editor->max_height, "output", G_CALLBACK (max_output), NULL);

  if (editor->guide)
    {
--- a/demos/constraint-editor/guide-editor.ui
+++ b/demos/constraint-editor/guide-editor.ui
@@ -55,8 +55,8 @@
          <object class="GtkLabel">
            <property name="label">Name</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
            </layout>
          </object>
        </child>
@@ -64,8 +64,8 @@
          <object class="GtkEntry" id="name">
            <property name="max-width-chars">20</property>
            <layout>
-              <property name="column">1</property>
-              <property name="row">0</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -74,8 +74,8 @@
          <object class="GtkLabel">
            <property name="label">Min Size</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -84,8 +84,8 @@
            <property name="adjustment">min_width_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="column">1</property>
-              <property name="row">1</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -94,8 +94,8 @@
            <property name="adjustment">min_height_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="column">2</property>
-              <property name="row">1</property>
+              <property name="left-attach">2</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -103,8 +103,8 @@
          <object class="GtkLabel">
            <property name="label">Nat Size</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">2</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
            </layout>
          </object>
        </child>
@@ -113,8 +113,8 @@
            <property name="adjustment">nat_width_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="column">1</property>
-              <property name="row">2</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">2</property>
            </layout>
          </object>
        </child>
@@ -123,8 +123,8 @@
            <property name="adjustment">nat_height_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="column">2</property>
-              <property name="row">2</property>
+              <property name="left-attach">2</property>
+              <property name="top-attach">2</property>
            </layout>
          </object>
        </child>
@@ -132,8 +132,8 @@
          <object class="GtkLabel">
            <property name="label">Max Size</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">3</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
@@ -142,8 +142,8 @@
            <property name="adjustment">max_width_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="column">1</property>
-              <property name="row">3</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
@@ -152,8 +152,8 @@
            <property name="adjustment">max_height_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="column">2</property>
-              <property name="row">3</property>
+              <property name="left-attach">2</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
@@ -161,16 +161,16 @@
          <object class="GtkLabel">
            <property name="label">Strength</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">4</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">4</property>
            </layout>
          </object>
        </child>
        <child>
          <object class="GtkComboBoxText" id="strength">
            <layout>
-              <property name="column">1</property>
-              <property name="row">4</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">4</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -180,8 +180,8 @@
            <property name="label">Create</property>
            <signal name="clicked" handler="create_guide"/>
            <layout>
-              <property name="column">2</property>
-              <property name="row">5</property>
+              <property name="left-attach">2</property>
+              <property name="top-attach">5</property>
            </layout>
          </object>
        </child>
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -1,3 +1,4 @@
+
 #include "config.h"

 #include <gtk/gtk.h>
@@ -33,7 +34,7 @@ static void create_window (GApplication *app, const char *contents);
 static void
 show_action_dialog (GSimpleAction *action)
 {
-  const char *name;
+  const gchar *name;
  GtkWidget *dialog;

  name = g_action_get_name (G_ACTION (action));
@@ -46,7 +47,7 @@ show_action_dialog (GSimpleAction *action)
                                    name);

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

  gtk_widget_show (dialog);
 }
@@ -57,9 +58,9 @@ show_action_infobar (GSimpleAction *action,
                     gpointer       data)
 {
  DemoApplicationWindow *window = data;
-  char *text;
-  const char *name;
-  const char *value;
+  gchar *text;
+  const gchar *name;
+  const gchar *value;

  name = g_action_get_name (G_ACTION (action));
  value = g_variant_get_string (parameter, NULL);
@@ -91,7 +92,7 @@ activate_new (GSimpleAction *action,

 static void
 open_response_cb (GtkNativeDialog *dialog,
-                  int              response_id,
+                  gint             response_id,
                  gpointer         user_data)
 {
  GtkFileChooserNative *native = user_data;
@@ -119,7 +120,7 @@ open_response_cb (GtkNativeDialog *dialog,
                                                   "Error loading file: \"%s\"",
                                                   error->message);
          g_signal_connect (message_dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);
          gtk_widget_show (message_dialog);
          g_error_free (error);
        }
@@ -184,7 +185,7 @@ activate_about (GSimpleAction *action,
 {
  GtkWidget *window = user_data;

-  const char *authors[] = {
+  const gchar *authors[] = {
    "Peter Mattis",
    "Spencer Kimball",
    "Josh MacDonald",
@@ -192,7 +193,7 @@ activate_about (GSimpleAction *action,
    NULL
  };

-  const char *documentors[] = {
+  const gchar *documentors[] = {
    "Owen Taylor",
    "Tony Gale",
    "Matthias Clasen <mclasen@redhat.com>",
@@ -233,7 +234,7 @@ activate_quit (GSimpleAction *action,
      win = list->data;
      next = list->next;

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

      list = next;
    }
@@ -243,9 +244,9 @@ static void
 update_statusbar (GtkTextBuffer         *buffer,
                  DemoApplicationWindow *window)
 {
-  char *msg;
-  int row, col;
-  int count;
+  gchar *msg;
+  gint row, col;
+  gint count;
  GtkTextIter iter;

  /* clear any previous message, underflow is allowed */
@@ -327,14 +328,19 @@ static void
 startup (GApplication *app)
 {
  GtkBuilder *builder;
+  GMenuModel *appmenu;
+  GMenuModel *menubar;

  G_APPLICATION_CLASS (demo_application_parent_class)->startup (app);

  builder = gtk_builder_new ();
  gtk_builder_add_from_resource (builder, "/application_demo/menus.ui", NULL);

-  gtk_application_set_menubar (GTK_APPLICATION (app),
-                               G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
+  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
+  menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
+
+  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
+  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);

  g_object_unref (builder);
 }
@@ -347,7 +353,6 @@ create_window (GApplication *app,

  window = (DemoApplicationWindow *)g_object_new (demo_application_window_get_type (),
                                                  "application", app,
-                                                  "show-menubar", TRUE,
                                                  NULL);
  if (content)
    gtk_text_buffer_set_text (window->buffer, content, -1);
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -31,8 +31,8 @@
              </object>
            </child>
            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
            </layout>
          </object>
        </child>
@@ -54,8 +54,8 @@
              </object>
            </child>
            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -70,8 +70,8 @@
              </object>
            </child>
            <layout>
-              <property name="column">0</property>
-              <property name="row">2</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
            </layout>
          </object>
        </child>
@@ -79,8 +79,8 @@
          <object class="GtkStatusbar" id="status">
            <property name="hexpand">1</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">3</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
--- a/demos/gtk-demo/application_demo.c
+++ b/demos/gtk-demo/application_demo.c
@@ -16,8 +16,8 @@ static GtkWidget *placeholder;

 static void
 on_name_appeared (GDBusConnection *connection,
-                  const char      *name,
-                  const char      *name_owner,
+                  const gchar     *name,
+                  const gchar     *name_owner,
                  gpointer         user_data)
 {
  name_seen = TRUE;
@@ -25,13 +25,18 @@ on_name_appeared (GDBusConnection *connection,

 static void
 on_name_vanished (GDBusConnection *connection,
-                  const char      *name,
+                  const gchar     *name,
                  gpointer         user_data)
 {
  if (!name_seen)
    return;

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

 #ifdef G_OS_WIN32
@@ -55,7 +60,7 @@ do_application_demo (GtkWidget *toplevel)

  if (placeholder == NULL)
    {
-      const char *command;
+      const gchar *command;
      GError *error = NULL;

      if (g_file_test ("./gtk4-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
--- a/demos/gtk-demo/appmenu.ui
+++ b/demos/gtk-demo/appmenu.ui
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <menu id="appmenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="accel">&lt;Control&gt;q</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -12,7 +12,7 @@ static GtkWidget *progress_bar = NULL;
 static gboolean
 apply_changes_gradually (gpointer data)
 {
-  double fraction;
+  gdouble fraction;

  /* Work, work, work... */
  fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress_bar));
@@ -26,7 +26,7 @@ apply_changes_gradually (gpointer data)
  else
    {
      /* Close automatically once changes are fully applied. */
-      gtk_window_destroy (GTK_WINDOW (data));
+      gtk_widget_destroy (data);
      return G_SOURCE_REMOVE;
    }
 }
@@ -41,14 +41,14 @@ on_assistant_apply (GtkWidget *widget, gpointer data)
 static void
 on_assistant_close_cancel (GtkWidget *widget, gpointer data)
 {
-  gtk_window_destroy (GTK_WINDOW (widget));
+  gtk_widget_destroy (widget);
 }

 static void
 on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
 {
-  int current_page, n_pages;
-  char *title;
+  gint current_page, n_pages;
+  gchar *title;

  current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (widget));
  n_pages = gtk_assistant_get_n_pages (GTK_ASSISTANT (widget));
@@ -70,8 +70,8 @@ on_entry_changed (GtkWidget *widget, gpointer data)
 {
  GtkAssistant *assistant = GTK_ASSISTANT (data);
  GtkWidget *current_page;
-  int page_number;
-  const char *text;
+  gint page_number;
+  const gchar *text;

  page_number = gtk_assistant_get_current_page (assistant);
  current_page = gtk_assistant_get_nth_page (assistant, page_number);
@@ -95,12 +95,12 @@ create_page1 (GtkWidget *assistant)
  gtk_widget_set_margin_bottom (box, 12);

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

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

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

  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
@@ -178,7 +178,8 @@ do_assistant (GtkWidget *do_widget)

      gtk_window_set_display (GTK_WINDOW (assistant),
                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (assistant), (gpointer *)&assistant);
+      g_signal_connect (assistant, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &assistant);

      create_page1 (assistant);
      create_page2 (assistant);
@@ -198,7 +199,7 @@ do_assistant (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (assistant))
    gtk_widget_show (assistant);
  else
-    gtk_window_destroy (GTK_WINDOW (assistant));
+    gtk_widget_destroy (assistant);

  return assistant;
 }
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -18,8 +18,8 @@
              <class name="dim-label"/>
            </style>
            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
            </layout>
          </object>
        </child>
@@ -29,8 +29,8 @@
            <property name="has-frame">1</property>
            <property name="min-content-width">150</property>
            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -40,8 +40,8 @@
            <property name="hexpand">1</property>
            <property name="stack">stack</property>
            <layout>
-              <property name="column">1</property>
-              <property name="row">0</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
            </layout>
          </object>
        </child>
@@ -67,8 +67,8 @@
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Duck</property>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
                        </layout>
                      </object>
                    </child>
@@ -76,8 +76,8 @@
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Background</property>
                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">0</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
                        </layout>
                      </object>
                    </child>
@@ -87,8 +87,8 @@
                          <class name="duck"/>
                        </style>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
                        </layout>
                      </object>
                    </child>
@@ -98,8 +98,8 @@
                          <class name="gradient"/>
                        </style>
                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">1</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
                        </layout>
                      </object>
                    </child>
@@ -108,8 +108,8 @@
                        <property name="label" translatable="yes">
 Blended picture</property>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">2</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
                          <property name="column-span">2</property>
                        </layout>
                      </object>
@@ -121,8 +121,8 @@ Blended picture</property>
                          <class name="blend0"/>
                        </style>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">3</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
                          <property name="column-span">2</property>
                        </layout>
                      </object>
@@ -146,8 +146,8 @@ Blended picture</property>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Red</property>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
                        </layout>
                      </object>
                    </child>
@@ -155,8 +155,8 @@ Blended picture</property>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Blue</property>
                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">0</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
                        </layout>
                      </object>
                    </child>
@@ -166,8 +166,8 @@ Blended picture</property>
                          <class name="red"/>
                        </style>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
                        </layout>
                      </object>
                    </child>
@@ -177,8 +177,8 @@ Blended picture</property>
                          <class name="blue"/>
                        </style>
                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">1</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
                        </layout>
                      </object>
                    </child>
@@ -187,8 +187,8 @@ Blended picture</property>
                        <property name="label" translatable="yes">
 Blended picture</property>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">2</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
                          <property name="column-span">2</property>
                        </layout>
                      </object>
@@ -200,8 +200,8 @@ Blended picture</property>
                          <class name="blend1"/>
                        </style>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">3</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
                          <property name="column-span">2</property>
                        </layout>
                      </object>
@@ -228,8 +228,8 @@ Blended picture</property>
                          <class name="cyan"/>
                        </style>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">1</property>
                        </layout>
                      </object>
                    </child>
@@ -239,8 +239,8 @@ Blended picture</property>
                          <class name="magenta"/>
                        </style>
                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">1</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">1</property>
                        </layout>
                      </object>
                    </child>
@@ -250,8 +250,8 @@ Blended picture</property>
                          <class name="yellow"/>
                        </style>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">3</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">3</property>
                        </layout>
                      </object>
                    </child>
@@ -262,8 +262,8 @@ Blended picture</property>
                          <class name="blend2"/>
                        </style>
                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">3</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">3</property>
                        </layout>
                      </object>
                    </child>
@@ -275,8 +275,8 @@ Blended picture</property>
                          <class name="dim-label"/>
                        </style>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">0</property>
                        </layout>
                      </object>
                    </child>
@@ -288,8 +288,8 @@ Blended picture</property>
                          <class name="dim-label"/>
                        </style>
                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">0</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">0</property>
                        </layout>
                      </object>
                    </child>
@@ -301,8 +301,8 @@ Blended picture</property>
                          <class name="dim-label"/>
                        </style>
                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">2</property>
+                          <property name="left-attach">0</property>
+                          <property name="top-attach">2</property>
                        </layout>
                      </object>
                    </child>
@@ -314,8 +314,8 @@ Blended picture</property>
                          <attribute name="weight" value="bold"></attribute>
                        </attributes>
                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">2</property>
+                          <property name="left-attach">1</property>
+                          <property name="top-attach">2</property>
                        </layout>
                      </object>
                    </child>
@@ -324,8 +324,8 @@ Blended picture</property>
              </object>
            </child>
            <layout>
-              <property name="column">1</property>
-              <property name="row">1</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
--- a/demos/gtk-demo/bluroverlay.c
+++ b/demos/gtk-demo/bluroverlay.c
@@ -132,10 +132,10 @@ blur_overlay_child_update_style_classes (BlurOverlay *overlay,
  gboolean is_left, is_right, is_top, is_bottom;
  gboolean has_left, has_right, has_top, has_bottom;

-  has_left = gtk_widget_has_css_class (child, "left");
-  has_right = gtk_widget_has_css_class (child, "right");
-  has_top = gtk_widget_has_css_class (child, "top");
-  has_bottom = gtk_widget_has_css_class (child, "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;

@@ -158,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_widget_remove_css_class (child, "left");
+    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_LEFT);
  else if (!has_left && is_left)
-    gtk_widget_add_css_class (child, "left");
+    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_LEFT);

  if (has_right && !is_right)
-    gtk_widget_remove_css_class (child, "right");
+    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_RIGHT);
  else if (!has_right && is_right)
-    gtk_widget_add_css_class (child, "right");
+    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_RIGHT);

  if (has_top && !is_top)
-    gtk_widget_remove_css_class (child, "top");
+    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_TOP);
  else if (!has_top && is_top)
-    gtk_widget_add_css_class (child, "top");
+    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_TOP);

  if (has_bottom && !is_bottom)
-    gtk_widget_remove_css_class (child, "bottom");
+    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_BOTTOM);
  else if (!has_bottom && is_bottom)
-    gtk_widget_add_css_class (child, "bottom");
+    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_BOTTOM);
 }

 static void
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -12,7 +12,7 @@ quit_activate (GSimpleAction *action,
 {
  GtkWidget *window = user_data;

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

 static void
@@ -21,38 +21,13 @@ about_activate (GSimpleAction *action,
                gpointer       user_data)
 {
  GtkWidget *window = user_data;
+  GtkBuilder *builder;
  GtkWidget *about_dlg;

-  about_dlg = GTK_WIDGET (g_object_get_data (G_OBJECT (window), "about"));
-  gtk_window_present (GTK_WINDOW (about_dlg));
-}
-
-static void
-remove_timeout (gpointer data)
-{
-  guint id = GPOINTER_TO_UINT (data);
-
-  g_source_remove (id);
-}
-
-static gboolean
-pop_status (gpointer data)
-{
-  gtk_statusbar_pop (GTK_STATUSBAR (data), 0);
-  g_object_set_data (G_OBJECT (data), "timeout", NULL);
-  return G_SOURCE_REMOVE;
-}
-
-static void
-status_message (GtkStatusbar *status,
-                const char   *text)
-{
-  guint id;
-
-  gtk_statusbar_push (GTK_STATUSBAR (status), 0, text);
-  id = g_timeout_add (5000, pop_status, status);
-
-  g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
+  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);
 }

 static void
@@ -60,10 +35,7 @@ help_activate (GSimpleAction *action,
               GVariant      *parameter,
               gpointer       user_data)
 {
-  GtkWidget *status;
-
-  status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (GTK_STATUSBAR (status), "Help not available");
+  g_print ("Help not available\n");
 }

 static void
@@ -71,13 +43,7 @@ not_implemented (GSimpleAction *action,
                 GVariant      *parameter,
                 gpointer       user_data)
 {
-  GtkWidget *status;
-  char *text;
-
-  text = g_strdup_printf ("Action “%s” not implemented", g_action_get_name (G_ACTION (action)));
-  status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (GTK_STATUSBAR (status), text);
-  g_free (text);
+  g_print ("Action “%s” not implemented\n", g_action_get_name (G_ACTION (action)));
 }

 static GActionEntry win_entries[] = {
@@ -102,38 +68,27 @@ do_builder (GtkWidget *do_widget)
  if (!window)
    {
      GtkBuilder *builder;
-      GtkWidget *about;
-      GtkWidget *status;

      builder = gtk_builder_new_from_resource ("/builder/demo.ui");

      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      actions = (GActionGroup*)g_simple_action_group_new ();
      g_action_map_add_action_entries (G_ACTION_MAP (actions),
                                       win_entries, G_N_ELEMENTS (win_entries),
                                       window);
      gtk_widget_insert_action_group (window, "win", actions);

-      about = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
-      gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (window));
-      gtk_window_set_hide_on_close (GTK_WINDOW (about), TRUE);
-      g_signal_connect (about, "response", G_CALLBACK (gtk_widget_hide), NULL);
-      g_object_set_data_full (G_OBJECT (window), "about",
-                              about, (GDestroyNotify)gtk_window_destroy);
-
-      status = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar1"));
-      g_object_set_data (G_OBJECT (window), "status", status);
-
-      g_object_unref (builder);
+      g_object_set_data_full (G_OBJECT(window), "builder", builder, g_object_unref);
    }

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

  return window;
 }
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -69,7 +69,7 @@ paste_received (GObject      *source_object,
                                       "Could not paste text: %s",
                                       error->message);
      g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_window_destroy), NULL);
+                        G_CALLBACK (gtk_widget_destroy), NULL);
      gtk_widget_show (dialog);

      g_error_free (error);
@@ -108,7 +108,9 @@ do_clipboard (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_widget_set_margin_start (vbox, 8);
@@ -120,72 +122,72 @@ do_clipboard (GtkWidget *do_widget)

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

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

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

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

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

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

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

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

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

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

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

      /* Create the first image */
      image = demo_image_new ("dialog-warning");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);

      /* Create the second image */
      image = demo_image_new ("process-stop");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);

      /* Create the third image */
      image = demo_image_new ("weather-clear");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);
    }

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

  return window;
 }
--- a/demos/gtk-demo/color.names.txt
+++ b/demos/gtk-demo/color.names.txt
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -38,7 +38,7 @@ create_icon_store (void)

  GtkTreeIter iter;
  GtkListStore *store;
-  int i;
+  gint i;

  store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);

@@ -77,7 +77,7 @@ set_sensitive (GtkCellLayout   *cell_layout,
               gpointer         data)
 {
  GtkTreePath *path;
-  int *indices;
+  gint *indices;
  gboolean sensitive;

  path = gtk_tree_model_get_path (tree_model, iter);
@@ -175,7 +175,7 @@ create_capital_store (void)

  GtkTreeIter iter, iter2;
  GtkTreeStore *store;
-  int i;
+  gint i;

  store = gtk_tree_store_new (1, G_TYPE_STRING);

@@ -315,7 +315,9 @@ do_combobox (GtkWidget *do_widget)
    gtk_window_set_display (GTK_WINDOW (window),
                            gtk_widget_get_display (do_widget));
    gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");
-    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &window);

    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
    gtk_widget_set_margin_start (vbox, 10);
@@ -328,7 +330,7 @@ do_combobox (GtkWidget *do_widget)
     *  insensitive rows
     */
    frame = gtk_frame_new ("Items with icons");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_widget_set_margin_start (box, 5);
@@ -340,7 +342,7 @@ do_combobox (GtkWidget *do_widget)
    model = create_icon_store ();
    combo = gtk_combo_box_new_with_model (model);
    g_object_unref (model);
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);

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

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_widget_set_margin_start (box, 5);
@@ -384,7 +386,7 @@ do_combobox (GtkWidget *do_widget)
    model = create_capital_store ();
    combo = gtk_combo_box_new_with_model (model);
    g_object_unref (model);
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);

    renderer = gtk_cell_renderer_text_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
@@ -403,7 +405,7 @@ do_combobox (GtkWidget *do_widget)

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

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_widget_set_margin_start (box, 5);
@@ -414,7 +416,7 @@ do_combobox (GtkWidget *do_widget)

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

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

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

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_widget_set_margin_start (box, 5);
@@ -436,19 +438,19 @@ do_combobox (GtkWidget *do_widget)
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);

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

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

  return window;
 }
--- a/demos/gtk-demo/constraints.c
+++ b/demos/gtk-demo/constraints.c
@@ -25,9 +25,9 @@ simple_grid_dispose (GObject *object)
 {
  SimpleGrid *self = SIMPLE_GRID (object);

-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);

  G_OBJECT_CLASS (simple_grid_parent_class)->dispose (object);
 }
@@ -263,7 +263,8 @@ do_constraints (GtkWidget *do_widget)
     header = gtk_header_bar_new ();
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
     gtk_window_set_child (GTK_WINDOW (window), box);
@@ -271,19 +272,19 @@ do_constraints (GtkWidget *do_widget)
     grid = g_object_new (simple_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);

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

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

 return window;
 }
--- a/demos/gtk-demo/constraints2.c
+++ b/demos/gtk-demo/constraints2.c
@@ -1,7 +1,7 @@
 /* Constraints/Interactive
 *
- * Demonstrate how constraints can be updates during user interaction.
- * The vertical edge between the buttons can be dragged with the mouse.
+ * Demonstrate how constraints can be updates during
+ * user interaction.
 */

 #include <glib/gi18n.h>
@@ -26,9 +26,9 @@ interactive_grid_dispose (GObject *object)
 {
  InteractiveGrid *self = INTERACTIVE_GRID (object);

-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);

  G_OBJECT_CLASS (interactive_grid_parent_class)->dispose (object);
 }
@@ -219,7 +219,8 @@ do_constraints2 (GtkWidget *do_widget)
     header = gtk_header_bar_new ();
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
     gtk_window_set_child (GTK_WINDOW (window), box);
@@ -227,19 +228,19 @@ do_constraints2 (GtkWidget *do_widget)
     grid = g_object_new (interactive_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);

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

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

 return window;
 }
--- a/demos/gtk-demo/constraints3.c
+++ b/demos/gtk-demo/constraints3.c
@@ -24,9 +24,9 @@ vfl_grid_dispose (GObject *object)
 {
  VflGrid *self = VFL_GRID (object);

-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);

  G_OBJECT_CLASS (vfl_grid_parent_class)->dispose (object);
 }
@@ -139,7 +139,8 @@ do_constraints3 (GtkWidget *do_widget)
     header = gtk_header_bar_new ();
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
     gtk_window_set_child (GTK_WINDOW (window), box);
@@ -147,19 +148,19 @@ do_constraints3 (GtkWidget *do_widget)
     grid = g_object_new (vfl_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);

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

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

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

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

      container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
@@ -40,22 +37,22 @@ do_css_accordion (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), container);

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

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

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

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

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

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

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

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

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

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -94,10 +91,10 @@ do_css_basics (GtkWidget *do_widget)

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

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

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

  return window;
 }
--- a/demos/gtk-demo/css_blendmodes.c
+++ b/demos/gtk-demo/css_blendmodes.c
@@ -38,14 +38,14 @@ struct {
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static void
 update_css_for_blend_mode (GtkCssProvider *provider,
-                           const char     *blend_mode)
+                           const gchar    *blend_mode)
 {
  GBytes *bytes;
-  char *css;
+  gchar *css;

  bytes = g_resources_lookup_data ("/css_blendmodes/css_blendmodes.css", 0, NULL);

-  css = g_strdup_printf ((char *) g_bytes_get_data (bytes, NULL),
+  css = g_strdup_printf ((gchar*) g_bytes_get_data (bytes, NULL),
                         blend_mode,
                         blend_mode,
                         blend_mode);
@@ -62,7 +62,7 @@ row_activated (GtkListBox     *listbox,
               GtkListBoxRow  *row,
               GtkCssProvider *provider)
 {
-  const char *blend_mode;
+  const gchar *blend_mode;

  blend_mode = blend_modes[gtk_list_box_row_get_index (row)].id;

@@ -75,11 +75,11 @@ setup_listbox (GtkBuilder       *builder,
 {
  GtkWidget *normal_row;
  GtkWidget *listbox;
-  int i;
+  gint i;

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

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

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

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

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

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

      /* Setup the CSS provider for window */
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
@@ -134,14 +135,12 @@ do_css_blendmodes (GtkWidget *do_widget)
                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

      setup_listbox (builder, provider);
-
-      g_object_unref (builder);
    }

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

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

 GtkWidget *
@@ -85,7 +81,7 @@ do_css_multiplebgs (GtkWidget *do_widget)

  if (!window)
    {
-      GtkWidget *paned, *overlay, *child, *sw;
+      GtkWidget *paned, *container, *child;
      GtkStyleProvider *provider;
      GtkTextBuffer *text;
      GBytes *bytes;
@@ -94,31 +90,32 @@ do_css_multiplebgs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

-      overlay = gtk_overlay_new ();
-      gtk_window_set_child (GTK_WINDOW (window), overlay);
+      container = gtk_overlay_new ();
+      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_overlay_set_child (GTK_OVERLAY (overlay), child);
+      gtk_container_add (GTK_CONTAINER (container), child);

      child = gtk_button_new ();
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
+      gtk_overlay_add_overlay (GTK_OVERLAY (container), child);
      gtk_widget_set_name (child, "bricks-button");
      gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
      gtk_widget_set_size_request (child, 250, 84);

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), paned);
+      gtk_overlay_add_overlay (GTK_OVERLAY (container), paned);

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

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -132,10 +129,10 @@ do_css_multiplebgs (GtkWidget *do_widget)

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

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

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

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

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      gtk_window_set_child (GTK_WINDOW (window), paned);

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

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -101,10 +98,10 @@ do_css_pixbufs (GtkWidget *do_widget)

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

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

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

  return window;
 }
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -53,13 +53,9 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }

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

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

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

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

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

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      gtk_window_set_child (GTK_WINDOW (window), paned);

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

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -119,10 +116,10 @@ do_css_shadows (GtkWidget *do_widget)

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

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

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

  return window;
 }
--- a/demos/gtk-demo/cursors.c
+++ b/demos/gtk-demo/cursors.c
@@ -1,8 +1,9 @@
 /* Cursors
 *
- * Demonstrates a useful set of available cursors. The cursors shown here are the
- * ones defined by CSS, which we assume to be available. The example shows creating
- * cursors by name or from an image, with or without a fallback.
+ * Demonstrates a useful set of available cursors. The cursors shown here are the ones
+ * defined by CSS, which we assume to be available.
+ *
+ * The example shows creating cursors by name or from an image, with or without a fallback.
 */

 #include <gtk/gtk.h>
@@ -28,14 +29,14 @@ do_cursors (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      g_signal_connect (window, "destroy",
                        G_CALLBACK (on_destroy), NULL);
-      g_object_unref (builder);
+      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
    }

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

  return window;
--- a/demos/gtk-demo/cursors.ui
+++ b/demos/gtk-demo/cursors.ui
@@ -4,7 +4,7 @@
    <property name="name">default</property>
  </object>
  <object class="GdkCursor" id="default_cursor_image">
-    <property name="texture">resource:///cursors/images/default_cursor.png</property>
+    <property name="texture">resource:///cursors/default_cursor.png</property>
    <property name="hotspot-x">5</property>
    <property name="hotspot-y">5</property>
  </object>
@@ -13,7 +13,7 @@
    <property name="fallback">default_cursor_image</property>
  </object>
  <object class="GdkCursor" id="default_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/default_cursor.png</property>
+    <property name="texture">resource:///cursors/default_cursor.png</property>
    <property name="hotspot-x">5</property>
    <property name="hotspot-y">5</property>
    <property name="fallback">default_cursor</property>
@@ -22,21 +22,21 @@
    <property name="name">none</property>
  </object>
  <object class="GdkCursor" id="none_cursor_image">
-    <property name="texture">resource:///cursors/images/none_cursor.png</property>
+    <property name="texture">resource:///cursors/none_cursor.png</property>
  </object>
  <object class="GdkCursor" id="none_cursor_fallback">
    <property name="name">none</property>
    <property name="fallback">none_cursor_image</property>
  </object>
  <object class="GdkCursor" id="none_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/none_cursor.png</property>
+    <property name="texture">resource:///cursors/none_cursor.png</property>
    <property name="fallback">none_cursor</property>
  </object>
  <object class="GdkCursor" id="gtk-logo_cursor">
    <property name="name">gtk-logo</property>
  </object>
  <object class="GdkCursor" id="gtk-logo_cursor_image">
-    <property name="texture">resource:///cursors/images/gtk_logo_cursor.png</property>
+    <property name="texture">resource:///cursors/gtk_logo_cursor.png</property>
    <property name="hotspot-x">18</property>
    <property name="hotspot-y">2</property>
  </object>
@@ -45,7 +45,7 @@
    <property name="fallback">gtk-logo_cursor_image</property>
  </object>
  <object class="GdkCursor" id="gtk-logo_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/gtk_logo_cursor.png</property>
+    <property name="texture">resource:///cursors/gtk_logo_cursor.png</property>
    <property name="hotspot-x">18</property>
    <property name="hotspot-y">2</property>
    <property name="fallback">gtk-logo_cursor</property>
@@ -54,7 +54,7 @@
    <property name="name">context-menu</property>
  </object>
  <object class="GdkCursor" id="context-menu_cursor_image">
-    <property name="texture">resource:///cursors/images/context_menu_cursor.png</property>
+    <property name="texture">resource:///cursors/context_menu_cursor.png</property>
    <property name="hotspot-x">5</property>
    <property name="hotspot-y">5</property>
  </object>
@@ -63,7 +63,7 @@
    <property name="fallback">context-menu_cursor_image</property>
  </object>
  <object class="GdkCursor" id="context-menu_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/context_menu_cursor.png</property>
+    <property name="texture">resource:///cursors/context_menu_cursor.png</property>
    <property name="hotspot-x">5</property>
    <property name="hotspot-y">5</property>
    <property name="fallback">context-menu_cursor</property>
@@ -72,7 +72,7 @@
    <property name="name">help</property>
  </object>
  <object class="GdkCursor" id="help_cursor_image">
-    <property name="texture">resource:///cursors/images/help_cursor.png</property>
+    <property name="texture">resource:///cursors/help_cursor.png</property>
    <property name="hotspot-x">16</property>
    <property name="hotspot-y">27</property>
  </object>
@@ -81,7 +81,7 @@
    <property name="fallback">help_cursor_image</property>
  </object>
  <object class="GdkCursor" id="help_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/help_cursor.png</property>
+    <property name="texture">resource:///cursors/help_cursor.png</property>
    <property name="hotspot-x">16</property>
    <property name="hotspot-y">27</property>
    <property name="fallback">help_cursor</property>
@@ -90,7 +90,7 @@
    <property name="name">pointer</property>
  </object>
  <object class="GdkCursor" id="pointer_cursor_image">
-    <property name="texture">resource:///cursors/images/pointer_cursor.png</property>
+    <property name="texture">resource:///cursors/pointer_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">9</property>
  </object>
@@ -99,7 +99,7 @@
    <property name="fallback">pointer_cursor_image</property>
  </object>
  <object class="GdkCursor" id="pointer_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/pointer_cursor.png</property>
+    <property name="texture">resource:///cursors/pointer_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">9</property>
    <property name="fallback">pointer_cursor</property>
@@ -108,7 +108,7 @@
    <property name="name">progress</property>
  </object>
  <object class="GdkCursor" id="progress_cursor_image">
-    <property name="texture">resource:///cursors/images/progress_cursor.png</property>
+    <property name="texture">resource:///cursors/progress_cursor.png</property>
    <property name="hotspot-x">5</property>
    <property name="hotspot-y">4</property>
  </object>
@@ -117,7 +117,7 @@
    <property name="fallback">progress_cursor_image</property>
  </object>
  <object class="GdkCursor" id="progress_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/progress_cursor.png</property>
+    <property name="texture">resource:///cursors/progress_cursor.png</property>
    <property name="hotspot-x">5</property>
    <property name="hotspot-y">4</property>
    <property name="fallback">progress_cursor</property>
@@ -126,7 +126,7 @@
    <property name="name">wait</property>
  </object>
  <object class="GdkCursor" id="wait_cursor_image">
-    <property name="texture">resource:///cursors/images/wait_cursor.png</property>
+    <property name="texture">resource:///cursors/wait_cursor.png</property>
    <property name="hotspot-x">11</property>
    <property name="hotspot-y">11</property>
  </object>
@@ -135,7 +135,7 @@
    <property name="fallback">wait_cursor_image</property>
  </object>
  <object class="GdkCursor" id="wait_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/wait_cursor.png</property>
+    <property name="texture">resource:///cursors/wait_cursor.png</property>
    <property name="hotspot-x">11</property>
    <property name="hotspot-y">11</property>
    <property name="fallback">wait_cursor</property>
@@ -144,7 +144,7 @@
    <property name="name">cell</property>
  </object>
  <object class="GdkCursor" id="cell_cursor_image">
-    <property name="texture">resource:///cursors/images/cell_cursor.png</property>
+    <property name="texture">resource:///cursors/cell_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">15</property>
  </object>
@@ -153,7 +153,7 @@
    <property name="fallback">cell_cursor_image</property>
  </object>
  <object class="GdkCursor" id="cell_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/cell_cursor.png</property>
+    <property name="texture">resource:///cursors/cell_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">15</property>
    <property name="fallback">cell_cursor</property>
@@ -162,7 +162,7 @@
    <property name="name">crosshair</property>
  </object>
  <object class="GdkCursor" id="crosshair_cursor_image">
-    <property name="texture">resource:///cursors/images/crosshair_cursor.png</property>
+    <property name="texture">resource:///cursors/crosshair_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">15</property>
  </object>
@@ -171,7 +171,7 @@
    <property name="fallback">crosshair_cursor_image</property>
  </object>
  <object class="GdkCursor" id="crosshair_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/crosshair_cursor.png</property>
+    <property name="texture">resource:///cursors/crosshair_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">15</property>
    <property name="fallback">crosshair_cursor</property>
@@ -180,7 +180,7 @@
    <property name="name">text</property>
  </object>
  <object class="GdkCursor" id="text_cursor_image">
-    <property name="texture">resource:///cursors/images/text_cursor.png</property>
+    <property name="texture">resource:///cursors/text_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">15</property>
  </object>
@@ -189,7 +189,7 @@
    <property name="fallback">text_cursor_image</property>
  </object>
  <object class="GdkCursor" id="text_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/text_cursor.png</property>
+    <property name="texture">resource:///cursors/text_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">15</property>
    <property name="fallback">text_cursor</property>
@@ -198,7 +198,7 @@
    <property name="name">vertical-text</property>
  </object>
  <object class="GdkCursor" id="vertical-text_cursor_image">
-    <property name="texture">resource:///cursors/images/vertical_text_cursor.png</property>
+    <property name="texture">resource:///cursors/vertical_text_cursor.png</property>
    <property name="hotspot-x">16</property>
    <property name="hotspot-y">15</property>
  </object>
@@ -207,7 +207,7 @@
    <property name="fallback">vertical-text_cursor_image</property>
  </object>
  <object class="GdkCursor" id="vertical-text_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/vertical_text_cursor.png</property>
+    <property name="texture">resource:///cursors/vertical_text_cursor.png</property>
    <property name="hotspot-x">16</property>
    <property name="hotspot-y">15</property>
    <property name="fallback">vertical-text_cursor</property>
@@ -216,7 +216,7 @@
    <property name="name">alias</property>
  </object>
  <object class="GdkCursor" id="alias_cursor_image">
-    <property name="texture">resource:///cursors/images/alias_cursor.png</property>
+    <property name="texture">resource:///cursors/alias_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
  </object>
@@ -225,7 +225,7 @@
    <property name="fallback">alias_cursor_image</property>
  </object>
  <object class="GdkCursor" id="alias_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/alias_cursor.png</property>
+    <property name="texture">resource:///cursors/alias_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
    <property name="fallback">alias_cursor</property>
@@ -234,7 +234,7 @@
    <property name="name">copy</property>
  </object>
  <object class="GdkCursor" id="copy_cursor_image">
-    <property name="texture">resource:///cursors/images/copy_cursor.png</property>
+    <property name="texture">resource:///cursors/copy_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
  </object>
@@ -243,7 +243,7 @@
    <property name="fallback">copy_cursor_image</property>
  </object>
  <object class="GdkCursor" id="copy_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/copy_cursor.png</property>
+    <property name="texture">resource:///cursors/copy_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
    <property name="fallback">copy_cursor</property>
@@ -252,7 +252,7 @@
    <property name="name">move</property>
  </object>
  <object class="GdkCursor" id="move_cursor_image">
-    <property name="texture">resource:///cursors/images/move_cursor.png</property>
+    <property name="texture">resource:///cursors/move_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
  </object>
@@ -261,7 +261,7 @@
    <property name="fallback">move_cursor_image</property>
  </object>
  <object class="GdkCursor" id="move_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/move_cursor.png</property>
+    <property name="texture">resource:///cursors/move_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
    <property name="fallback">move_cursor</property>
@@ -270,7 +270,7 @@
    <property name="name">no-drop</property>
  </object>
  <object class="GdkCursor" id="no-drop_cursor_image">
-    <property name="texture">resource:///cursors/images/no_drop_cursor.png</property>
+    <property name="texture">resource:///cursors/no_drop_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
  </object>
@@ -279,7 +279,7 @@
    <property name="fallback">no-drop_cursor_image</property>
  </object>
  <object class="GdkCursor" id="no-drop_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/no_drop_cursor.png</property>
+    <property name="texture">resource:///cursors/no_drop_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
    <property name="fallback">no-drop_cursor</property>
@@ -288,7 +288,7 @@
    <property name="name">not-allowed</property>
  </object>
  <object class="GdkCursor" id="not-allowed_cursor_image">
-    <property name="texture">resource:///cursors/images/not_allowed_cursor.png</property>
+    <property name="texture">resource:///cursors/not_allowed_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
  </object>
@@ -297,7 +297,7 @@
    <property name="fallback">not-allowed_cursor_image</property>
  </object>
  <object class="GdkCursor" id="not-allowed_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/not_allowed_cursor.png</property>
+    <property name="texture">resource:///cursors/not_allowed_cursor.png</property>
    <property name="hotspot-x">12</property>
    <property name="hotspot-y">11</property>
    <property name="fallback">not-allowed_cursor</property>
@@ -306,7 +306,7 @@
    <property name="name">grab</property>
  </object>
  <object class="GdkCursor" id="grab_cursor_image">
-    <property name="texture">resource:///cursors/images/grab_cursor.png</property>
+    <property name="texture">resource:///cursors/grab_cursor.png</property>
    <property name="hotspot-x">10</property>
    <property name="hotspot-y">6</property>
  </object>
@@ -315,7 +315,7 @@
    <property name="fallback">grab_cursor_image</property>
  </object>
  <object class="GdkCursor" id="grab_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/grab_cursor.png</property>
+    <property name="texture">resource:///cursors/grab_cursor.png</property>
    <property name="hotspot-x">10</property>
    <property name="hotspot-y">6</property>
    <property name="fallback">grab_cursor</property>
@@ -324,7 +324,7 @@
    <property name="name">grabbing</property>
  </object>
  <object class="GdkCursor" id="grabbing_cursor_image">
-    <property name="texture">resource:///cursors/images/grabbing_cursor.png</property>
+    <property name="texture">resource:///cursors/grabbing_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">14</property>
  </object>
@@ -333,7 +333,7 @@
    <property name="fallback">grabbing_cursor_image</property>
  </object>
  <object class="GdkCursor" id="grabbing_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/grabbing_cursor.png</property>
+    <property name="texture">resource:///cursors/grabbing_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">14</property>
    <property name="fallback">grabbing_cursor</property>
@@ -342,7 +342,7 @@
    <property name="name">all-scroll</property>
  </object>
  <object class="GdkCursor" id="all-scroll_cursor_image">
-    <property name="texture">resource:///cursors/images/all_scroll_cursor.png</property>
+    <property name="texture">resource:///cursors/all_scroll_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">15</property>
  </object>
@@ -351,7 +351,7 @@
    <property name="fallback">all-scroll_cursor_image</property>
  </object>
  <object class="GdkCursor" id="all-scroll_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/all_scroll_cursor.png</property>
+    <property name="texture">resource:///cursors/all_scroll_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">15</property>
    <property name="fallback">all-scroll_cursor</property>
@@ -360,7 +360,7 @@
    <property name="name">col-resize</property>
  </object>
  <object class="GdkCursor" id="col-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/col_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/col_resize_cursor.png</property>
    <property name="hotspot-x">16</property>
    <property name="hotspot-y">15</property>
  </object>
@@ -369,7 +369,7 @@
    <property name="fallback">col-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="col-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/col_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/col_resize_cursor.png</property>
    <property name="hotspot-x">16</property>
    <property name="hotspot-y">15</property>
    <property name="fallback">col-resize_cursor</property>
@@ -378,7 +378,7 @@
    <property name="name">row-resize</property>
  </object>
  <object class="GdkCursor" id="row-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/row_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/row_resize_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">17</property>
  </object>
@@ -387,7 +387,7 @@
    <property name="fallback">row-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="row-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/row_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/row_resize_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">17</property>
    <property name="fallback">row-resize_cursor</property>
@@ -396,7 +396,7 @@
    <property name="name">n-resize</property>
  </object>
  <object class="GdkCursor" id="n-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/n_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/n_resize_cursor.png</property>
    <property name="hotspot-x">17</property>
    <property name="hotspot-y">7</property>
  </object>
@@ -405,7 +405,7 @@
    <property name="fallback">n-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="n-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/n_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/n_resize_cursor.png</property>
    <property name="hotspot-x">17</property>
    <property name="hotspot-y">7</property>
    <property name="fallback">n-resize_cursor</property>
@@ -414,7 +414,7 @@
    <property name="name">e-resize</property>
  </object>
  <object class="GdkCursor" id="e-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/e_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/e_resize_cursor.png</property>
    <property name="hotspot-x">25</property>
    <property name="hotspot-y">17</property>
  </object>
@@ -423,7 +423,7 @@
    <property name="fallback">e-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="e-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/e_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/e_resize_cursor.png</property>
    <property name="hotspot-x">25</property>
    <property name="hotspot-y">17</property>
    <property name="fallback">e-resize_cursor</property>
@@ -432,7 +432,7 @@
    <property name="name">s-resize</property>
  </object>
  <object class="GdkCursor" id="s-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/s_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/s_resize_cursor.png</property>
    <property name="hotspot-x">17</property>
    <property name="hotspot-y">23</property>
  </object>
@@ -441,7 +441,7 @@
    <property name="fallback">s-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="s-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/s_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/s_resize_cursor.png</property>
    <property name="hotspot-x">17</property>
    <property name="hotspot-y">23</property>
    <property name="fallback">s-resize_cursor</property>
@@ -450,7 +450,7 @@
    <property name="name">w-resize</property>
  </object>
  <object class="GdkCursor" id="w-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/w_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/w_resize_cursor.png</property>
    <property name="hotspot-x">8</property>
    <property name="hotspot-y">17</property>
  </object>
@@ -459,7 +459,7 @@
    <property name="fallback">w-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="w-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/w_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/w_resize_cursor.png</property>
    <property name="hotspot-x">8</property>
    <property name="hotspot-y">17</property>
    <property name="fallback">w-resize_cursor</property>
@@ -468,7 +468,7 @@
    <property name="name">ne-resize</property>
  </object>
  <object class="GdkCursor" id="ne-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/ne_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/ne_resize_cursor.png</property>
    <property name="hotspot-x">20</property>
    <property name="hotspot-y">13</property>
  </object>
@@ -477,7 +477,7 @@
    <property name="fallback">ne-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="ne-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/ne_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/ne_resize_cursor.png</property>
    <property name="hotspot-x">20</property>
    <property name="hotspot-y">13</property>
    <property name="fallback">ne-resize_cursor</property>
@@ -486,7 +486,7 @@
    <property name="name">nw-resize</property>
  </object>
  <object class="GdkCursor" id="nw-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/nw_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/nw_resize_cursor.png</property>
    <property name="hotspot-x">13</property>
    <property name="hotspot-y">13</property>
  </object>
@@ -495,7 +495,7 @@
    <property name="fallback">nw-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="nw-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/nw_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/nw_resize_cursor.png</property>
    <property name="hotspot-x">13</property>
    <property name="hotspot-y">13</property>
    <property name="fallback">nw-resize_cursor</property>
@@ -504,7 +504,7 @@
    <property name="name">se-resize</property>
  </object>
  <object class="GdkCursor" id="se-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/se_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/se_resize_cursor.png</property>
    <property name="hotspot-x">19</property>
    <property name="hotspot-y">19</property>
  </object>
@@ -513,7 +513,7 @@
    <property name="fallback">se-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="se-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/se_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/se_resize_cursor.png</property>
    <property name="hotspot-x">19</property>
    <property name="hotspot-y">19</property>
    <property name="fallback">se-resize_cursor</property>
@@ -522,7 +522,7 @@
    <property name="name">sw-resize</property>
  </object>
  <object class="GdkCursor" id="sw-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/sw_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/sw_resize_cursor.png</property>
    <property name="hotspot-x">13</property>
    <property name="hotspot-y">19</property>
  </object>
@@ -531,7 +531,7 @@
    <property name="fallback">sw-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="sw-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/sw_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/sw_resize_cursor.png</property>
    <property name="hotspot-x">13</property>
    <property name="hotspot-y">19</property>
    <property name="fallback">sw-resize_cursor</property>
@@ -540,7 +540,7 @@
    <property name="name">ew-resize</property>
  </object>
  <object class="GdkCursor" id="ew-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/ew_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/ew_resize_cursor.png</property>
    <property name="hotspot-x">16</property>
    <property name="hotspot-y">15</property>
  </object>
@@ -549,7 +549,7 @@
    <property name="fallback">ew-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="ew-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/ew_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/ew_resize_cursor.png</property>
    <property name="hotspot-x">16</property>
    <property name="hotspot-y">15</property>
    <property name="fallback">ew-resize_cursor</property>
@@ -558,7 +558,7 @@
    <property name="name">ns-resize</property>
  </object>
  <object class="GdkCursor" id="ns-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/ns_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/ns_resize_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">17</property>
  </object>
@@ -567,7 +567,7 @@
    <property name="fallback">ns-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="ns-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/ns_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/ns_resize_cursor.png</property>
    <property name="hotspot-x">15</property>
    <property name="hotspot-y">17</property>
    <property name="fallback">ns-resize_cursor</property>
@@ -576,7 +576,7 @@
    <property name="name">nesw-resize</property>
  </object>
  <object class="GdkCursor" id="nesw-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/nesw_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/nesw_resize_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">14</property>
  </object>
@@ -585,7 +585,7 @@
    <property name="fallback">nesw-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="nesw-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/nesw_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/nesw_resize_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">14</property>
    <property name="fallback">nesw-resize_cursor</property>
@@ -594,7 +594,7 @@
    <property name="name">nwse-resize</property>
  </object>
  <object class="GdkCursor" id="nwse-resize_cursor_image">
-    <property name="texture">resource:///cursors/images/nwse_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/nwse_resize_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">14</property>
  </object>
@@ -603,7 +603,7 @@
    <property name="fallback">nwse-resize_cursor_image</property>
  </object>
  <object class="GdkCursor" id="nwse-resize_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/nwse_resize_cursor.png</property>
+    <property name="texture">resource:///cursors/nwse_resize_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">14</property>
    <property name="fallback">nwse-resize_cursor</property>
@@ -612,7 +612,7 @@
    <property name="name">zoom-in</property>
  </object>
  <object class="GdkCursor" id="zoom-in_cursor_image">
-    <property name="texture">resource:///cursors/images/zoom_in_cursor.png</property>
+    <property name="texture">resource:///cursors/zoom_in_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">13</property>
  </object>
@@ -621,7 +621,7 @@
    <property name="fallback">zoom-in_cursor_image</property>
  </object>
  <object class="GdkCursor" id="zoom-in_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/zoom_in_cursor.png</property>
+    <property name="texture">resource:///cursors/zoom_in_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">13</property>
    <property name="fallback">zoom-in_cursor</property>
@@ -630,7 +630,7 @@
    <property name="name">zoom-out</property>
  </object>
  <object class="GdkCursor" id="zoom-out_cursor_image">
-    <property name="texture">resource:///cursors/images/zoom_out_cursor.png</property>
+    <property name="texture">resource:///cursors/zoom_out_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">13</property>
  </object>
@@ -639,7 +639,7 @@
    <property name="fallback">zoom-out_cursor_image</property>
  </object>
  <object class="GdkCursor" id="zoom-out_cursor_image_fallback">
-    <property name="texture">resource:///cursors/images/zoom_out_cursor.png</property>
+    <property name="texture">resource:///cursors/zoom_out_cursor.png</property>
    <property name="hotspot-x">14</property>
    <property name="hotspot-y">13</property>
    <property name="fallback">zoom-out_cursor</property>
@@ -682,7 +682,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/default_cursor.png</property>
+                                <property name="paintable">resource:///cursors/default_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -742,7 +742,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/none_cursor.png</property>
+                                <property name="paintable">resource:///cursors/none_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -802,7 +802,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/gtk_logo_cursor.png</property>
+                                <property name="paintable">resource:///cursors/gtk_logo_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -875,7 +875,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/context_menu_cursor.png</property>
+                                <property name="paintable">resource:///cursors/context_menu_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -935,7 +935,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/help_cursor.png</property>
+                                <property name="paintable">resource:///cursors/help_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -995,7 +995,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/pointer_cursor.png</property>
+                                <property name="paintable">resource:///cursors/pointer_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1055,7 +1055,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/progress_cursor.png</property>
+                                <property name="paintable">resource:///cursors/progress_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1115,7 +1115,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/wait_cursor.png</property>
+                                <property name="paintable">resource:///cursors/wait_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1188,7 +1188,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/cell_cursor.png</property>
+                                <property name="paintable">resource:///cursors/cell_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1248,7 +1248,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/crosshair_cursor.png</property>
+                                <property name="paintable">resource:///cursors/crosshair_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1308,7 +1308,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/text_cursor.png</property>
+                                <property name="paintable">resource:///cursors/text_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1368,7 +1368,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/vertical_text_cursor.png</property>
+                                <property name="paintable">resource:///cursors/vertical_text_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1441,7 +1441,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/alias_cursor.png</property>
+                                <property name="paintable">resource:///cursors/alias_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1501,7 +1501,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/copy_cursor.png</property>
+                                <property name="paintable">resource:///cursors/copy_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1561,7 +1561,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/move_cursor.png</property>
+                                <property name="paintable">resource:///cursors/move_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1621,7 +1621,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/no_drop_cursor.png</property>
+                                <property name="paintable">resource:///cursors/no_drop_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1681,7 +1681,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/not_allowed_cursor.png</property>
+                                <property name="paintable">resource:///cursors/not_allowed_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1741,7 +1741,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/grab_cursor.png</property>
+                                <property name="paintable">resource:///cursors/grab_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1801,7 +1801,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/grabbing_cursor.png</property>
+                                <property name="paintable">resource:///cursors/grabbing_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1874,7 +1874,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/all_scroll_cursor.png</property>
+                                <property name="paintable">resource:///cursors/all_scroll_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1934,7 +1934,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/col_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/col_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -1994,7 +1994,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/row_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/row_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2054,7 +2054,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/n_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/n_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2114,7 +2114,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/e_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/e_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2174,7 +2174,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/s_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/s_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2234,7 +2234,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/w_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/w_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2294,7 +2294,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/ne_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/ne_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2354,7 +2354,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/nw_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/nw_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2414,7 +2414,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/sw_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/sw_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2474,7 +2474,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/se_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/se_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2534,7 +2534,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/ew_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/ew_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2594,7 +2594,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/ns_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/ns_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2654,7 +2654,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/nesw_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/nesw_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2714,7 +2714,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/nwse_resize_cursor.png</property>
+                                <property name="paintable">resource:///cursors/nwse_resize_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2787,7 +2787,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/zoom_in_cursor.png</property>
+                                <property name="paintable">resource:///cursors/zoom_in_cursor.png</property>
                              </object>
                            </child>
                            <child>
@@ -2847,7 +2847,7 @@
                            <property name="spacing">10</property>
                            <child>
                              <object class="GtkImage">
-                                <property name="paintable">resource:///cursors/images/zoom_out_cursor.png</property>
+                                <property name="paintable">resource:///cursors/zoom_out_cursor.png</property>
                              </object>
                            </child>
                            <child>
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/">
-  </gresource>
  <gresource prefix="/ui">
    <file preprocess="xml-stripblanks">main.ui</file>
-    <file preprocess="xml-stripblanks">main-listitem.ui</file>
+    <file preprocess="xml-stripblanks">appmenu.ui</file>
  </gresource>
  <gresource prefix="/application_demo">
    <file>application.c</file>
@@ -51,8 +49,6 @@
    <file>cssview.css</file>
    <file>reset.css</file>
    <file>background.jpg</file>
-  </gresource>
-  <gresource prefix="/css_pixbufs/images">
    <file>apple-red.png</file>
    <file>gnome-applets.png</file>
    <file>gnome-calendar.png</file>
@@ -69,8 +65,6 @@
  </gresource>
  <gresource prefix="/cursors">
    <file>cursors.ui</file>
-  </gresource>
-  <gresource prefix="/cursors/images">
    <file>alias_cursor.png</file>
    <file>all_scroll_cursor.png</file>
    <file>cell_cursor.png</file>
@@ -109,9 +103,6 @@
    <file>zoom_in_cursor.png</file>
    <file>zoom_out_cursor.png</file>
  </gresource>
-  <gresource prefix="/dnd">
-    <file>dnd.css</file>
-  </gresource>
  <gresource prefix="/fishbowl">
    <file>fishbowl.ui</file>
    <file>gtkfishbowl.c</file>
@@ -128,32 +119,6 @@
    <file>gnome-fs-directory.png</file>
    <file>gnome-fs-regular.png</file>
  </gresource>
-  <gresource prefix="/layoutmanager">
-    <file>demolayout.h</file>
-    <file>demolayout.c</file>
-    <file>demowidget.h</file>
-    <file>demowidget.c</file>
-    <file>demochild.h</file>
-    <file>demochild.c</file>
-  </gresource>
-  <gresource prefix="/listview_filebrowser">
-    <file>listview_filebrowser.ui</file>
-    <file>listview_filebrowser.css</file>
-  </gresource>
-  <gresource prefix="/listview_minesweeper">
-    <file>listview_minesweeper.ui</file>
-    <file>listview_minesweeper_cell.ui</file>
-  </gresource>
-  <gresource prefix="/listview_settings">
-    <file>listview_settings.ui</file>
-  </gresource>
-  <gresource prefix="/listview_weather">
-    <file compressed="true">listview_weather.txt</file>
-  </gresource>
-  <gresource prefix="/listview_colors">
-    <file compressed="true">color.names.txt</file>
-    <file>listview_colors.css</file>
-  </gresource>
  <gresource prefix="/shortcuts">
    <file>shortcuts.ui</file>
    <file>shortcuts-builder.ui</file>
@@ -177,6 +142,17 @@
    <file>floppybuddy.gif</file>
    <file>gtk-logo.webm</file>
  </gresource>
+  <gresource prefix="/pixbufs">
+    <file>apple-red.png</file>
+    <file>background.jpg</file>
+    <file>gnome-applets.png</file>
+    <file>gnome-calendar.png</file>
+    <file>gnome-foot.png</file>
+    <file>gnome-gmush.png</file>
+    <file>gnome-gimp.png</file>
+    <file>gnome-gsame.png</file>
+    <file>gnu-keys.png</file>
+  </gresource>
  <gresource prefix="/sources">
    <file>application_demo.c</file>
    <file>assistant.c</file>
@@ -195,7 +171,6 @@
    <file>cursors.c</file>
    <file>dialog.c</file>
    <file>drawingarea.c</file>
-    <file>dropdown.c</file>
    <file>dnd.c</file>
    <file>editable_cells.c</file>
    <file>entry_completion.c</file>
@@ -218,20 +193,11 @@
    <file>iconview_edit.c</file>
    <file>images.c</file>
    <file>infobar.c</file>
-    <file>layoutmanager.c</file>
    <file>links.c</file>
    <file>listbox.c</file>
-    <file>listbox2.c</file>
-    <file>listview_applauncher.c</file>
-    <file>listview_colors.c</file>
-    <file>listview_clocks.c</file>
-    <file>listview_filebrowser.c</file>
-    <file>listview_minesweeper.c</file>
-    <file>listview_settings.c</file>
-    <file>listview_weather.c</file>
-    <file>listview_words.c</file>
    <file>list_store.c</file>
    <file>markup.c</file>
+    <file>modelbutton.c</file>
    <file>overlay.c</file>
    <file>overlay2.c</file>
    <file>paint.c</file>
@@ -243,6 +209,7 @@
    <file>password_entry.c</file>
    <file>peg_solitaire.c</file>
    <file>pickers.c</file>
+    <file>pixbufs.c</file>
    <file>printing.c</file>
    <file>revealer.c</file>
    <file>rotated_text.c</file>
@@ -280,9 +247,6 @@
    <file>messages.txt</file>
    <file>apple-red.png</file>
  </gresource>
-  <gresource prefix="/listbox2">
-    <file>listbox2.ui</file>
-  </gresource>
  <gresource prefix="/glarea">
    <file>glarea-gl.fs.glsl</file>
    <file>glarea-gl.vs.glsl</file>
@@ -305,7 +269,6 @@
  </gresource>
  <gresource prefix="/transparent">
    <file>portland-rose.jpg</file>
-    <file>bluroverlay.h</file>
    <file>bluroverlay.c</file>
  </gresource>
  <gresource prefix="/markup">
@@ -314,6 +277,9 @@
  <gresource prefix="/scale">
    <file>scale.ui</file>
  </gresource>
+  <gresource prefix="/modelbutton">
+    <file>modelbutton.ui</file>
+  </gresource>
  <gresource prefix="/tagged_entry">
    <file>demotaggedentry.c</file>
    <file>demotaggedentry.h</file>
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -94,7 +94,9 @@
  <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>
  </object>
  <object class="GtkWindow" id="window1">
    <property name="default-height">250</property>
@@ -110,6 +112,11 @@
        </child>
        <child>
          <object class="GtkBox" id="toolbar1">
+            <child internal-child="accessible">
+              <object class="AtkObject" id="a11y-toolbar">
+                <property name="AtkObject::accessible-name">The toolbar</property>
+              </object>
+            </child>
            <child>
              <object class="GtkButton">
                <property name="label" translatable="yes">New</property>
@@ -166,6 +173,14 @@
              <object class="GtkTreeView" id="treeview1">
                <property name="model">liststore1</property>
                <property name="tooltip-column">3</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="a11y-treeview">
+                    <property name="AtkObject::accessible-name">Name list</property>
+                    <property name="AtkObject::accessible-description">
+                                    A list of person with name, surname and age columns
+                                  </property>
+                  </object>
+                </child>
                <child>
                  <object class="GtkTreeViewColumn" id="column1">
                    <property name="title">Name</property>
--- a/demos/gtk-demo/demochild.c
+++ b/demos/gtk-demo/demochild.c
@@ -1,72 +0,0 @@
-#include "demochild.h"
-
-/* This is a trivial child widget just for demo purposes.
- * It draws a 32x32 square in fixed color.
- */
-
-struct _DemoChild
-{
-  GtkWidget parent_instance;
-  GdkRGBA color;
-};
-
-struct _DemoChildClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (DemoChild, demo_child, GTK_TYPE_WIDGET)
-
-static void
-demo_child_init (DemoChild *self)
-{
-}
-
-static void
-demo_child_snapshot (GtkWidget   *widget,
-                     GtkSnapshot *snapshot)
-{
-  DemoChild *self = DEMO_CHILD (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_append_color (snapshot, &self->color,
-                             &GRAPHENE_RECT_INIT(0, 0, width, height));
-}
-
-static void
-demo_child_measure (GtkWidget        *widget,
-                    GtkOrientation    orientation,
-                    int               for_size,
-                    int              *minimum,
-                    int              *natural,
-                    int              *minimum_baseline,
-                    int              *natural_baseline)
-{
-  *minimum = *natural = 32;
-}
-
-static void
-demo_child_class_init (DemoChildClass *class)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  widget_class->snapshot = demo_child_snapshot;
-  widget_class->measure = demo_child_measure;
-}
-
-GtkWidget *
-demo_child_new (const char *color)
-{
-  DemoChild *self;
-
-  self = g_object_new (DEMO_TYPE_CHILD,
-                       "tooltip-text", color,
-                       NULL);
-
-  gdk_rgba_parse (&self->color, color);
-
-  return GTK_WIDGET (self);
-}
--- a/demos/gtk-demo/demochild.h
+++ b/demos/gtk-demo/demochild.h
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define DEMO_TYPE_CHILD (demo_child_get_type ())
-G_DECLARE_FINAL_TYPE (DemoChild, demo_child, DEMO, CHILD, GtkWidget)
-
-GtkWidget * demo_child_new (const char *color);
--- a/demos/gtk-demo/demoimage.c
+++ b/demos/gtk-demo/demoimage.c
@@ -17,7 +17,7 @@ G_DEFINE_TYPE(DemoImage, demo_image, GTK_TYPE_WIDGET)
 static GdkPaintable *
 get_image_paintable (GtkImage *image)
 {
-  const char *icon_name;
+  const gchar *icon_name;
  GtkIconTheme *icon_theme;
  GtkIconPaintable *icon;

--- a/demos/gtk-demo/demolayout.c
+++ b/demos/gtk-demo/demolayout.c
@@ -1,189 +0,0 @@
-#include "demolayout.h"
-
-struct _DemoLayout
-{
-  GtkLayoutManager parent_instance;
-
-  float position;
-  int pos[16];
-};
-
-struct _DemoLayoutClass
-{
-  GtkLayoutManagerClass parent_class;
-};
-
-G_DEFINE_TYPE (DemoLayout, demo_layout, GTK_TYPE_LAYOUT_MANAGER)
-
-static void
-demo_layout_measure (GtkLayoutManager *layout_manager,
-                     GtkWidget        *widget,
-                     GtkOrientation    orientation,
-                     int               for_size,
-                     int              *minimum,
-                     int              *natural,
-                     int              *minimum_baseline,
-                     int              *natural_baseline)
-{
-  GtkWidget *child;
-  int minimum_size = 0;
-  int natural_size = 0;
-
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      int child_min = 0, child_nat = 0;
-
-      if (!gtk_widget_should_layout (child))
-        continue;
-
-      gtk_widget_measure (child, orientation, -1,
-                          &child_min, &child_nat,
-                          NULL, NULL);
-      minimum_size = MAX (minimum_size, child_min);
-      natural_size = MAX (natural_size, child_nat);
-    }
-
-  /* A back-of-a-napkin calculation to reserve enough
-   * space for arranging 16 children in a circle.
-   */
-  *minimum = 16 * minimum_size / G_PI + minimum_size;
-  *natural = 16 * natural_size / G_PI + natural_size;
-}
-
-static void
-demo_layout_allocate (GtkLayoutManager *layout_manager,
-                      GtkWidget        *widget,
-                      int               width,
-                      int               height,
-                      int               baseline)
-{
-  DemoLayout *self = DEMO_LAYOUT (layout_manager);
-  GtkWidget *child;
-  int i;
-  int child_width = 0;
-  int child_height = 0;
-  int x0, y0;
-  float r;
-  float t;
-
-  t = self->position;
-
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      GtkRequisition child_req;
-
-      if (!gtk_widget_should_layout (child))
-        continue;
-
-      gtk_widget_get_preferred_size (child, &child_req, NULL);
-
-      child_width = MAX (child_width, child_req.width);
-      child_height = MAX (child_height, child_req.height);
-    }
-
-  /* the center of our layout */
-  x0 = (width / 2);
-  y0 = (height / 2);
-
-  /* the radius for our circle of children */
-  r = 8 * child_width / G_PI;
-
-  for (child = gtk_widget_get_first_child (widget), i = 0;
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child), i++)
-    {
-      GtkRequisition child_req;
-      float a = self->pos[i] * G_PI / 8;
-      int gx, gy;
-      int cx, cy;
-      int x, y;
-
-      if (!gtk_widget_should_layout (child))
-        continue;
-
-      gtk_widget_get_preferred_size (child, &child_req, NULL);
-
-      /* The grid position of child. */
-      gx = x0 + (i % 4 - 2) * child_width;
-      gy = y0 + (i / 4 - 2) * child_height;
-
-      /* The circle position of child. Note that we
-       * are adjusting the position by half the child size
-       * to place the center of child on a centered circle.
-       * This assumes that the children don't use align flags
-       * or uneven margins that would shift the center.
-       */
-      cx = x0 + sin (a) * r - child_req.width / 2;
-      cy = y0 + cos (a) * r - child_req.height / 2;
-
-      /* we interpolate between the two layouts according to
-       * the position value that has been set on the layout.
-       */
-      x = t * cx + (1 - t) * gx;
-      y = t * cy + (1 - t) * gy;
-
-      gtk_widget_size_allocate (child,
-                                &(const GtkAllocation){ x, y, child_width, child_height},
-                                -1);
-    }
-}
-
-static GtkSizeRequestMode
-demo_layout_get_request_mode (GtkLayoutManager *layout_manager,
-                              GtkWidget        *widget)
-{
-  return GTK_SIZE_REQUEST_CONSTANT_SIZE;
-}
-
-static void
-demo_layout_class_init (DemoLayoutClass *klass)
-{
-  GtkLayoutManagerClass *layout_class = GTK_LAYOUT_MANAGER_CLASS (klass);
-
-  layout_class->get_request_mode = demo_layout_get_request_mode;
-  layout_class->measure = demo_layout_measure;
-  layout_class->allocate = demo_layout_allocate;
-}
-
-static void
-demo_layout_init (DemoLayout *self)
-{
-  int i;
-
-  for (i = 0; i < 16; i++)
-    self->pos[i] = i;
-}
-
-GtkLayoutManager *
-demo_layout_new (void)
-{
-  return g_object_new (DEMO_TYPE_LAYOUT, NULL);
-}
-
-void
-demo_layout_set_position (DemoLayout *layout,
-                          float       position)
-{
-  layout->position = position;
-}
-
-/* Shuffle the circle positions of the children.
- * Should be called when we are in the grid layout.
- */
-void
-demo_layout_shuffle (DemoLayout *layout)
-{
-  int i, j, tmp;
-
-  for (i = 0; i < 16; i++)
-    {
-      j = g_random_int_range (0, i + 1);
-      tmp = layout->pos[i];
-      layout->pos[i] = layout->pos[j];
-      layout->pos[j] = tmp;
-    }
-}
--- a/demos/gtk-demo/demolayout.h
+++ b/demos/gtk-demo/demolayout.h
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define DEMO_TYPE_LAYOUT (demo_layout_get_type ())
-
-G_DECLARE_FINAL_TYPE (DemoLayout, demo_layout, DEMO, LAYOUT, GtkLayoutManager)
-
-GtkLayoutManager * demo_layout_new          (void);
-
-void               demo_layout_set_position (DemoLayout *layout,
-                                             float       position);
-void               demo_layout_shuffle      (DemoLayout *layout);
--- a/demos/gtk-demo/demotaggedentry.c
+++ b/demos/gtk-demo/demotaggedentry.c
@@ -23,31 +23,33 @@
 #include "demotaggedentry.h"

 #include <gtk/gtk.h>
+#include <gtk/gtk-a11y.h>

-struct _DemoTaggedEntry
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *text;
-};
-
-struct _DemoTaggedEntryClass
-{
-  GtkWidgetClass parent_class;
-};
+typedef struct {
+  GtkWidget *box;
+  GtkWidget *entry;
+} DemoTaggedEntryPrivate;

 static void demo_tagged_entry_editable_init (GtkEditableInterface *iface);

 G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
+                         G_ADD_PRIVATE (DemoTaggedEntry)
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, demo_tagged_entry_editable_init))

 static void
 demo_tagged_entry_init (DemoTaggedEntry *entry)
 {
-  entry->text = gtk_text_new ();
-  gtk_widget_set_hexpand (entry->text, TRUE);
-  gtk_widget_set_vexpand (entry->text, TRUE);
-  gtk_widget_set_parent (entry->text, GTK_WIDGET (entry));
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
+  priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_set_parent (priv->box, GTK_WIDGET (entry));
+
+  priv->entry = gtk_text_new ();
+  gtk_widget_set_hexpand (priv->entry, TRUE);
+  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_editable_init_delegate (GTK_EDITABLE (entry));
 }

@@ -55,19 +57,23 @@ static void
 demo_tagged_entry_dispose (GObject *object)
 {
  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (object);
-  GtkWidget *child;
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);

-  if (entry->text)
+  if (priv->entry)
    gtk_editable_finish_delegate (GTK_EDITABLE (entry));

-  while ((child = gtk_widget_get_first_child (GTK_WIDGET (entry))))
-    gtk_widget_unparent (child);
-
-  entry->text = NULL;
+  g_clear_pointer (&priv->entry, gtk_widget_unparent);
+  g_clear_pointer (&priv->box, gtk_widget_unparent);

  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object);
 }

+static void
+demo_tagged_entry_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->finalize (object);
+}
+
 static void
 demo_tagged_entry_set_property (GObject      *object,
                                guint         prop_id,
@@ -92,12 +98,44 @@ demo_tagged_entry_get_property (GObject    *object,
  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 }

+static void
+demo_tagged_entry_measure (GtkWidget      *widget,
+                           GtkOrientation  orientation,
+                           int             for_size,
+                           int            *minimum,
+                           int            *natural,
+                           int            *minimum_baseline,
+                           int            *natural_baseline)
+{
+  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
+  gtk_widget_measure (priv->box, orientation, for_size,
+                      minimum, natural,
+                      minimum_baseline, natural_baseline);
+}
+
+static void
+demo_tagged_entry_size_allocate (GtkWidget *widget,
+                                 int        width,
+                                 int        height,
+                                 int        baseline)
+{
+  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
+  gtk_widget_size_allocate (priv->box,
+                            &(GtkAllocation) { 0, 0, width, height },
+                            baseline);
+}
+
 static gboolean
 demo_tagged_entry_grab_focus (GtkWidget *widget)
 {
  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);

-  return gtk_widget_grab_focus (entry->text);
+  return gtk_widget_grab_focus (priv->entry);
 }

 static void
@@ -107,21 +145,27 @@ demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);

  object_class->dispose = demo_tagged_entry_dispose;
+  object_class->finalize = demo_tagged_entry_finalize;
  object_class->get_property = demo_tagged_entry_get_property;
  object_class->set_property = demo_tagged_entry_set_property;

+  widget_class->measure = demo_tagged_entry_measure;
+  widget_class->size_allocate = demo_tagged_entry_size_allocate;
  widget_class->grab_focus = demo_tagged_entry_grab_focus;
-
+ 
  gtk_editable_install_properties (object_class, 1);

-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
+  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
  gtk_widget_class_set_css_name (widget_class, "entry");
 }

 static GtkEditable *
 demo_tagged_entry_get_delegate (GtkEditable *editable)
 {
-  return GTK_EDITABLE (DEMO_TAGGED_ENTRY (editable)->text);
+  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (editable);
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
+  return GTK_EDITABLE (priv->entry);
 }

 static void
@@ -140,9 +184,11 @@ void
 demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
                           GtkWidget       *tag)
 {
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  gtk_widget_set_parent (tag, GTK_WIDGET (entry));
+  gtk_container_add (GTK_CONTAINER (priv->box), tag);
 }

 void
@@ -150,24 +196,30 @@ demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
                                    GtkWidget       *tag,
                                    GtkWidget       *sibling)
 {
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  gtk_widget_insert_after (tag, GTK_WIDGET (entry), sibling);
+  if (sibling == NULL)
+    gtk_container_add (GTK_CONTAINER (priv->box), tag);
+  else
+    gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
 }

 void
 demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
                              GtkWidget       *tag)
 {
+  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+
  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

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

 struct _DemoTaggedEntryTag
 {
  GtkWidget parent;
-
  GtkWidget *box;
  GtkWidget *label;
  GtkWidget *button;
@@ -198,11 +250,11 @@ static guint signals[LAST_SIGNAL] = { 0, };
 G_DEFINE_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, GTK_TYPE_WIDGET)

 static void
-on_released (GtkGestureClick    *gesture,
-             int                 n_press,
-             double              x,
-             double              y,
-             DemoTaggedEntryTag *tag)
+on_released (GtkGestureClick      *gesture,
+             int                   n_press,
+             double                x,
+             double                y,
+             DemoTaggedEntryTag   *tag)
 {
  g_signal_emit (tag, signals[SIGNAL_CLICKED], 0);
 }
@@ -216,7 +268,7 @@ demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
  tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
  tag->label = gtk_label_new ("");
-  gtk_box_append (GTK_BOX (tag->box), tag->label);
+  gtk_container_add (GTK_CONTAINER (tag->box), tag->label);

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

  if (!has_close_button && tag->button)
    {
-      gtk_box_remove (GTK_BOX (tag->box), tag->button);
+      gtk_container_remove (GTK_CONTAINER (tag->box), tag->button);
      tag->button = NULL;
    }
  else if (has_close_button && tag->button == NULL)
@@ -417,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_button_set_child (GTK_BUTTON (tag->button), image);
+      gtk_container_add (GTK_CONTAINER (tag->button), image);
      gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
      gtk_button_set_has_frame (GTK_BUTTON (tag->button), FALSE);
-      gtk_box_append (GTK_BOX (tag->box), tag->button);
+      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
      g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
    }

--- a/demos/gtk-demo/demotaggedentry.h
+++ b/demos/gtk-demo/demotaggedentry.h
@@ -25,11 +25,39 @@

 G_BEGIN_DECLS

-#define DEMO_TYPE_TAGGED_ENTRY (demo_tagged_entry_get_type ())
-G_DECLARE_FINAL_TYPE (DemoTaggedEntry, demo_tagged_entry, DEMO, TAGGED_ENTRY, GtkWidget)
+#define DEMO_TYPE_TAGGED_ENTRY                 (demo_tagged_entry_get_type ())
+#define DEMO_TAGGED_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntry))
+#define DEMO_TAGGED_ENTRY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
+#define DEMO_IS_TAGGED_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY))
+#define DEMO_IS_TAGGED_ENTRY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY))
+#define DEMO_TAGGED_ENTRY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))

-#define DEMO_TYPE_TAGGED_ENTRY_TAG (demo_tagged_entry_tag_get_type ())
-G_DECLARE_FINAL_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, DEMO, TAGGED_ENTRY_TAG, GtkWidget)
+typedef struct _DemoTaggedEntry       DemoTaggedEntry;
+typedef struct _DemoTaggedEntryClass  DemoTaggedEntryClass;
+
+struct _DemoTaggedEntry
+{
+  GtkWidget parent;
+};
+
+struct _DemoTaggedEntryClass
+{
+  GtkWidgetClass parent_class;
+};
+
+#define DEMO_TYPE_TAGGED_ENTRY_TAG                (demo_tagged_entry_tag_get_type ())
+#define DEMO_TAGGED_ENTRY_TAG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
+#define DEMO_TAGGED_ENTRY_TAG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
+#define DEMO_IS_TAGGED_ENTRY_TAG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG))
+#define DEMO_IS_TAGGED_ENTRY_TAG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG))
+#define DEMO_TAGGED_ENTRY_TAG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTagClass))
+
+typedef struct _DemoTaggedEntryTag       DemoTaggedEntryTag;
+typedef struct _DemoTaggedEntryTagClass  DemoTaggedEntryTagClass;
+
+
+GType           demo_tagged_entry_get_type (void) G_GNUC_CONST;
+GType           demo_tagged_entry_tag_get_type (void) G_GNUC_CONST;

 GtkWidget *     demo_tagged_entry_new     (void);

--- a/demos/gtk-demo/demowidget.c
+++ b/demos/gtk-demo/demowidget.c
@@ -1,121 +0,0 @@
-#include "demowidget.h"
-#include "demolayout.h"
-
-/* parent widget */
-
-struct _DemoWidget
-{
-  GtkWidget parent_instance;
-
-  gboolean backward; /* whether we go 0 -> 1 or 1 -> 0 */
-  gint64 start_time; /* time the transition started */
-  guint tick_id;     /* our tick cb */
-};
-
-struct _DemoWidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (DemoWidget, demo_widget, GTK_TYPE_WIDGET)
-
-/* The widget is controlling the transition by calling
- * demo_layout_set_position() in a tick callback.
- *
- * We take half a second to go from one layout to the other.
- */
-
-#define DURATION (0.5 * G_TIME_SPAN_SECOND)
-
-static gboolean
-transition (GtkWidget     *widget,
-            GdkFrameClock *frame_clock,
-            gpointer       data)
-{
-  DemoWidget *self = DEMO_WIDGET (widget);
-  DemoLayout *demo_layout = DEMO_LAYOUT (gtk_widget_get_layout_manager (widget));
-  gint64 now = g_get_monotonic_time ();
-
-  gtk_widget_queue_allocate (widget);
-
-  if (self->backward)
-    demo_layout_set_position (demo_layout, 1.0 - (now - self->start_time) / DURATION);
-  else
-    demo_layout_set_position (demo_layout, (now - self->start_time) / DURATION);
-
-  if (now - self->start_time >= DURATION)
-    {
-      self->backward = !self->backward;
-      demo_layout_set_position (demo_layout, self->backward ? 1.0 : 0.0);
-      /* keep things interesting by shuffling the positions */
-      if (!self->backward)
-        demo_layout_shuffle (demo_layout);
-      self->tick_id = 0;
-
-      return G_SOURCE_REMOVE;
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-clicked (GtkGestureClick *gesture,
-         guint            n_press,
-         double           x,
-         double           y,
-         gpointer         data)
-{
-  DemoWidget *self = data;
-
-  if (self->tick_id != 0)
-    return;
-
-  self->start_time = g_get_monotonic_time ();
-  self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self), transition, NULL, NULL);
-}
-
-static void
-demo_widget_init (DemoWidget *self)
-{
-  GtkGesture *gesture;
-
-  gesture = gtk_gesture_click_new ();
-  g_signal_connect (gesture, "pressed", G_CALLBACK (clicked), self);
-  gtk_widget_add_controller (GTK_WIDGET (self), GTK_EVENT_CONTROLLER (gesture));
-}
-
-static void
-demo_widget_dispose (GObject *object)
-{
-  GtkWidget *child;
-
-  while ((child = gtk_widget_get_first_child (GTK_WIDGET (object))))
-    gtk_widget_unparent (child);
-
-  G_OBJECT_CLASS (demo_widget_parent_class)->dispose (object);
-}
-
-static void
-demo_widget_class_init (DemoWidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo_widget_dispose;
-
-  /* here is where we use our custom layout manager */
-  gtk_widget_class_set_layout_manager_type (widget_class, DEMO_TYPE_LAYOUT);
-}
-
-GtkWidget *
-demo_widget_new (void)
-{
-  return g_object_new (DEMO_TYPE_WIDGET, NULL);
-}
-
-void
-demo_widget_add_child (DemoWidget *self,
-                       GtkWidget  *child)
-{
-  gtk_widget_set_parent (child, GTK_WIDGET (self));
-}
--- a/demos/gtk-demo/demowidget.h
+++ b/demos/gtk-demo/demowidget.h
@@ -1,11 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define DEMO_TYPE_WIDGET (demo_widget_get_type ())
-G_DECLARE_FINAL_TYPE (DemoWidget, demo_widget, DEMO, WIDGET, GtkWidget)
-
-GtkWidget * demo_widget_new       (void);
-
-void        demo_widget_add_child (DemoWidget *self,
-                                   GtkWidget  *child);
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -1,7 +1,6 @@
-/* Dialogs
+/* Dialogs and Message Boxes
 *
- * Dialogs are used to pop up transient windows for information
- * and user feedback.
+ * Dialog widgets are used to pop up a transient window for user feedback.
 */

 #include <glib/gi18n.h>
@@ -16,77 +15,57 @@ message_dialog_clicked (GtkButton *button,
                        gpointer   user_data)
 {
  GtkWidget *dialog;
-  static int i = 1;
+  static gint i = 1;

  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_INFO,
                                   GTK_BUTTONS_OK_CANCEL,
-                                   "Test message");
+                                   "This message box has been popped up the following\n"
+                                   "number of times:");
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            ngettext ("Has been shown once", "Has been shown %d times", i), i);
-  g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
-  gtk_widget_show (dialog);
+                                            "%d", i);
+  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
  i++;
 }

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

  dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
                                        GTK_WINDOW (window),
-                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_USE_HEADER_BAR,
-                                        _("_OK"), GTK_RESPONSE_OK,
-                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        _("_OK"),
+                                        GTK_RESPONSE_OK,
+                                        "_Cancel",
+                                        GTK_RESPONSE_CANCEL,
                                        NULL);

-  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

-  table = gtk_grid_new ();
-  gtk_widget_set_hexpand (table, TRUE);
-  gtk_widget_set_vexpand (table, TRUE);
-  gtk_widget_set_halign (table, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (table, GTK_ALIGN_CENTER);
-  gtk_box_append (GTK_BOX (content_area), table);
-  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
-  gtk_grid_set_column_spacing (GTK_GRID (table), 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+  gtk_container_add (GTK_CONTAINER (content_area), hbox);

+  image = gtk_image_new_from_icon_name ("dialog-question");
+  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+  gtk_container_add (GTK_CONTAINER (hbox), image);
+
+  table = gtk_grid_new ();
+  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
+  gtk_container_add (GTK_CONTAINER (hbox), table);
  label = gtk_label_new_with_mnemonic ("_Entry 1");
  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
  local_entry1 = gtk_entry_new ();
@@ -102,23 +81,21 @@ interactive_dialog_clicked (GtkButton *button,
  gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);

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

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

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

 GtkWidget *
 do_dialog (GtkWidget *do_widget)
 {
+  GtkWidget *frame;
  GtkWidget *vbox;
  GtkWidget *vbox2;
  GtkWidget *hbox;
@@ -131,42 +108,50 @@ do_dialog (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), "Dialogs");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      frame = gtk_frame_new ("Dialogs");
+      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);
      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);
+      gtk_frame_set_child (GTK_FRAME (frame), vbox);

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

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

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

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

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

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

  return window;
 }
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -7,352 +7,6 @@

 #include <gtk/gtk.h>

-G_DECLARE_FINAL_TYPE (CanvasItem, canvas_item, CANVAS, ITEM, GtkWidget)
-
-struct _CanvasItem {
-  GtkWidget parent;
-
-  GtkWidget *fixed;
-  GtkWidget *label;
-
-  double r;
-  double angle;
-  double delta;
-
-  GtkWidget *editor;
-};
-
-struct _CanvasItemClass {
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (CanvasItem, canvas_item, GTK_TYPE_WIDGET)
-
-static int n_items = 0;
-
-static void
-set_color (CanvasItem *item,
-           GdkRGBA    *color)
-{
-  char *css;
-  char *str;
-  GtkStyleContext *context;
-  GtkCssProvider *provider;
-  const char *old_class;
-
-  str = gdk_rgba_to_string (color);
-  css = g_strdup_printf ("* { background: %s; }", str);
-
-  context = gtk_widget_get_style_context (item->label);
-  provider = g_object_get_data (G_OBJECT (context), "style-provider");
-  if (provider)
-    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
-
-  old_class = (const char *)g_object_get_data (G_OBJECT (item->label), "css-class");
-  if (old_class)
-    gtk_widget_remove_css_class (item->label, old_class);
-
-  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->label), 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 void
-set_css (CanvasItem *item,
-         const char *class)
-{
-  GtkStyleContext *context;
-  GtkCssProvider *provider;
-  const char *old_class;
-
-  context = gtk_widget_get_style_context (item->label);
-  provider = g_object_get_data (G_OBJECT (context), "style-provider");
-  if (provider)
-    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
-
-  old_class = (const char *)g_object_get_data (G_OBJECT (item->label), "css-class");
-  if (old_class)
-    gtk_widget_remove_css_class (item->label, old_class);
-
-  g_object_set_data_full (G_OBJECT (item->label), "css-class", g_strdup (class), g_free);
-  gtk_widget_add_css_class (item->label, class);
-}
-
-static gboolean
-item_drag_drop (GtkDropTarget *dest,
-                const GValue  *value,
-                double         x,
-                double         y)
-{
-  GtkWidget *label = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
-  CanvasItem *item = CANVAS_ITEM (gtk_widget_get_parent (gtk_widget_get_parent (label)));
-
-  if (G_VALUE_TYPE (value) == GDK_TYPE_RGBA)
-    set_color (item, g_value_get_boxed (value));
-  else if (G_VALUE_TYPE (value) == G_TYPE_STRING)
-    set_css (item, g_value_get_string (value));
-
-  return TRUE;
-}
-
-static void
-apply_transform (CanvasItem *item)
-{
-  GskTransform *transform;
-  double x, y;
-
-  x = gtk_widget_get_allocated_width (item->label) / 2.0;
-  y = gtk_widget_get_allocated_height (item->label) / 2.0;
-  item->r = sqrt (x*x + y*y);
-
-  transform = gsk_transform_translate (
-                 gsk_transform_rotate (
-                   gsk_transform_translate (NULL,
-                                            &(graphene_point_t) { item->r, item->r }),
-                   item->angle + item->delta),
-                 &(graphene_point_t) { - x, - y });
-
-  gtk_fixed_set_child_transform (GTK_FIXED (item->fixed), item->label, transform);
-  gsk_transform_unref (transform);
-}
-
-static void
-angle_changed (GtkGestureRotate *gesture,
-               double            angle,
-               double            delta)
-{
-  CanvasItem *item = CANVAS_ITEM (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
-
-  item->delta = angle / M_PI * 180.0;
-
-  apply_transform (item);
-}
-
-static void
-rotate_done (GtkGesture *gesture)
-{
-  CanvasItem *item = CANVAS_ITEM (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
-
-  item->angle = item->angle + item->delta;
-  item->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 gboolean
-theme_is_dark (void)
-{
-  GtkSettings *settings;
-  char *theme;
-  gboolean prefer_dark;
-  gboolean dark;
-
-  settings = gtk_settings_get_default ();
-  g_object_get (settings,
-                "gtk-theme-name", &theme,
-                "gtk-application-prefer-dark-theme", &prefer_dark,
-                NULL);
-
-  if ((strcmp (theme, "Adwaita") == 0 && prefer_dark) || strcmp (theme, "HighContrastInverse") == 0)
-    dark = TRUE;
-  else
-    dark = FALSE;
-
-  g_free (theme);
-
-  return dark;
-}
-
-static void
-canvas_item_init (CanvasItem *item)
-{
-  char *text;
-  char *id;
-  GdkRGBA rgba;
-  GtkDropTarget *dest;
-  GtkGesture *gesture;
-  GType types[2] = { GDK_TYPE_RGBA, G_TYPE_STRING };
-
-  n_items++;
-
-  text = g_strdup_printf ("Item %d", n_items);
-  item->label = gtk_label_new (text);
-  gtk_widget_add_css_class (item->label, "canvasitem");
-  g_free (text);
-
-  item->fixed = gtk_fixed_new ();
-  gtk_widget_set_parent (item->fixed, GTK_WIDGET (item));
-  gtk_fixed_put (GTK_FIXED (item->fixed), item->label, 0, 0);
-
-  gtk_widget_add_css_class (item->label, "frame");
-
-  id = g_strdup_printf ("item%d", n_items);
-  gtk_widget_set_name (item->label, id);
-  g_free (id);
-
-  if (theme_is_dark ())
-    gdk_rgba_parse (&rgba, "blue");
-  else
-    gdk_rgba_parse (&rgba, "yellow");
-
-  set_color (item, &rgba);
-
-  item->angle = 0;
-
-  dest = gtk_drop_target_new (G_TYPE_INVALID, GDK_ACTION_COPY);
-  gtk_drop_target_set_gtypes (dest, types, G_N_ELEMENTS (types));
-  g_signal_connect (dest, "drop", G_CALLBACK (item_drag_drop), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (item->label), 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 (GTK_WIDGET (item), GTK_EVENT_CONTROLLER (gesture));
-
-  gesture = gtk_gesture_click_new ();
-  g_signal_connect (gesture, "released", G_CALLBACK (click_done), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (item), GTK_EVENT_CONTROLLER (gesture));
-}
-
-static void
-canvas_item_dispose (GObject *object)
-{
-  CanvasItem *item = CANVAS_ITEM (object);
-
-  g_clear_pointer (&item->fixed, gtk_widget_unparent);
-  g_clear_pointer (&item->editor, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (canvas_item_parent_class)->dispose (object);
-}
-
-static void
-canvas_item_map (GtkWidget *widget)
-{
-  CanvasItem *item = CANVAS_ITEM (widget);
-
-  GTK_WIDGET_CLASS (canvas_item_parent_class)->map (widget);
-
-  apply_transform (item);
-}
-
-static void
-canvas_item_class_init (CanvasItemClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = canvas_item_dispose;
-
-  widget_class->map = canvas_item_map;
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-  gtk_widget_class_set_css_name (widget_class, "item");
-}
-
-static GtkWidget *
-canvas_item_new (void)
-{
-  CanvasItem *item = g_object_new (canvas_item_get_type (), NULL);
-
-  return GTK_WIDGET (item);
-}
-
-static GdkPaintable *
-canvas_item_get_drag_icon (CanvasItem *item)
-{
-  return gtk_widget_paintable_new (item->fixed);
-}
-
-static gboolean
-canvas_item_is_editing (CanvasItem *item)
-{
-  return item->editor != NULL;
-}
-
-static void
-scale_changed (GtkRange   *range,
-               CanvasItem *item)
-{
-  item->angle = gtk_range_get_value (range);
-  apply_transform (item);
-}
-
-static void
-text_changed (GtkEditable *editable,
-              GParamSpec  *pspec,
-              CanvasItem  *item)
-{
-  gtk_label_set_text (GTK_LABEL (item->label), gtk_editable_get_text (editable));
-  apply_transform (item);
-}
-
-static void
-canvas_item_stop_editing (CanvasItem *item)
-{
-  GtkWidget *scale;
-
-  if (!item->editor)
-    return;
-
-  scale = gtk_widget_get_last_child (item->editor);
-  g_signal_handlers_disconnect_by_func (scale, scale_changed, item);
-
-  gtk_fixed_remove (GTK_FIXED (gtk_widget_get_parent (item->editor)), item->editor);
-  item->editor = NULL;
-}
-
-static void
-canvas_item_start_editing (CanvasItem *item)
-{
-  GtkWidget *canvas = gtk_widget_get_parent (GTK_WIDGET (item));
-  GtkWidget *entry;
-  GtkWidget *scale;
-  double x, y;
-
-  if (item->editor)
-    return;
-
-  item->editor = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-
-  entry = gtk_entry_new ();
-
-  gtk_editable_set_text (GTK_EDITABLE (entry),
-                         gtk_label_get_text (GTK_LABEL (item->label)));
-
-  gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
-  g_signal_connect (entry, "notify::text", G_CALLBACK (text_changed), item);
-  g_signal_connect_swapped (entry, "activate", G_CALLBACK (canvas_item_stop_editing), item);
-
-  gtk_box_append (GTK_BOX (item->editor), entry);
-
-  scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 360, 1);
-  gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
-  gtk_range_set_value (GTK_RANGE (scale), fmod (item->angle, 360));
-
-  g_signal_connect (scale, "value-changed", G_CALLBACK (scale_changed), item);
-
-  gtk_box_append (GTK_BOX (item->editor), scale);
-
-  gtk_widget_translate_coordinates (GTK_WIDGET (item), canvas, 0, 0, &x, &y);
-  gtk_fixed_put (GTK_FIXED (canvas), item->editor, x, y + 2 * item->r);
-  gtk_widget_grab_focus (entry);
-
-}
-
 static GdkContentProvider *
 prepare (GtkDragSource *source,
         double         x,
@@ -364,8 +18,7 @@ prepare (GtkDragSource *source,
  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
  item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);

-  item = gtk_widget_get_ancestor (item, canvas_item_get_type ());
-  if (!item)
+  if (!GTK_IS_LABEL (item))
    return NULL;

  g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
@@ -378,17 +31,12 @@ drag_begin (GtkDragSource *source,
            GdkDrag       *drag)
 {
  GtkWidget *canvas;
-  CanvasItem *item;
-  GdkPaintable *paintable;
+  GtkWidget *item;

  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-  item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
+  item = g_object_get_data (G_OBJECT (canvas), "dragged-item");

-  paintable = canvas_item_get_drag_icon (item);
-  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
-  g_object_unref (paintable);
-
-  gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);
+  gtk_widget_set_opacity (item, 0.5);
 }

 static void
@@ -405,12 +53,32 @@ drag_end (GtkDragSource *source,
  gtk_widget_set_opacity (item, 1.0);
 }

-static gboolean
+static void
 drag_cancel (GtkDragSource       *source,
             GdkDrag             *drag,
             GdkDragCancelReason  reason)
 {
-  return FALSE;
+  drag_end (source, drag);
+}
+
+typedef struct {
+  double x, y;
+  double angle;
+  double delta;
+} TransformData;
+
+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
@@ -419,58 +87,90 @@ drag_drop (GtkDropTarget *target,
           double         x,
           double         y)
 {
-  CanvasItem *item;
+  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");

-  canvas = gtk_widget_get_parent (GTK_WIDGET (item));
+  transform_data->x = x;
+  transform_data->y = y;
+
+  canvas = gtk_widget_get_parent (item);
  last_child = gtk_widget_get_last_child (canvas);
-  if (GTK_WIDGET (item) != last_child)
-    gtk_widget_insert_after (GTK_WIDGET (item), canvas, last_child);
+  if (item != last_child)
+    gtk_widget_insert_after (item, canvas, last_child);

-  gtk_fixed_move (GTK_FIXED (canvas), GTK_WIDGET (item), x - item->r, y - item->r);
+  apply_transform (item);

  return TRUE;
 }

+static double pos_x, pos_y;
+
+static GtkWidget * canvas_item_new (double x, double y);
+
 static void
 new_item_cb (GtkWidget *button, gpointer data)
 {
  GtkWidget *canvas = data;
-  GtkWidget *popover;
  GtkWidget *item;
-  GdkRectangle rect;

-  popover = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
-  gtk_popover_get_pointing_to (GTK_POPOVER (popover), &rect);
-
-  item = canvas_item_new ();
-  gtk_fixed_put (GTK_FIXED (canvas), item, rect.x, rect.y);
-  apply_transform (CANVAS_ITEM (item));
+  item = canvas_item_new (pos_x, pos_y);
+  gtk_container_add (GTK_CONTAINER (canvas), item);
+  apply_transform (item);

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

+static void
+edit_label_done (GtkWidget *entry, gpointer data)
+{
+  GtkWidget *canvas = gtk_widget_get_parent (entry);
+  GtkWidget *label;
+  int 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);
+}
+
 static void
 edit_cb (GtkWidget *button, GtkWidget *child)
 {
-  CanvasItem *item = CANVAS_ITEM (child);
+  GtkWidget *canvas = gtk_widget_get_parent (child);
+  int x, y;
+
+  gtk_fixed_get_child_position (GTK_FIXED (canvas), child, &x, &y);
+
+  if (GTK_IS_LABEL (child))
+    {
+      GtkWidget *entry = gtk_entry_new ();
+
+      g_object_set_data (G_OBJECT (entry), "label", child);
+
+      gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_LABEL (child)));
+      gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
+      g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
+      gtk_fixed_put (GTK_FIXED (canvas), entry, x, y);
+      gtk_widget_grab_focus (entry);
+      gtk_widget_hide (child);
+    }

  if (button)
    gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
-
-  if (!canvas_item_is_editing (item))
-    canvas_item_start_editing (item);
 }

 static void
 delete_cb (GtkWidget *button, GtkWidget *child)
 {
-  GtkWidget *canvas = gtk_widget_get_parent (child);
-
-  gtk_fixed_remove (GTK_FIXED (canvas), child);
+  gtk_widget_destroy (child);

  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
@@ -487,7 +187,6 @@ pressed_cb (GtkGesture *gesture,

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
  child = gtk_widget_pick (widget, x, y, GTK_PICK_DEFAULT);
-  child = gtk_widget_get_ancestor (child, canvas_item_get_type ());

  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
    {
@@ -495,35 +194,38 @@ pressed_cb (GtkGesture *gesture,
      GtkWidget *box;
      GtkWidget *item;

+      pos_x = x;
+      pos_y = y;
+
      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_popover_set_child (GTK_POPOVER (menu), box);
+      gtk_container_add (GTK_CONTAINER (menu), box);

      item = gtk_button_new_with_label ("New");
      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
      g_signal_connect (item, "clicked", G_CALLBACK (new_item_cb), widget);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);

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

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

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

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

      gtk_popover_popup (GTK_POPOVER (menu));
    }
@@ -538,20 +240,14 @@ released_cb (GtkGesture *gesture,
 {
  GtkWidget *widget;
  GtkWidget *child;
-  CanvasItem *item;

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
  child = gtk_widget_pick (widget, x, y, 0);
-  item = (CanvasItem *)gtk_widget_get_ancestor (child, canvas_item_get_type ());
-  if (!item)
-    return;

  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
    {
-      if (canvas_item_is_editing (item))
-        canvas_item_stop_editing (item);
-      else
-        canvas_item_start_editing (item);
+      if (child != NULL && child != widget)
+        edit_cb (NULL, child);
    }
 }

@@ -589,117 +285,129 @@ canvas_new (void)
  return canvas;
 }

-static GdkContentProvider *
-css_drag_prepare (GtkDragSource *source,
-                  double         x,
-                  double         y,
-                  GtkWidget     *button)
+static void
+set_color (GtkWidget *item,
+           GdkRGBA   *color)
 {
-  const char *class;
-  GdkPaintable *paintable;
+  char *css;
+  char *str;
+  GtkStyleContext *context;
+  GtkCssProvider *provider;

-  class = (const char *)g_object_get_data (G_OBJECT (button), "css-class");
+  str = gdk_rgba_to_string (color);
+  css = g_strdup_printf ("* { background: %s; padding: 10px; }", str);

-  paintable = gtk_widget_paintable_new (button);
-  gtk_drag_source_set_icon (source, paintable, 0, 0);
-  g_object_unref (paintable);
+  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));

-  return gdk_content_provider_new_typed (G_TYPE_STRING, class);
+  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 *
-css_button_new (const char *class)
+canvas_item_new (double x,
+                 double y)
 {
-  GtkWidget *button;
-  GtkDragSource *source;
+  GtkWidget *widget;
+  char *label;
+  char *id;
+  TransformData *transform_data;
+  GdkRGBA rgba;
+  GtkDropTarget *dest;
+  GtkGesture *gesture;

-  button = gtk_image_new ();
-  gtk_widget_set_size_request (button, 48, 32);
-  gtk_widget_add_css_class (button, class);
-  g_object_set_data (G_OBJECT (button), "css-class", (gpointer)class);
+  n_items++;

-  source = gtk_drag_source_new ();
-  g_signal_connect (source, "prepare", G_CALLBACK (css_drag_prepare), button);
-  gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (source));
+  label = g_strdup_printf ("Item %d", n_items);
+  id = g_strdup_printf ("item%d", n_items);

-  return button;
-}
+  gdk_rgba_parse (&rgba, "yellow");

-typedef struct
-{
-  GtkWidget parent_instance;
-  GdkRGBA color;
-} ColorSwatch;
+  widget = gtk_label_new (label);
+  gtk_widget_add_css_class (widget, "frame");
+  gtk_widget_set_name (widget, id);

-typedef struct
-{
-  GtkWidgetClass parent_class;
-} ColorSwatchClass;
+  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_DEFINE_TYPE (ColorSwatch, color_swatch, GTK_TYPE_WIDGET)
+  g_free (label);
+  g_free (id);

-static GdkContentProvider *
-color_swatch_drag_prepare (GtkDragSource  *source,
-                           double          x,
-                           double          y,
-                           ColorSwatch    *swatch)
-{
-  return gdk_content_provider_new_typed (GDK_TYPE_RGBA, &swatch->color);
-}
+  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));

-static void
-color_swatch_init (ColorSwatch *swatch)
-{
-  GtkDragSource *source = gtk_drag_source_new ();
-  g_signal_connect (source, "prepare", G_CALLBACK (color_swatch_drag_prepare), swatch);
-  gtk_widget_add_controller (GTK_WIDGET (swatch), GTK_EVENT_CONTROLLER (source));
-}
+  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));

-static void
-color_swatch_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  ColorSwatch *swatch = (ColorSwatch *)widget;
-  float w = gtk_widget_get_width (widget);
-  float h = gtk_widget_get_height (widget);
-
-  gtk_snapshot_append_color (snapshot, &swatch->color,
-                             &GRAPHENE_RECT_INIT(0, 0, w, h));
-}
-
-void
-color_swatch_measure (GtkWidget      *widget,
-                      GtkOrientation  orientation,
-                      int             for_size,
-                      int            *minimum_size,
-                      int            *natural_size,
-                      int            *minimum_baseline,
-                      int            *natural_baseline)
-{
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *minimum_size = *natural_size = 48;
-  else
-    *minimum_size = *natural_size = 32;
-}
-
-static void
-color_swatch_class_init (ColorSwatchClass *class)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  widget_class->snapshot = color_swatch_snapshot;
-  widget_class->measure = color_swatch_measure;
-  gtk_widget_class_set_css_name (widget_class, "colorswatch");
-}
-
-static GtkWidget *
-color_swatch_new (const char *color)
-{
-  ColorSwatch *swatch = g_object_new (color_swatch_get_type (), NULL);
-
-  gdk_rgba_parse (&swatch->color, color);
-
-  return GTK_WIDGET (swatch);
+  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;
@@ -709,9 +417,9 @@ do_dnd (GtkWidget *do_widget)
 {
  if (!window)
    {
-      GtkWidget *button;
      GtkWidget *sw;
      GtkWidget *canvas;
+      GtkWidget *widget;
      GtkWidget *box, *box2, *box3;
      const char *colors[] = {
        "red", "green", "blue", "magenta", "orange", "gray", "black", "yellow",
@@ -721,33 +429,27 @@ do_dnd (GtkWidget *do_widget)
      };
      int i;
      int x, y;
-      GtkCssProvider *provider;
-
-      button = gtk_color_button_new ();
-      g_object_unref (g_object_ref_sink (button));
-
-      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);
-      g_object_unref (provider);

+      widget = gtk_color_button_new ();
+      gtk_widget_destroy (widget);
+  
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Drag-and-Drop");
      gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_window_set_child (GTK_WINDOW (window), box);

      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), box2);
+      gtk_container_add (GTK_CONTAINER (box), box2);

      canvas = canvas_new ();
-      gtk_box_append (GTK_BOX (box2), canvas);
+      gtk_container_add (GTK_CONTAINER (box2), canvas);

      n_items = 0;

@@ -756,36 +458,43 @@ do_dnd (GtkWidget *do_widget)
        {
          GtkWidget *item;

-          item = canvas_item_new ();
-          gtk_fixed_put (GTK_FIXED (canvas), item, x, y);
-          apply_transform (CANVAS_ITEM (item));
+          item = canvas_item_new (x, y);
+          gtk_container_add (GTK_CONTAINER (canvas), item);
+          apply_transform (item);

          x += 150;
          y += 100;
        }

-      sw = gtk_scrolled_window_new ();
+      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);
+      gtk_container_add (GTK_CONTAINER (box), sw);

      box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_widget_add_css_class (box3, "linked");
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box3);

      for (i = 0; colors[i]; i++)
-        gtk_box_append (GTK_BOX (box3), color_swatch_new (colors[i]));
+        {
+          GdkRGBA rgba;
+          GtkWidget *swatch;

-      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow1"));
-      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow2"));
-      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow3"));
+          gdk_rgba_parse (&rgba, colors[i]);
+
+          swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
+                                 "rgba", &rgba,
+                                 "selectable", FALSE,
+                                 NULL);
+          gtk_container_add (GTK_CONTAINER (box3), swatch);
+        }
    }

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

  return window;
 }
--- a/demos/gtk-demo/dnd.css
+++ b/demos/gtk-demo/dnd.css
@@ -1,37 +0,0 @@
-label.canvasitem {
-  padding: 10px;
-  margin: 1px;
-}
-
-.canvasitem.rainbow1,
-image.rainbow1 {
-  background: linear-gradient(140deg,red,orange,yellow,green,blue,purple);
-}
-
-.canvasitem.rainbow2,
-image.rainbow2 {
-  animation: rainbow2 1s infinite linear;
-}
-
-@keyframes rainbow2 {
- 0% { background: linear-gradient(0deg,red,orange,yellow,green,blue,purple); }
- 25% { background: linear-gradient(90deg,red,orange,yellow,green,blue,purple); }
- 50% { background: linear-gradient(180deg,red,orange,yellow,green,blue,purple); }
- 75% { background: linear-gradient(270deg,red,orange,yellow,green,blue,purple); }
- 100% { background: linear-gradient(360deg,red,orange,yellow,green,blue,purple); }
-}
-
-.canvasitem.rainbow3,
-image.rainbow3 {
-  animation: rainbow3 1s infinite linear;
-}
-
-@keyframes rainbow3 {
- 0% { background: linear-gradient(140deg,red,orange,yellow,green,blue,purple); }
- 16.6% { background: linear-gradient(140deg,purple,red,orange,yellow,green,blue); }
- 33.2% { background: linear-gradient(140deg,blue,purple,red,orange,yellow,green); }
- 50% { background: linear-gradient(140deg,green,blue,purple,red,orange,yellow); }
- 66.6% { background: linear-gradient(140deg,yellow,green,blue,purple,red,orange); }
- 83.2% { background: linear-gradient(140deg,orange,yellow,green,blue,purple,red); }
- 100% { background: linear-gradient(140deg,red,orange,yellow,green,blue,purple); }
-}
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -64,8 +64,8 @@ scribble_draw (GtkDrawingArea *da,
 /* Draw a rectangle on the screen */
 static void
 draw_brush (GtkWidget *widget,
-            double     x,
-            double     y)
+            gdouble    x,
+            gdouble    y)
 {
  GdkRectangle update_rect;
  cairo_t *cr;
@@ -125,164 +125,49 @@ drag_end (GtkGestureDrag *gesture,
 }

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

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

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

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

 static void
@@ -322,21 +207,22 @@ do_drawingarea (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

      /*
-       * Create the groups area
+       * Create the checkerboard area
       */
+
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Knockout groups</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+                            "<u>Checkerboard pattern</u>");
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_vexpand (frame, TRUE);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), groups_draw, NULL, NULL);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), checkerboard_draw, NULL, NULL);
      gtk_frame_set_child (GTK_FRAME (frame), da);

      /*
@@ -346,11 +232,11 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Scribble area</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_vexpand (frame, TRUE);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -374,7 +260,7 @@ do_drawingarea (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
      gtk_widget_show (window);
  else
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/dropdown.c
+++ b/demos/gtk-demo/dropdown.c
@@ -1,305 +0,0 @@
-/* Drop Downs
- *
- * The GtkDropDown widget is a modern alternative to GtkComboBox.
- * It uses list models instead of tree models, and the content is
- * displayed using widgets instead of cell renderers.
- *
- * The examples here demonstrate how to use different kinds of
- * list models with GtkDropDown, how to use search and how to
- * display the selected item differently from the presentation
- * in the popup.
- */
-
-#include <gtk/gtk.h>
-
-
-#define STRING_TYPE_HOLDER (string_holder_get_type ())
-G_DECLARE_FINAL_TYPE (StringHolder, string_holder, STRING, HOLDER, GObject)
-
-struct _StringHolder {
-  GObject parent_instance;
-  char *title;
-  char *icon;
-  char *description;
-};
-
-G_DEFINE_TYPE (StringHolder, string_holder, G_TYPE_OBJECT);
-
-static void
-string_holder_init (StringHolder *holder)
-{
-}
-
-static void
-string_holder_finalize (GObject *object)
-{
-  StringHolder *holder = STRING_HOLDER (object);
-
-  g_free (holder->title);
-  g_free (holder->icon);
-  g_free (holder->description);
-
-  G_OBJECT_CLASS (string_holder_parent_class)->finalize (object);
-}
-
-static void
-string_holder_class_init (StringHolderClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = string_holder_finalize;
-}
-
-static StringHolder *
-string_holder_new (const char *title, const char *icon, const char *description)
-{
-  StringHolder *holder = g_object_new (STRING_TYPE_HOLDER, NULL);
-  holder->title = g_strdup (title);
-  holder->icon = g_strdup (icon);
-  holder->description = g_strdup (description);
-  return holder;
-}
-
-static void
-strings_setup_item_single_line (GtkSignalListItemFactory *factory,
-                                GtkListItem              *item)
-{
-  GtkWidget *box, *image, *title;
-
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-
-  image = gtk_image_new ();
-  title = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (title), 0.0);
-
-  gtk_box_append (GTK_BOX (box), image);
-  gtk_box_append (GTK_BOX (box), title);
-
-  g_object_set_data (G_OBJECT (item), "title", title);
-  g_object_set_data (G_OBJECT (item), "image", image);
-
-  gtk_list_item_set_child (item, box);
-}
-
-static void
-strings_setup_item_full (GtkSignalListItemFactory *factory,
-                         GtkListItem              *item)
-{
-  GtkWidget *box, *box2, *image, *title, *description;
-
-  image = gtk_image_new ();
-  title = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (title), 0.0);
-  description = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (description), 0.0);
-  gtk_widget_add_css_class (description, "dim-label");
-
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-
-  gtk_box_append (GTK_BOX (box), image);
-  gtk_box_append (GTK_BOX (box), box2);
-  gtk_box_append (GTK_BOX (box2), title);
-  gtk_box_append (GTK_BOX (box2), description);
-
-  g_object_set_data (G_OBJECT (item), "title", title);
-  g_object_set_data (G_OBJECT (item), "image", image);
-  g_object_set_data (G_OBJECT (item), "description", description);
-
-  gtk_list_item_set_child (item, box);
-}
-
-static void
-strings_bind_item (GtkSignalListItemFactory *factory,
-                    GtkListItem              *item)
-{
-  GtkWidget *image, *title, *description;
-  StringHolder *holder;
-
-  holder = gtk_list_item_get_item (item);
-
-  title = g_object_get_data (G_OBJECT (item), "title");
-  image = g_object_get_data (G_OBJECT (item), "image");
-  description = g_object_get_data (G_OBJECT (item), "description");
-
-  gtk_label_set_label (GTK_LABEL (title), holder->title);
-  if (image)
-    {
-      gtk_image_set_from_icon_name (GTK_IMAGE (image), holder->icon);
-      gtk_widget_set_visible (image, holder->icon != NULL);
-    }
-  if (description)
-    {
-      gtk_label_set_label (GTK_LABEL (description), holder->description);
-      gtk_widget_set_visible (description , holder->description != NULL);
-    }
-}
-
-static GtkListItemFactory *
-strings_factory_new (gboolean full)
-{
-  GtkListItemFactory *factory;
-
-  factory = gtk_signal_list_item_factory_new ();
-  if (full)
-    g_signal_connect (factory, "setup", G_CALLBACK (strings_setup_item_full), NULL);
-  else
-    g_signal_connect (factory, "setup", G_CALLBACK (strings_setup_item_single_line), NULL);
-  g_signal_connect (factory, "bind", G_CALLBACK (strings_bind_item), NULL);
-
-  return factory;
-}
-
-static GListModel *
-strings_model_new (const char *const *titles,
-                   const char *const *icons,
-                   const char *const *descriptions)
-{
-  GListStore *store;
-  int i;
-
-  store = g_list_store_new (STRING_TYPE_HOLDER);
-  for (i = 0; titles[i]; i++)
-    {
-      StringHolder *holder = string_holder_new (titles[i],
-                                                icons ? icons[i] : NULL,
-                                                descriptions ? descriptions[i] : NULL);
-      g_list_store_append (store, holder);
-      g_object_unref (holder);
-    }
-
-  return G_LIST_MODEL (store);
-}
-
-static GtkWidget *
-drop_down_new_from_strings (const char *const *titles,
-                            const char *const *icons,
-                            const char *const *descriptions)
-{
-  GtkWidget *widget;
-  GListModel *model;
-  GtkListItemFactory *factory;
-  GtkListItemFactory *list_factory;
-
-  g_return_val_if_fail (titles != NULL, NULL);
-  g_return_val_if_fail (icons == NULL || g_strv_length ((char **)icons) == g_strv_length ((char **)titles), NULL);
-  g_return_val_if_fail (descriptions == NULL || g_strv_length ((char **)icons) == g_strv_length ((char **)descriptions), NULL);
-
-  model = strings_model_new (titles, icons, descriptions);
-  factory = strings_factory_new (FALSE);
-  if (icons != NULL || descriptions != NULL)
-    list_factory = strings_factory_new (TRUE);
-  else
-    list_factory = NULL;
-
-  widget = g_object_new (GTK_TYPE_DROP_DOWN,
-                         "model", model,
-                         "factory", factory,
-                         "list-factory", list_factory,
-                         NULL);
-
-  g_object_unref (model);
-  g_object_unref (factory);
-  if (list_factory)
-    g_object_unref (list_factory);
-
-  return widget;
-}
-
-static char *
-get_family_name (gpointer item)
-{
-  return g_strdup (pango_font_family_get_name (PANGO_FONT_FAMILY (item)));
-}
-
-static char *
-get_title (gpointer item)
-{
-  return g_strdup (STRING_HOLDER (item)->title);
-}
-
-GtkWidget *
-do_dropdown (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-  GtkWidget *button, *box, *spin, *check;
-  GListModel *model;
-  GtkExpression *expression;
-  const char * const times[] = { "1 minute", "2 minutes", "5 minutes", "20 minutes", NULL };
-  const char * const many_times[] = {
-    "1 minute", "2 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes",
-    "25 minutes", "30 minutes", "35 minutes", "40 minutes", "45 minutes", "50 minutes",
-    "55 minutes", "1 hour", "2 hours", "3 hours", "5 hours", "6 hours", "7 hours",
-    "8 hours", "9 hours", "10 hours", "11 hours", "12 hours", NULL
-  };
-  const char * const device_titles[] = { "Digital Output", "Headphones", "Digital Output", "Analog Output", NULL };
-  const char * const device_icons[] = {  "audio-card-symbolic", "audio-headphones-symbolic", "audio-card-symbolic", "audio-card-symbolic", NULL };
-  const char * const device_descriptions[] = {
-    "Built-in Audio", "Built-in audio", "Thinkpad Tunderbolt 3 Dock USB Audio", "Thinkpad Tunderbolt 3 Dock USB Audio", NULL
-  };
-
-  if (!window)
-    {
-      window = gtk_window_new ();
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Drop Downs");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_widget_set_margin_start (box, 10);
-      gtk_widget_set_margin_end (box, 10);
-      gtk_widget_set_margin_top (box, 10);
-      gtk_widget_set_margin_bottom (box, 10);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      button = gtk_drop_down_new (NULL, NULL);
-
-      model = G_LIST_MODEL (pango_cairo_font_map_get_default ());
-      gtk_drop_down_set_model (GTK_DROP_DOWN (button), model);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (button), 0);
-
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
-                                                0, NULL,
-                                                (GCallback)get_family_name,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
-      gtk_expression_unref (expression);
-      gtk_box_append (GTK_BOX (box), button);
-
-      spin = gtk_spin_button_new_with_range (-1, g_list_model_get_n_items (G_LIST_MODEL (model)), 1);
-      gtk_widget_set_halign (spin, GTK_ALIGN_START);
-      g_object_bind_property  (button, "selected", spin, "value", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
-      gtk_box_append (GTK_BOX (box), spin);
-
-      check = gtk_check_button_new_with_label ("Enable search");
-      g_object_bind_property  (button, "enable-search", check, "active", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
-      gtk_box_append (GTK_BOX (box), check);
-
-      g_object_unref (model);
-
-      button = drop_down_new_from_strings (times, NULL, NULL);
-      gtk_box_append (GTK_BOX (box), button);
-
-      button = drop_down_new_from_strings (many_times, NULL, NULL);
-      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
-                                                0, NULL,
-                                                (GCallback)get_title,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
-      gtk_expression_unref (expression);
-      gtk_box_append (GTK_BOX (box), button);
-
-      button = drop_down_new_from_strings (device_titles, device_icons, device_descriptions);
-      gtk_box_append (GTK_BOX (box), button);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -16,9 +16,9 @@

 typedef struct
 {
-  int    number;
-  char *product;
-  int    yummy;
+  gint   number;
+  gchar *product;
+  gint   yummy;
 }
 Item;

@@ -74,7 +74,7 @@ add_items (void)
 static GtkTreeModel *
 create_items_model (void)
 {
-  int i = 0;
+  gint i = 0;
  GtkListStore *model;
  GtkTreeIter iter;

@@ -109,7 +109,7 @@ static GtkTreeModel *
 create_numbers_model (void)
 {
 #define N_NUMBERS 10
-  int i = 0;
+  gint i = 0;
  GtkListStore *model;
  GtkTreeIter iter;

@@ -192,7 +192,7 @@ remove_item (GtkWidget *widget, gpointer data)

  if (gtk_tree_selection_get_selected (selection, NULL, &iter))
    {
-      int i;
+      gint i;
      GtkTreePath *path;

      path = gtk_tree_model_get_path (model, &iter);
@@ -211,7 +211,7 @@ separator_row (GtkTreeModel *model,
               gpointer      data)
 {
  GtkTreePath *path;
-  int idx;
+  gint idx;

  path = gtk_tree_model_get_path (model, iter);
  idx = gtk_tree_path_get_indices (path)[0];
@@ -224,7 +224,7 @@ separator_row (GtkTreeModel *model,
 static void
 editing_started (GtkCellRenderer *cell,
                 GtkCellEditable *editable,
-                 const char      *path,
+                 const gchar     *path,
                 gpointer         data)
 {
  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable),
@@ -233,15 +233,15 @@ editing_started (GtkCellRenderer *cell,

 static void
 cell_edited (GtkCellRendererText *cell,
-             const char          *path_string,
-             const char          *new_text,
+             const gchar         *path_string,
+             const gchar         *new_text,
             gpointer             data)
 {
  GtkTreeModel *model = (GtkTreeModel *)data;
  GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
  GtkTreeIter iter;

-  int column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
+  gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));

  gtk_tree_model_get_iter (model, &iter, path);

@@ -249,7 +249,7 @@ cell_edited (GtkCellRendererText *cell,
    {
    case COLUMN_ITEM_NUMBER:
      {
-        int i;
+        gint i;

        i = gtk_tree_path_get_indices (path)[0];
        g_array_index (articles, Item, i).number = atoi (new_text);
@@ -261,8 +261,8 @@ cell_edited (GtkCellRendererText *cell,

    case COLUMN_ITEM_PRODUCT:
      {
-        int i;
-        char *old_text;
+        gint i;
+        gchar *old_text;

        gtk_tree_model_get (model, &iter, column, &old_text, -1);
        g_free (old_text);
@@ -352,7 +352,8 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_widget_set_margin_start (vbox, 5);
@@ -361,15 +362,15 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_widget_set_margin_bottom (vbox, 5);
      gtk_window_set_child (GTK_WINDOW (window), vbox);

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

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

      /* create models */
      items_model = create_items_model ();
@@ -391,17 +392,17 @@ do_editable_cells (GtkWidget *do_widget)
      /* some buttons */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

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

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

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

  return window;
 }
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -1,4 +1,4 @@
-/* Entry/Completion
+/* Entry/Entry Completion
 *
 * GtkEntryCompletion provides a mechanism for adding support for
 * completion in GtkEntry.
@@ -12,48 +12,22 @@
 static GtkTreeModel *
 create_completion_model (void)
 {
-  const char *strings[] = {
-    "GNOME",
-    "gnominious",
-    "Gnomonic projection",
-    "Gnosophy",
-    "total",
-    "totally",
-    "toto",
-    "tottery",
-    "totterer",
-    "Totten trust",
-    "Tottenham hotspurs",
-    "totipotent",
-    "totipotency",
-    "totemism",
-    "totem pole",
-    "Totara",
-    "totalizer",
-    "totalizator",
-    "totalitarianism",
-    "total parenteral nutrition",
-    "total eclipse",
-    "Totipresence",
-    "Totipalmi",
-    "zombie",
-    "aæx",
-    "aæy",
-    "aæz",
-    NULL
-  };
-  int i;
  GtkListStore *store;
  GtkTreeIter iter;

  store = gtk_list_store_new (1, G_TYPE_STRING);

-  for (i = 0; strings[i]; i++)
-    {
-      /* Append one word */
-      gtk_list_store_append (store, &iter);
-      gtk_list_store_set (store, &iter, 0, strings[i], -1);
-    }
+  /* Append one word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "GNOME", -1);
+
+  /* Append another word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "total", -1);
+
+  /* And another word */
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, "totally", -1);

  return GTK_TREE_MODEL (store);
 }
@@ -74,9 +48,11 @@ do_entry_completion (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), "Completion");
+      gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_widget_set_margin_start (vbox, 5);
@@ -86,12 +62,12 @@ do_entry_completion (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label), "Try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_box_append (GTK_BOX (vbox), label);
+      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);

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

      /* Create the completion object */
      completion = gtk_entry_completion_new ();
@@ -107,15 +83,12 @@ do_entry_completion (GtkWidget *do_widget)

      /* Use model column 0 as the text column */
      gtk_entry_completion_set_text_column (completion, 0);
-
-      gtk_entry_completion_set_inline_completion (completion, TRUE);
-      gtk_entry_completion_set_inline_selection (completion, TRUE);
    }

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

  return window;
 }
--- a/demos/gtk-demo/entry_undo.c
+++ b/demos/gtk-demo/entry_undo.c
@@ -1,8 +1,8 @@
-/* Entry/Undo and Redo
+/* Entry/Entry Undo
 *
 * GtkEntry can provide basic Undo/Redo support using standard keyboard
- * accelerators such as Control+z to undo and Control+Shift+z to redo.
- * Additionally, Control+y can be used to redo.
+ * accelerators such as Primary+z to undo and Primary+Shift+z to redo.
+ * Additionally, Primary+y can be used to redo.
 *
 * Use gtk_entry_set_enable_undo() to enable undo/redo support.
 */
@@ -23,9 +23,10 @@ do_entry_undo (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), "Undo and Redo");
+      gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_widget_set_margin_start (vbox, 5);
@@ -37,18 +38,18 @@ do_entry_undo (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "Use Primary+z or Primary+Shift+z to undo or redo changes");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

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

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

  return window;
 }
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -13,9 +13,9 @@
 static GtkWidget *window = NULL;

 static void
-response_cb (GtkDialog *dialog, int response_id)
+response_cb (GtkDialog *dialog, gint response_id)
 {
-  gtk_window_destroy (GTK_WINDOW (window));
+  gtk_widget_destroy (window);
  window = NULL;
 }

@@ -35,10 +35,6 @@ do_expander (GtkWidget *do_widget)
  GtkWidget *sw;
  GtkWidget *tv;
  GtkTextBuffer *buffer;
-  GtkTextIter start;
-  GtkTextIter end;
-  GtkTextTag *tag;
-  GdkPaintable *paintable;

  if (!window)
    {
@@ -61,32 +57,19 @@ do_expander (GtkWidget *do_widget)

      expander = gtk_expander_new ("Details:");
      gtk_widget_set_vexpand (expander, TRUE);
-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
      gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (sw), TRUE);
-      gtk_widget_set_vexpand (sw, TRUE);

      tv = gtk_text_view_new ();
-
-      g_object_set (tv,
-                    "left-margin", 10,
-                    "right-margin", 10,
-                    "top-margin", 10,
-                    "bottom-margin", 10,
-                    NULL);
-
      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
      gtk_text_view_set_editable (GTK_TEXT_VIEW (tv), FALSE);
-      gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (tv), FALSE);
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (tv), GTK_WRAP_WORD);
-      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (tv), 2);
-      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (tv), 2);
-
-      gtk_text_buffer_set_text (buffer,
+      gtk_text_buffer_set_text (GTK_TEXT_BUFFER (buffer),
                                "Finally, the full story with all details. "
                                "And all the inside information, including "
                                "error codes, etc etc. Pages of information, "
@@ -94,25 +77,10 @@ do_expander (GtkWidget *do_widget)
                                "or even resize the window - it works !\n"
                                "A second paragraph will contain even more "
                                "innuendo, just to make you scroll down or "
-                                "resize the window.\n"
-                                "Do it already!\n", -1);
-
-      gtk_text_buffer_get_end_iter (buffer, &start);
-      paintable = GDK_PAINTABLE (gdk_texture_new_from_resource ("/cursors/images/gtk_logo_cursor.png"));
-      gtk_text_buffer_insert_paintable (buffer, &start, paintable);
-      g_object_unref (paintable);
-      gtk_text_iter_backward_char (&start);
-
-      gtk_text_buffer_get_end_iter (buffer, &end);
-      tag = gtk_text_buffer_create_tag (buffer, NULL,
-                                        "pixels-above-lines", 200,
-                                        "justification", GTK_JUSTIFY_RIGHT,
-                                        NULL);
-      gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
-
+                                "resize the window. Do it already !", -1);
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
-      gtk_expander_set_child (GTK_EXPANDER (expander), sw);
-      gtk_box_append (GTK_BOX (area), expander);
+      gtk_container_add (GTK_CONTAINER (expander), sw);
+      gtk_container_add (GTK_CONTAINER (area), expander);
      g_signal_connect (expander, "notify::expanded",
                        G_CALLBACK (expander_cb), window);

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

  return window;
 }
--- a/demos/gtk-demo/filtermodel.c
+++ b/demos/gtk-demo/filtermodel.c
@@ -22,8 +22,8 @@ format_number (GtkTreeViewColumn *col,
               GtkTreeIter       *iter,
               gpointer           data)
 {
-  int num;
-  char *text;
+  gint num;
+  gchar *text;

  gtk_tree_model_get (model, iter, GPOINTER_TO_INT (data), &num, -1);
  text = g_strdup_printf ("%d", num);
@@ -35,11 +35,11 @@ static void
 filter_modify_func (GtkTreeModel *model,
                    GtkTreeIter  *iter,
                    GValue       *value,
-                    int           column,
+                    gint          column,
                    gpointer      data)
 {
  GtkTreeModelFilter *filter_model = GTK_TREE_MODEL_FILTER (model);
-  int width, height;
+  gint width, height;
  GtkTreeModel *child_model;
  GtkTreeIter child_iter;

@@ -75,7 +75,7 @@ visible_func (GtkTreeModel *model,
              GtkTreeIter  *iter,
              gpointer      data)
 {
-  int width;
+  gint width;

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

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

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

  return window;
 }
--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -45,9 +45,12 @@
            <attributes>
              <attribute name="weight" value="bold"></attribute>
            </attributes>
+            <accessibility>
+              <relation type="label-for" target="treeview1"/>
+            </accessibility>
            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">0</property>
            </layout>
          </object>
        </child>
@@ -80,9 +83,12 @@
                </child>
              </object>
            </child>
+            <accessibility>
+              <relation type="labelled-by" target="label1"/>
+            </accessibility>
            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -127,9 +133,12 @@
                </child>
              </object>
            </child>
+            <accessibility>
+              <relation type="labelled-by" target="label2"/>
+            </accessibility>
            <layout>
-              <property name="column">1</property>
-              <property name="row">1</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
            </layout>
          </object>
        </child>
@@ -140,9 +149,12 @@
            <attributes>
              <attribute name="weight" value="bold"></attribute>
            </attributes>
+            <accessibility>
+              <relation type="label-for" target="treeview2"/>
+            </accessibility>
            <layout>
-              <property name="column">1</property>
-              <property name="row">0</property>
+              <property name="left-attach">1</property>
+              <property name="top-attach">0</property>
            </layout>
          </object>
        </child>
@@ -153,9 +165,12 @@
            <attributes>
              <attribute name="weight" value="bold"></attribute>
            </attributes>
+            <accessibility>
+              <relation type="label-for" target="treeview3"/>
+            </accessibility>
            <layout>
-              <property name="column">0</property>
-              <property name="row">2</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">2</property>
            </layout>
          </object>
        </child>
@@ -182,9 +197,12 @@
                </child>
              </object>
            </child>
+            <accessibility>
+              <relation type="labelled-by" target="label3"/>
+            </accessibility>
            <layout>
-              <property name="column">0</property>
-              <property name="row">3</property>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
            </layout>
          </object>
        </child>
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -209,7 +209,7 @@ set_widget_type (GtkFishbowl *fishbowl,
                        widget_types[selected_widget_type].name);
 }

-G_MODULE_EXPORT void
+void
 fishbowl_next_button_clicked_cb (GtkButton *source,
                                 gpointer   user_data)
 {
@@ -224,7 +224,7 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
  set_widget_type (fishbowl, new_index);
 }

-G_MODULE_EXPORT void
+void
 fishbowl_prev_button_clicked_cb (GtkButton *source,
                                 gpointer   user_data)
 {
@@ -239,7 +239,7 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
  set_widget_type (fishbowl, new_index);
 }

-G_MODULE_EXPORT void
+void
 fishbowl_changes_toggled_cb (GtkToggleButton *button,
                             gpointer         user_data)
 {
@@ -249,14 +249,6 @@ fishbowl_changes_toggled_cb (GtkToggleButton *button,
    gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow");
 }

-G_MODULE_EXPORT char *
-format_header_cb (GObject *object,
-                  guint    count,
-                  double   fps)
-{
-  return g_strdup_printf ("%u Icons, %.2f fps", count, fps);
-}
-
 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
 {
@@ -281,13 +273,15 @@ do_fishbowl (GtkWidget *do_widget)

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

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

  return window;
 }
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -6,6 +6,7 @@
    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="">
+        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkBox">
            <style>
@@ -27,12 +28,22 @@
        </child>
        <child type="end">
          <object class="GtkLabel">
-            <binding name="label">
-              <closure type="gchararray" function="format_header_cb">
-                <lookup name="count">bowl</lookup>
-                <lookup name="framerate">bowl</lookup>
-              </closure>
-            </binding>
+            <property name="label">fps</property>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label" bind-source="bowl" bind-property="framerate-string"/>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label">Icons, </property>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label" bind-source="bowl" bind-property="count"/>
          </object>
        </child>
        <child type="end">
@@ -47,7 +58,6 @@
    <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>
--- a/demos/gtk-demo/fixed.c
+++ b/demos/gtk-demo/fixed.c
@@ -1,4 +1,4 @@
-/* Fixed Layout
+/* Fixed layout
 *
 * GtkFixed is a container that allows placing and transforming
 * widgets manually.
@@ -53,7 +53,7 @@ create_faces (void)
      faces[i].face = gtk_frame_new (NULL);
      gtk_widget_set_size_request (faces[i].face, face_size, face_size);
      gtk_widget_add_css_class (faces[i].face, faces[i].css_class);
-      gtk_fixed_put (GTK_FIXED (fixed), faces[i].face, 0, 0);
+      gtk_container_add (GTK_CONTAINER (fixed), faces[i].face);

      /* Set up the transformation for each face */
      transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w, h));
@@ -126,11 +126,11 @@ create_demo_window (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), "Fixed Layout");
+  gtk_window_set_title (GTK_WINDOW (window), "Fixed layout");
  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

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

  fixed = gtk_fixed_new ();
@@ -139,7 +139,7 @@ create_demo_window (GtkWidget *do_widget)
  gtk_widget_set_valign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);

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

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

  return demo_window;
 }
--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -1,10 +1,9 @@
 /* Flow Box
 *
 * GtkFlowBox allows flexible and responsive grids which reflow
- * as needed and support sorting and filtering. The children of
- * a GtkFlowBox are regular widgets
+ * as needed and support sorting and filtering.
 *
- * The dataset used here has 665 colors.
+ * The children of a GtkFlowBox are regular widgets
 */

 #include <gtk/gtk.h>
@@ -29,7 +28,7 @@ draw_color (GtkDrawingArea *drawingarea,
 }

 static GtkWidget *
-color_swatch_new (const char *color)
+color_swatch_new (const gchar *color)
 {
  GtkWidget *button, *area;

@@ -48,7 +47,7 @@ do_flowbox (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
  GtkWidget *scrolled, *flowbox;
-  const char *colors[] = {
+  const gchar *colors[] = {
    "AliceBlue",
    "AntiqueWhite",
    "AntiqueWhite1",
@@ -716,7 +715,7 @@ do_flowbox (GtkWidget *do_widget)
    "YellowGreen",
    NULL
  };
-  int i;
+  gint i;

  if (!window)
    {
@@ -725,9 +724,11 @@ do_flowbox (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Flow Box");
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      scrolled = gtk_scrolled_window_new ();
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
      flowbox = gtk_flow_box_new ();
      gtk_widget_set_valign (flowbox, GTK_ALIGN_START);
@@ -738,13 +739,13 @@ do_flowbox (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), scrolled);

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

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

  return window;
 }
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -7,6 +7,7 @@
    <property name="title">Font Explorer</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
+        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkButton" id="reset">
            <property name="receives-default">1</property>
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -130,10 +130,6 @@ static const char *
 get_feature_display_name (unsigned int tag)
 {
  int i;
-  static char buf[5] = { 0, };
-
-  if (tag == MAKE_TAG ('x', 'x', 'x', 'x'))
-    return _("Default");

  for (i = 0; i < G_N_ELEMENTS (open_type_layout_features); i++)
    {
@@ -141,10 +137,7 @@ get_feature_display_name (unsigned int tag)
        return g_dpgettext2 (NULL, "OpenType layout", open_type_layout_features[i].name);
    }

-  hb_tag_to_string (tag, buf);
-  g_warning ("unknown OpenType layout feature tag: %s", buf);
-
-  return buf;
+  return NULL;
 }

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

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

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

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

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

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

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

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

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

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

 static void
@@ -302,7 +295,7 @@ update_display (void)
  GList *l;
  PangoAttrList *attrs;
  PangoAttribute *attr;
-  int ins, bound;
+  gint ins, bound;
  guint start, end;
  PangoLanguage *lang;
  char *font_desc;
@@ -486,7 +479,7 @@ update_script_combo (void)
 {
  GtkListStore *store;
  hb_font_t *hb_font;
-  int i, j, k;
+  gint i, j, k;
  PangoFont *pango_font;
  GHashTable *tags;
  GHashTableIter iter;
@@ -600,7 +593,7 @@ update_script_combo (void)
 static void
 update_features (void)
 {
-  int i, j;
+  gint i, j;
  GtkTreeModel *model;
  GtkTreeIter iter;
  guint script_index, lang_index;
@@ -735,8 +728,8 @@ static void
 entry_activated (GtkEntry *entry,
                 GtkAdjustment *adjustment)
 {
-  double value;
-  char *err = NULL;
+  gdouble value;
+  gchar *err = NULL;

  value = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err);
  if (err != NULL)
@@ -946,7 +939,7 @@ instance_changed (GtkComboBox *combo)
    {
      Axis *axis;
      Axis akey;
-      double value;
+      gdouble value;

      value = coords[ai[i].axis_index];

@@ -1032,7 +1025,7 @@ denorm_coord (hb_ot_var_axis_info_t *axis, int coord)
 static void
 update_font_variations (void)
 {
-  GtkWidget *child;
+  GtkWidget *child, *next;
  PangoFont *pango_font = NULL;
  hb_font_t *hb_font;
  hb_face_t *hb_face;
@@ -1044,8 +1037,12 @@ update_font_variations (void)
  int i;

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

  instance_combo = NULL;

@@ -1292,7 +1289,8 @@ do_font_features (GtkWidget *do_widget)
                                                                            "palt",
                                                                            "twid",
                                                                            "qwid", NULL });
-      add_check_group (feature_list, _("Alternative Stylistic Sets"), (const char *[]){ "ss01",
+      add_check_group (feature_list, _("Alternative Stylistic Sets"), (const char *[]){ "ss00",
+                                                                                        "ss01",
                                                                                        "ss02",
                                                                                        "ss03",
                                                                                        "ss04",
@@ -1335,7 +1333,8 @@ do_font_features (GtkWidget *do_widget)

      font_features_font_changed ();

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

      g_object_unref (builder);

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

  return window;
 }
--- a/demos/gtk-demo/fontify.c
+++ b/demos/gtk-demo/fontify.c
@@ -1,458 +0,0 @@
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-
-#include <gtk/gtk.h>
-#include <glib/gstdio.h>
-
-#ifdef HAVE_GIO_UNIX
-#include <gio/gunixoutputstream.h>
-#include <fcntl.h>
-#endif
-
-
-/* This is the guts of gtk_text_buffer_insert_markup,
- * copied here so we can make an incremental version.
- */
-static void
-insert_tags_for_attributes (GtkTextBuffer     *buffer,
-                            PangoAttrIterator *iter,
-                            GtkTextIter       *start,
-                            GtkTextIter       *end)
-{
-  GtkTextTagTable *table;
-  PangoAttribute *attr;
-  GtkTextTag *tag;
-  char name[256];
-
-  table = gtk_text_buffer_get_tag_table (buffer);
-
-#define STRING_ATTR(pango_attr_name, attr_name) \
-  attr = pango_attr_iterator_get (iter, pango_attr_name); \
-  if (attr) \
-    { \
-      const char *string = ((PangoAttrString*)attr)->value; \
-      g_snprintf (name, 256, #attr_name "=%s", string); \
-      tag = gtk_text_tag_table_lookup (table, name); \
-      if (!tag) \
-        { \
-          tag = gtk_text_tag_new (name); \
-          g_object_set (tag, #attr_name, string, NULL); \
-          gtk_text_tag_table_add (table, tag); \
-          g_object_unref (tag); \
-        } \
-      gtk_text_buffer_apply_tag (buffer, tag, start, end); \
-    }
-
-#define INT_ATTR(pango_attr_name, attr_name) \
-  attr = pango_attr_iterator_get (iter, pango_attr_name); \
-  if (attr) \
-    { \
-      int value = ((PangoAttrInt*)attr)->value; \
-      g_snprintf (name, 256, #attr_name "=%d", value); \
-      tag = gtk_text_tag_table_lookup (table, name); \
-      if (!tag) \
-        { \
-          tag = gtk_text_tag_new (name); \
-          g_object_set (tag, #attr_name, value, NULL); \
-          gtk_text_tag_table_add (table, tag); \
-          g_object_unref (tag); \
-        } \
-      gtk_text_buffer_apply_tag (buffer, tag, start, end); \
-    }
-
-#define FLOAT_ATTR(pango_attr_name, attr_name) \
-  attr = pango_attr_iterator_get (iter, pango_attr_name); \
-  if (attr) \
-    { \
-      float value = ((PangoAttrFloat*)attr)->value; \
-      g_snprintf (name, 256, #attr_name "=%g", value); \
-      tag = gtk_text_tag_table_lookup (table, name); \
-      if (!tag) \
-        { \
-          tag = gtk_text_tag_new (name); \
-          g_object_set (tag, #attr_name, value, NULL); \
-          gtk_text_tag_table_add (table, tag); \
-          g_object_unref (tag); \
-        } \
-      gtk_text_buffer_apply_tag (buffer, tag, start, end); \
-    }
-
-#define RGBA_ATTR(pango_attr_name, attr_name) \
-  attr = pango_attr_iterator_get (iter, pango_attr_name); \
-  if (attr) \
-    { \
-      PangoColor *color; \
-      GdkRGBA rgba; \
-      color = &((PangoAttrColor*)attr)->color; \
-      rgba.red = color->red / 65535.; \
-      rgba.green = color->green / 65535.; \
-      rgba.blue = color->blue / 65535.; \
-      rgba.alpha = 1.; \
-      char *str = gdk_rgba_to_string (&rgba); \
-      g_snprintf (name, 256, #attr_name "=%s", str); \
-      g_free (str); \
-      tag = gtk_text_tag_table_lookup (table, name); \
-      if (!tag) \
-        { \
-          tag = gtk_text_tag_new (name); \
-          g_object_set (tag, #attr_name, &rgba, NULL); \
-          gtk_text_tag_table_add (table, tag); \
-          g_object_unref (tag); \
-        } \
-      gtk_text_buffer_apply_tag (buffer, tag, start, end); \
-    }
-
-  attr = pango_attr_iterator_get (iter, PANGO_ATTR_LANGUAGE);
-  if (attr)
-    {
-      const char *language = pango_language_to_string (((PangoAttrLanguage*)attr)->value);
-      g_snprintf (name, 256, "language=%s", language);
-      tag = gtk_text_tag_table_lookup (table, name);
-      if (!tag)
-        {
-          tag = gtk_text_tag_new (name);
-          g_object_set (tag, "language", language, NULL);
-          gtk_text_tag_table_add (table, tag);
-          g_object_unref (tag);
-        }
-      gtk_text_buffer_apply_tag (buffer, tag, start, end);
-    }
-
-  STRING_ATTR (PANGO_ATTR_FAMILY, family)
-  INT_ATTR    (PANGO_ATTR_STYLE, style)
-  INT_ATTR    (PANGO_ATTR_WEIGHT, weight)
-  INT_ATTR    (PANGO_ATTR_VARIANT, variant)
-  INT_ATTR    (PANGO_ATTR_STRETCH, stretch)
-  INT_ATTR    (PANGO_ATTR_SIZE, size)
-
-  attr = pango_attr_iterator_get (iter, PANGO_ATTR_FONT_DESC);
-  if (attr)
-    {
-      PangoFontDescription *desc = ((PangoAttrFontDesc*)attr)->desc;
-      char *str = pango_font_description_to_string (desc);
-      g_snprintf (name, 256, "font-desc=%s", str);
-      g_free (str);
-      tag = gtk_text_tag_table_lookup (table, name);
-      if (!tag)
-        {
-          tag = gtk_text_tag_new (name);
-          g_object_set (tag, "font-desc", desc, NULL);
-          gtk_text_tag_table_add (table, tag);
-          g_object_unref (tag);
-        }
-      gtk_text_buffer_apply_tag (buffer, tag, start, end);
-    }
-
-  RGBA_ATTR   (PANGO_ATTR_FOREGROUND, foreground_rgba)
-  RGBA_ATTR   (PANGO_ATTR_BACKGROUND, background_rgba)
-  INT_ATTR    (PANGO_ATTR_UNDERLINE, underline)
-  RGBA_ATTR   (PANGO_ATTR_UNDERLINE_COLOR, underline_rgba)
-  INT_ATTR    (PANGO_ATTR_OVERLINE, overline)
-  RGBA_ATTR   (PANGO_ATTR_OVERLINE_COLOR, overline_rgba)
-  INT_ATTR    (PANGO_ATTR_STRIKETHROUGH, strikethrough)
-  RGBA_ATTR   (PANGO_ATTR_STRIKETHROUGH_COLOR, strikethrough_rgba)
-  INT_ATTR    (PANGO_ATTR_RISE, rise)
-  FLOAT_ATTR  (PANGO_ATTR_SCALE, scale)
-  INT_ATTR    (PANGO_ATTR_FALLBACK, fallback)
-  INT_ATTR    (PANGO_ATTR_LETTER_SPACING, letter_spacing)
-  STRING_ATTR (PANGO_ATTR_FONT_FEATURES, font_features)
-  INT_ATTR    (PANGO_ATTR_ALLOW_BREAKS, allow_breaks)
-  INT_ATTR    (PANGO_ATTR_SHOW, show_spaces)
-  INT_ATTR    (PANGO_ATTR_INSERT_HYPHENS, insert_hyphens)
-}
-
-typedef struct
-{
-  GMarkupParseContext *parser;
-  char *markup;
-  gsize pos;
-  gsize len;
-  GtkTextBuffer *buffer;
-  GtkTextIter iter;
-  GtkTextMark *mark;
-  PangoAttrList *attributes;
-  char *text;
-  PangoAttrIterator *attr;
-} MarkupData;
-
-static void
-free_markup_data (MarkupData *mdata)
-{
-  g_free (mdata->markup);
-  g_clear_pointer (&mdata->parser, g_markup_parse_context_free);
-  gtk_text_buffer_delete_mark (mdata->buffer, mdata->mark);
-  g_clear_pointer (&mdata->attr, pango_attr_iterator_destroy);
-  g_clear_pointer (&mdata->attributes, pango_attr_list_unref);
-  g_free (mdata->text);
-  g_object_unref (mdata->buffer);
-  g_free (mdata);
-}
-
-static gboolean
-insert_markup_idle (gpointer data)
-{
-  MarkupData *mdata = data;
-  gint64 begin;
-
-  begin = g_get_monotonic_time ();
-
-  do
-    {
-      int start, end;
-      int start_offset;
-      GtkTextIter start_iter;
-
-      if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
-        {
-          g_idle_add (insert_markup_idle, data);
-          return G_SOURCE_REMOVE;
-        }
-
-      pango_attr_iterator_range (mdata->attr, &start, &end);
-
-      if (end == G_MAXINT) /* last chunk */
-        end = start - 1; /* resulting in -1 to be passed to _insert */
-
-      start_offset = gtk_text_iter_get_offset (&mdata->iter);
-      gtk_text_buffer_insert (mdata->buffer, &mdata->iter, mdata->text + start, end - start);
-      gtk_text_buffer_get_iter_at_offset (mdata->buffer, &start_iter, start_offset);
-
-      insert_tags_for_attributes (mdata->buffer, mdata->attr, &start_iter, &mdata->iter);
-
-      gtk_text_buffer_get_iter_at_mark (mdata->buffer, &mdata->iter, mdata->mark);
-    }
-  while (pango_attr_iterator_next (mdata->attr));
-
-  free_markup_data (mdata);
-  return G_SOURCE_REMOVE;
-}
-
-static gboolean
-parse_markup_idle (gpointer data)
-{
-  MarkupData *mdata = data;
-  gint64 begin;
-  GError *error = NULL;
-
-  begin = g_get_monotonic_time ();
-
-  do {
-    if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
-      {
-        g_idle_add (parse_markup_idle, data);
-        return G_SOURCE_REMOVE;
-      }
-
-    if (!g_markup_parse_context_parse (mdata->parser,
-                                       mdata->markup + mdata->pos,
-                                       MIN (4096, mdata->len - mdata->pos),
-                                       &error))
-      {
-        g_warning ("Invalid markup string: %s", error->message);
-        g_error_free (error);
-        free_markup_data (mdata);
-        return G_SOURCE_REMOVE;
-      }
-
-    mdata->pos += 4096;
-  } while (mdata->pos < mdata->len);
-
-  if (!pango_markup_parser_finish (mdata->parser,
-                                   &mdata->attributes,
-                                   &mdata->text,
-                                   NULL,
-                                   &error))
-    {
-      g_warning ("Invalid markup string: %s", error->message);
-      g_error_free (error);
-      free_markup_data (mdata);
-      return G_SOURCE_REMOVE;
-    }
-
-  if (!mdata->attributes)
-    {
-      gtk_text_buffer_insert (mdata->buffer, &mdata->iter, mdata->text, -1);
-      free_markup_data (mdata);
-      return G_SOURCE_REMOVE;
-    }
-
-  mdata->attr = pango_attr_list_get_iterator (mdata->attributes);
-  insert_markup_idle (data);
-
-  return G_SOURCE_REMOVE;
-}
-
-/* Takes a ref on @buffer while it is operating,
- * and consumes @markup.
- */
-static void
-insert_markup (GtkTextBuffer *buffer,
-               GtkTextIter   *iter,
-               char          *markup,
-               int            len)
-{
-  MarkupData *data;
-
-  g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
-
-  data = g_new0 (MarkupData, 1);
-
-  data->buffer = g_object_ref (buffer);
-  data->iter = *iter;
-  data->markup = markup;
-  data->len = len;
-
-  data->parser = pango_markup_parser_new (0);
-  data->pos = 0;
-
-  /* create mark with right gravity */
-  data->mark = gtk_text_buffer_create_mark (buffer, NULL, iter, FALSE);
-
-  parse_markup_idle (data);
-}
-
-static void
-fontify_finish (GObject      *source,
-                GAsyncResult *result,
-                gpointer      data)
-{
-  GSubprocess *subprocess = G_SUBPROCESS (source);
-  GtkTextBuffer *buffer = data;
-  GBytes *stdout_buf = NULL;
-  GBytes *stderr_buf = NULL;
-  GError *error = NULL;
-
-  if (!g_subprocess_communicate_finish (subprocess,
-                                        result,
-                                        &stdout_buf,
-                                        &stderr_buf,
-                                        &error))
-    {
-      g_clear_pointer (&stdout_buf, g_bytes_unref);
-      g_clear_pointer (&stderr_buf, g_bytes_unref);
-
-      g_warning ("%s", error->message);
-      g_clear_error (&error);
-
-      g_object_unref (subprocess);
-      g_object_unref (buffer);
-      return;
-    }
-
-  if (g_subprocess_get_exit_status (subprocess) != 0)
-    {
-      if (stderr_buf)
-        g_warning ("%s", (char *)g_bytes_get_data (stderr_buf, NULL));
-      g_clear_pointer (&stderr_buf, g_bytes_unref);
-    }
-
-  g_object_unref (subprocess);
-
-  g_clear_pointer (&stderr_buf, g_bytes_unref);
-
-  if (stdout_buf)
-    {
-      char *markup;
-      gsize len;
-      char *p;
-      GtkTextIter start;
-
-      gtk_text_buffer_set_text (buffer, "", 0);
-
-      /* highlight puts a span with font and size around its output,
-       * which we don't want.
-       */
-      markup = g_bytes_unref_to_data (stdout_buf, &len);
-      for (p = markup + strlen ("<span "); *p != '>'; p++) *p = ' ';
-
-      gtk_text_buffer_get_start_iter (buffer, &start);
-      insert_markup (buffer, &start, markup, len);
-   }
-
-  g_object_unref (buffer);
-}
-
-void
-fontify (const char    *format,
-         GtkTextBuffer *source_buffer)
-{
-  GSubprocess *subprocess;
-  char *format_arg;
-  GtkSettings *settings;
-  char *theme;
-  gboolean prefer_dark;
-  const char *style_arg;
-  const char *text;
-  GtkTextIter start, end;
-  GBytes *bytes;
-  GError *error = NULL;
-
-  settings = gtk_settings_get_default ();
-  g_object_get (settings,
-                "gtk-theme-name", &theme,
-                "gtk-application-prefer-dark-theme", &prefer_dark,
-                NULL);
-
-  if (prefer_dark || strcmp (theme, "HighContrastInverse") == 0)
-    style_arg = "--style=edit-vim-dark";
-  else
-    style_arg = "--style=edit-kwrite";
-
-  g_free (theme);
-
-  format_arg = g_strconcat ("--syntax=", format, NULL);
-  subprocess = g_subprocess_new (G_SUBPROCESS_FLAGS_STDIN_PIPE |
-                                 G_SUBPROCESS_FLAGS_STDOUT_PIPE |
-                                 G_SUBPROCESS_FLAGS_STDERR_PIPE,
-                                 &error,
-                                 "highlight",
-                                 format_arg,
-                                 "--out-format=pango",
-                                 style_arg,
-                                 NULL);
-  g_free (format_arg);
-
-  if (!subprocess)
-    {
-      if (g_error_matches (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT))
-        {
-          static gboolean warned = FALSE;
-
-          if (!warned)
-            {
-              warned = TRUE;
-              g_message ("For syntax highlighting, install the “highlight” program");
-            }
-        }
-      else
-        g_warning ("%s", error->message);
-
-      g_clear_error (&error);
-
-      return;
-    }
-
-  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
-  text = gtk_text_buffer_get_text (source_buffer, &start, &end, TRUE);
-  bytes = g_bytes_new_static (text, strlen (text));
-
-#ifdef HAVE_GIO_UNIX
-  /* Work around https://gitlab.gnome.org/GNOME/glib/-/issues/2182 */
-  if (G_IS_UNIX_OUTPUT_STREAM (g_subprocess_get_stdin_pipe (subprocess)))
-    {
-      GOutputStream *stdin_pipe = g_subprocess_get_stdin_pipe (subprocess);
-      int fd = g_unix_output_stream_get_fd (G_UNIX_OUTPUT_STREAM (stdin_pipe));
-      fcntl (fd, F_SETFL, O_NONBLOCK);
-    }
-#endif
-
-  g_subprocess_communicate_async (subprocess,
-                                  bytes,
-                                  NULL,
-                                  fontify_finish,
-                                  g_object_ref (source_buffer));
-}
--- a/demos/gtk-demo/fontify.h
+++ b/demos/gtk-demo/fontify.h
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-void fontify (const char    *format,
-              GtkTextBuffer *buffer);
--- a/demos/gtk-demo/fontplane.c
+++ b/demos/gtk-demo/fontplane.c
@@ -36,11 +36,11 @@ adjustment_get_normalized_value (GtkAdjustment *adj)

 static void
 val_to_xy (GtkFontPlane *plane,
-           int           *x,
-           int           *y)
+           gint          *x,
+           gint          *y)
 {
-  double u, v;
-  int width, height;
+  gdouble u, v;
+  gint width, height;

  width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
  height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
@@ -57,8 +57,8 @@ plane_snapshot (GtkWidget   *widget,
                GtkSnapshot *snapshot)
 {
  GtkFontPlane *plane = GTK_FONT_PLANE (widget);
-  int x, y;
-  int width, height;
+  gint x, y;
+  gint width, height;
  cairo_t *cr;

  val_to_xy (plane, &x, &y);
@@ -125,11 +125,11 @@ adjustment_set_normalized_value (GtkAdjustment *adj,

 static void
 update_value (GtkFontPlane *plane,
-              int            x,
-              int            y)
+              gint           x,
+              gint           y)
 {
  GtkWidget *widget = GTK_WIDGET (plane);
-  double u, v;
+  gdouble u, v;

  u = CLAMP (x * (1.0 / gtk_widget_get_allocated_width (widget)), 0, 1);
  v = CLAMP (1 - y * (1.0 / gtk_widget_get_allocated_height (widget)), 0, 1);
@@ -142,8 +142,8 @@ update_value (GtkFontPlane *plane,

 static void
 plane_drag_gesture_begin (GtkGestureDrag *gesture,
-                          double          start_x,
-                          double          start_y,
+                          gdouble         start_x,
+                          gdouble         start_y,
                          GtkFontPlane  *plane)
 {
  guint button;
@@ -164,11 +164,11 @@ plane_drag_gesture_begin (GtkGestureDrag *gesture,

 static void
 plane_drag_gesture_update (GtkGestureDrag *gesture,
-                           double          offset_x,
-                           double          offset_y,
+                           gdouble         offset_x,
+                           gdouble         offset_y,
                           GtkFontPlane  *plane)
 {
-  double start_x, start_y;
+  gdouble start_x, start_y;

  gtk_gesture_drag_get_start_point (GTK_GESTURE_DRAG (gesture),
                                    &start_x, &start_y);
@@ -177,8 +177,8 @@ plane_drag_gesture_update (GtkGestureDrag *gesture,

 static void
 plane_drag_gesture_end (GtkGestureDrag *gesture,
-                        double          offset_x,
-                        double          offset_y,
+                        gdouble         offset_x,
+                        gdouble         offset_y,
                        GtkFontPlane  *plane)
 {
  set_cross_cursor (GTK_WIDGET (plane), FALSE);
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -19,7 +19,13 @@ static GtkWidget *show_extents = NULL;

 static PangoContext *context;

-static int scale = 9;
+static int scale = 10;
+
+static void
+on_destroy (gpointer data)
+{
+  window = NULL;
+}

 static void
 update_image (void)
@@ -245,7 +251,9 @@ do_fontrendering (GtkWidget *do_widget)
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (on_destroy), NULL);
+      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
      font_button = GTK_WIDGET (gtk_builder_get_object (builder, "font_button"));
      up_button = GTK_WIDGET (gtk_builder_get_object (builder, "up_button"));
      down_button = GTK_WIDGET (gtk_builder_get_object (builder, "down_button"));
@@ -268,14 +276,12 @@ do_fontrendering (GtkWidget *do_widget)
      g_signal_connect (show_extents, "notify::active", G_CALLBACK (update_image), NULL);

      update_image ();
-
-      g_object_unref (builder);
    }

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

  return window;
 }
--- a/demos/gtk-demo/fontrendering.ui
+++ b/demos/gtk-demo/fontrendering.ui
@@ -6,11 +6,164 @@
    <property name="page-increment">4</property>
  </object>
  <object class="GtkWindow" id="window">
-    <property name="default-width">1080</property>
-    <property name="default-height">430</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <child type="title">
+    <property name="default-width">600</property>
+    <property name="default-height">300</property>
+    <property name="title">Font rendering</property>
+    <child>
+      <object class="GtkGrid">
+        <property name="margin-top">10</property>
+        <property name="row-spacing">10</property>
+        <property name="column-spacing">10</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="margin-start">10</property>
+            <property name="label">Text</property>
+            <property name="xalign">1</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkEntry" id="entry">
+            <property name="text">Fonts render</property>
+            <layout>
+              <property name="left-attach">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="margin-start">10</property>
+            <property name="label">Font</property>
+            <property name="xalign">1</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkFontButton" id="font_button">
+            <layout>
+              <property name="left-attach">1</property>
+              <property name="top-attach">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="label">Hinting</property>
+            <property name="xalign">1</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
+            <layout>
+              <property name="left-attach">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="hinting">
+            <property name="active">0</property>
+            <property name="valign">center</property>
+            <items>
+              <item translatable="yes" id="none">None</item>
+              <item translatable="yes" id="slight">Slight</item>
+              <item translatable="yes" id="medium">Medium</item>
+              <item translatable="yes" id="full">Full</item>
+            </items>
+            <layout>
+              <property name="left-attach">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="hint_metrics">
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Hint Metrics</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+            </child>
+            <layout>
+              <property name="left-attach">3</property>
+              <property name="top-attach">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="show_extents">
+            <property name="active">1</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Show Extents</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+            </child>
+            <layout>
+              <property name="left-attach">4</property>
+              <property name="top-attach">0</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="show_grid">
+            <property name="active">1</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="label">Show Grid</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+            </child>
+            <layout>
+              <property name="left-attach">4</property>
+              <property name="top-attach">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="up_button">
+            <property name="icon-name">list-add-symbolic</property>
+            <style>
+              <class name="circular"/>
+            </style>
+            <layout>
+              <property name="left-attach">5</property>
+              <property name="top-attach">0</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="down_button">
+            <property name="icon-name">list-remove-symbolic</property>
+            <style>
+              <class name="circular"/>
+            </style>
+            <layout>
+              <property name="left-attach">5</property>
+              <property name="top-attach">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="hexpand">1</property>
+            <layout>
+              <property name="left-attach">6</property>
+            </layout>
+          </object>
+        </child>
+        <child>
          <object class="GtkBox">
            <property name="halign">center</property>
            <property name="valign">center</property>
@@ -30,172 +183,11 @@
                <property name="group">text_radio</property>
              </object>
            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkGrid">
-            <property name="halign">center</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>
-            <child>
-              <object class="GtkLabel">
-                <property name="margin-start">10</property>
-                <property name="label">Text</property>
-                <property name="xalign">1</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-                <layout>
-                  <property name="column">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry">
-                <property name="text">Fonts render</property>
-                <layout>
-                  <property name="column">2</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="margin-start">10</property>
-                <property name="label">Font</property>
-                <property name="xalign">1</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkFontButton" id="font_button">
-                <layout>
-                  <property name="column">2</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="label">Hinting</property>
-                <property name="xalign">1</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-                <layout>
-                  <property name="column">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="hinting">
-                <property name="active">0</property>
-                <property name="valign">center</property>
-                <items>
-                  <item translatable="yes" id="none">None</item>
-                  <item translatable="yes" id="slight">Slight</item>
-                  <item translatable="yes" id="medium">Medium</item>
-                  <item translatable="yes" id="full">Full</item>
-                </items>
-                <layout>
-                  <property name="column">4</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="hint_metrics">
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">Hint Metrics</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <layout>
-                  <property name="column">4</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="show_extents">
-                <property name="active">1</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">Show Extents</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <layout>
-                  <property name="column">5</property>
-                  <property name="row">0</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="show_grid">
-                <property name="active">1</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">Show Grid</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <layout>
-                  <property name="column">5</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="up_button">
-                <property name="icon-name">list-add-symbolic</property>
-                <style>
-                  <class name="circular"/>
-                </style>
-                <layout>
-                  <property name="column">6</property>
-                  <property name="row">0</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="down_button">
-                <property name="icon-name">list-remove-symbolic</property>
-                <style>
-                  <class name="circular"/>
-                </style>
-                <layout>
-                  <property name="column">6</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="hexpand">1</property>
-                <layout>
-                  <property name="column">7</property>
-                </layout>
-              </object>
-            </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">3</property>
+              <property name="column-span">7</property>
+            </layout>
          </object>
        </child>
        <child>
@@ -211,6 +203,11 @@
                <property name="can-shrink">0</property>
              </object>
            </child>
+            <layout>
+              <property name="left-attach">0</property>
+              <property name="top-attach">4</property>
+              <property name="column-span">7</property>
+            </layout>
          </object>
        </child>
      </object>
--- a/demos/gtk-demo/gears.c
+++ b/demos/gtk-demo/gears.c
@@ -53,7 +53,7 @@ create_axis_slider (GtkGears *gears,
    }

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

  adj = gtk_adjustment_new (gtk_gears_get_axis (gears, axis), 0.0, 360.0, 1.0, 12.0, 0.0);
@@ -63,7 +63,7 @@ create_axis_slider (GtkGears *gears,
                    gears);
  slider = gtk_scale_new (GTK_ORIENTATION_VERTICAL, adj);
  gtk_scale_set_draw_value (GTK_SCALE (slider), FALSE);
-  gtk_box_append (GTK_BOX (box), slider);
+  gtk_container_add (GTK_CONTAINER (box), slider);
  gtk_widget_set_vexpand (slider, TRUE);
  gtk_widget_show (slider);

@@ -85,7 +85,7 @@ do_gears (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Gears");
      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
      gtk_window_set_default_size (GTK_WINDOW (window), 640, 640);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

      overlay = gtk_overlay_new ();
      gtk_widget_set_margin_start (overlay, 12);
@@ -111,19 +111,19 @@ do_gears (GtkWidget *do_widget)

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
      gtk_box_set_spacing (GTK_BOX (box), 6);
-      gtk_box_append (GTK_BOX (box), hbox);
+      gtk_container_add (GTK_CONTAINER (box), hbox);

      gears = gtk_gears_new ();
      gtk_widget_set_hexpand (gears, TRUE);
      gtk_widget_set_vexpand (gears, TRUE);
-      gtk_box_append (GTK_BOX (hbox), gears);
+      gtk_container_add (GTK_CONTAINER (hbox), gears);

      for (i = 0; i < GTK_GEARS_N_AXIS; i++)
-        gtk_box_append (GTK_BOX (hbox), create_axis_slider (GTK_GEARS (gears), i));
+        gtk_container_add (GTK_CONTAINER (hbox), create_axis_slider (GTK_GEARS (gears), i));

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
      gtk_box_set_spacing (GTK_BOX (hbox), 6);
-      gtk_box_append (GTK_BOX (box), hbox);
+      gtk_container_add (GTK_CONTAINER (box), hbox);

      gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label));
    }
@@ -131,7 +131,7 @@ do_gears (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/geninclude.py
+++ b/demos/gtk-demo/geninclude.py
@@ -13,16 +13,17 @@ in_files = sys.argv[2:]
 file_output = """
 typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);

-typedef struct _DemoData DemoData;
+typedef struct _Demo Demo;

-struct _DemoData
+struct _Demo
 {
  const char *name;
  const char *title;
  const char *filename;
  GDoDemoFunc func;
-  DemoData *children;
+  Demo *children;
 };
+
 """

 # Demo = namedtuple('Demo', ['name', 'title', 'file', 'func'])
@@ -66,7 +67,7 @@ for demo in demos:
 i = 0
 for parent in parents:
    id = parent_ids[i]
-    file_output += "\nDemoData child" + str(id) + "[] = {\n"
+    file_output += "\nDemo child" + str(id) + "[] = {\n"
    # iterate over all demos and check if the name starts with the given parent name
    for child in demos:
        if child[1].startswith(parent + "/"):
@@ -81,7 +82,7 @@ for parent in parents:
 # Sort demos by title
 demos = sorted(demos, key=lambda x: x[1])

-file_output += "\nDemoData gtk_demos[] = {\n"
+file_output += "\nDemo gtk_demos[] = {\n"
 for demo in demos:
    # Do not generate one of these for demos with a parent demo
    if "/" not in demo[1]:
--- a/demos/gtk-demo/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -9,8 +9,8 @@

 static GtkGesture *rotate = NULL;
 static GtkGesture *zoom = NULL;
-static double swipe_x = 0;
-static double swipe_y = 0;
+static gdouble swipe_x = 0;
+static gdouble swipe_y = 0;
 static gboolean long_pressed = FALSE;

 static gboolean
@@ -26,8 +26,8 @@ touchpad_swipe_gesture_begin (GtkGesture       *gesture,

 static void
 swipe_gesture_swept (GtkGestureSwipe *gesture,
-                     double           velocity_x,
-                     double           velocity_y,
+                     gdouble          velocity_x,
+                     gdouble          velocity_y,
                     GtkWidget       *widget)
 {
  swipe_x = velocity_x / 10;
@@ -37,8 +37,8 @@ swipe_gesture_swept (GtkGestureSwipe *gesture,

 static void
 long_press_gesture_pressed (GtkGestureLongPress *gesture,
-                            double               x,
-                            double               y,
+                            gdouble              x,
+                            gdouble              y,
                            GtkWidget           *widget)
 {
  long_pressed = TRUE;
@@ -56,8 +56,8 @@ long_press_gesture_end (GtkGesture       *gesture,

 static void
 rotation_angle_changed (GtkGestureRotate *gesture,
-                        double            angle,
-                        double            delta,
+                        gdouble           angle,
+                        gdouble           delta,
                        GtkWidget        *widget)
 {
  gtk_widget_queue_draw (widget);
@@ -65,7 +65,7 @@ rotation_angle_changed (GtkGestureRotate *gesture,

 static void
 zoom_scale_changed (GtkGestureZoom *gesture,
-                    double          scale,
+                    gdouble         scale,
                    GtkWidget      *widget)
 {
  gtk_widget_queue_draw (widget);
@@ -93,8 +93,8 @@ drawing_area_draw (GtkDrawingArea *area,
    {
      cairo_pattern_t *pat;
      cairo_matrix_t matrix;
-      double angle, scale;
-      double x_center, y_center;
+      gdouble angle, scale;
+      gdouble x_center, y_center;

      gtk_gesture_get_bounding_box_center (GTK_GESTURE (zoom), &x_center, &y_center);

@@ -149,7 +149,8 @@ do_gestures (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
      gtk_window_set_title (GTK_WINDOW (window), "Gestures");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

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

  return window;
 }
--- a/demos/gtk-demo/glarea-gles.fs.glsl
+++ b/demos/gtk-demo/glarea-gles.fs.glsl
@@ -1,7 +1,7 @@
 precision highp float;

 void main() {
-  float lerpVal = gl_FragCoord.y / 500.0;
+  float lerpVal = gl_FragCoord.y / 500.0f;

-  gl_FragColor = mix(vec4(1.0, 0.85, 0.35, 1.0), vec4(0.2, 0.2, 0.2, 1.0), lerpVal);
+  gl_FragColor = mix(vec4(1.0f, 0.85f, 0.35f, 1.0f), vec4(0.2f, 0.2f, 0.2f, 1.0f), lerpVal);
 }
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -354,7 +354,7 @@ create_axis_slider (int axis)
    }

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

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

@@ -406,7 +406,7 @@ create_glarea_window (GtkWidget *do_widget)
  gl_area = gtk_gl_area_new ();
  gtk_widget_set_hexpand (gl_area, TRUE);
  gtk_widget_set_vexpand (gl_area, TRUE);
-  gtk_box_append (GTK_BOX (box), gl_area);
+  gtk_container_add (GTK_CONTAINER (box), gl_area);

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

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

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

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

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

  return demo_window;
 }
--- a/demos/gtk-demo/gtkfishbowl.c
+++ b/demos/gtk-demo/gtkfishbowl.c
@@ -25,7 +25,7 @@ typedef struct _GtkFishbowlChild         GtkFishbowlChild;
 struct _GtkFishbowlPrivate
 {
  GtkFishCreationFunc creation_func;
-  GHashTable *children;
+  GList *children;
  guint count;

  gint64 last_frame_time;
@@ -53,6 +53,7 @@ enum {
   PROP_BENCHMARK,
   PROP_COUNT,
   PROP_FRAMERATE,
+   PROP_FRAMERATE_STRING,
   PROP_UPDATE_DELAY,
   NUM_PROPERTIES
 };
@@ -67,8 +68,6 @@ gtk_fishbowl_init (GtkFishbowl *fishbowl)
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);

  priv->update_delay = G_USEC_PER_SEC;
-  priv->children = g_hash_table_new_full (NULL, NULL,
-                                          NULL, (GDestroyNotify) g_free);
 }

 /**
@@ -95,18 +94,20 @@ gtk_fishbowl_measure (GtkWidget      *widget,
 {
  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GHashTableIter iter;
-  gpointer key, value;
  GtkFishbowlChild *child;
-  int child_min, child_nat;
+  GList *children;
+  gint child_min, child_nat;

  *minimum = 0;
  *natural = 0;

-  g_hash_table_iter_init (&iter, priv->children);
-  while (g_hash_table_iter_next (&iter, &key, &value))
+  for (children = priv->children; children; children = children->next)
    {
-      child = value;
+      child = children->data;
+
+      if (!gtk_widget_get_visible (child->widget))
+        continue;
+

      if (orientation == GTK_ORIENTATION_HORIZONTAL)
        {
@@ -136,13 +137,14 @@ gtk_fishbowl_size_allocate (GtkWidget *widget,
  GtkFishbowlChild *child;
  GtkAllocation child_allocation;
  GtkRequisition child_requisition;
-  GHashTableIter iter;
-  gpointer key, value;
+  GList *children;

-  g_hash_table_iter_init (&iter, priv->children);
-  while (g_hash_table_iter_next (&iter, &key, &value))
+  for (children = priv->children; children; children = children->next)
    {
-      child = value;
+      child = children->data;
+
+      if (!gtk_widget_get_visible (child->widget))
+        continue;

      gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL);
      child_allocation.x = round (child->x * (width - child_requisition.width));
@@ -180,7 +182,7 @@ gtk_fishbowl_add (GtkFishbowl *fishbowl,

  gtk_widget_set_parent (widget, GTK_WIDGET (fishbowl));

-  g_hash_table_insert (priv->children, widget, child_info);
+  priv->children = g_list_prepend (priv->children, child_info);
  priv->count++;
  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
 }
@@ -190,26 +192,34 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
                     GtkWidget   *widget)
 {
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+  GtkFishbowlChild *child;
+  GtkWidget *widget_bowl = GTK_WIDGET (fishbowl);
+  GList *children;

-  if (g_hash_table_remove (priv->children, widget))
+  for (children = priv->children; children; children = children->next)
    {
-      gtk_widget_unparent (widget);
+      child = children->data;

-      priv->count--;
-      g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
+      if (child->widget == widget)
+        {
+          gboolean was_visible = gtk_widget_get_visible (widget);
+
+          gtk_widget_unparent (widget);
+
+          priv->children = g_list_remove_link (priv->children, children);
+          g_list_free (children);
+          g_free (child);
+
+          if (was_visible && gtk_widget_get_visible (widget_bowl))
+            gtk_widget_queue_resize (widget_bowl);
+
+          priv->count--;
+          g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
+          break;
+        }
    }
 }

-static void
-gtk_fishbowl_finalize (GObject *object)
-{
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (object);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  g_hash_table_destroy (priv->children);
-  priv->children = NULL;
-}
-
 static void
 gtk_fishbowl_dispose (GObject *object)
 {
@@ -279,6 +289,14 @@ gtk_fishbowl_get_property (GObject         *object,
      g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
      break;

+    case PROP_FRAMERATE_STRING:
+      {
+        char *s = g_strdup_printf ("%.2f", gtk_fishbowl_get_framerate (fishbowl));
+        g_value_set_string (value, s);
+        g_free (s);
+      }
+      break;
+
    case PROP_UPDATE_DELAY:
      g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
      break;
@@ -295,7 +313,6 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);

-  object_class->finalize = gtk_fishbowl_finalize;
  object_class->dispose = gtk_fishbowl_dispose;
  object_class->set_property = gtk_fishbowl_set_property;
  object_class->get_property = gtk_fishbowl_get_property;
@@ -333,6 +350,13 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                           0,
                           G_PARAM_READABLE);

+  props[PROP_FRAMERATE_STRING] =
+      g_param_spec_string ("framerate-string",
+                           "Framerate as string",
+                           "Framerate as string, with 2 decimals",
+                           NULL,
+                           G_PARAM_READABLE);
+
  props[PROP_UPDATE_DELAY] =
      g_param_spec_int64 ("update-delay",
                          "Update delay",
@@ -484,6 +508,7 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
  priv->framerate = ((int)(priv->framerate * 100))/100.0;

  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
+  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE_STRING]);

  if (!priv->benchmark)
    return;
@@ -527,9 +552,8 @@ gtk_fishbowl_tick (GtkWidget     *widget,
  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
  GtkFishbowlChild *child;
+  GList *l;
  gint64 frame_time, elapsed;
-  GHashTableIter iter;
-  gpointer key, value;
  gboolean do_update;

  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
@@ -541,10 +565,9 @@ gtk_fishbowl_tick (GtkWidget     *widget,
  if (elapsed == frame_time)
    return G_SOURCE_CONTINUE;

-  g_hash_table_iter_init (&iter, priv->children);
-  while (g_hash_table_iter_next (&iter, &key, &value))
+  for (l = priv->children; l; l = l->next)
    {
-      child = value;
+      child = l->data;

      child->x += child->dx * ((double) elapsed / G_USEC_PER_SEC);
      child->y += child->dy * ((double) elapsed / G_USEC_PER_SEC);
--- a/demos/gtk-demo/gtkgears.c
+++ b/demos/gtk-demo/gtkgears.c
@@ -197,7 +197,7 @@ gtk_gears_class_init (GtkGearsClass *klass)
 * @param v the vertex to fill
 * @param x the x coordinate
 * @param y the y coordinate
- * @param z the z coordinate
+ * @param z the z coortinate
 * @param n pointer to the normal table
 *
 * @return the operation error code
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -25,11 +25,12 @@ do_headerbar (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Welcome to Facebook - Log in, sign up or learn more");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);

      header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);

      button = gtk_button_new ();
      icon = g_themed_icon_new ("mail-send-receive-symbolic");
@@ -42,10 +43,10 @@ do_headerbar (GtkWidget *do_widget)
      gtk_widget_add_css_class (box, "linked");
      button = gtk_button_new ();
      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
      button = gtk_button_new ();
      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);

      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

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

  return window;
 }
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -18,7 +18,7 @@ static void
 insert_link (GtkTextBuffer *buffer,
             GtkTextIter   *iter,
             const char    *text,
-             int            page)
+             gint           page)
 {
  GtkTextTag *tag;

@@ -35,7 +35,7 @@ insert_link (GtkTextBuffer *buffer,
 */
 static void
 show_page (GtkTextBuffer *buffer,
-           int            page)
+           gint           page)
 {
  GtkTextIter iter;

@@ -91,7 +91,7 @@ follow_if_link (GtkWidget   *text_view,
  for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
    {
      GtkTextTag *tag = tagp->data;
-      int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));

      if (page != 0)
        {
@@ -134,14 +134,14 @@ key_pressed (GtkEventController *controller,
 }

 static void set_cursor_if_appropriate (GtkTextView *text_view,
-                                       int          x,
-                                       int          y);
+                                       gint         x,
+                                       gint         y);

 static void
 released_cb (GtkGestureClick *gesture,
             guint            n_press,
-             double           x,
-             double           y,
+             gdouble          x,
+             gdouble          y,
             GtkWidget       *text_view)
 {
  GtkTextIter start, end, iter;
@@ -168,8 +168,8 @@ released_cb (GtkGestureClick *gesture,

 static void
 motion_cb (GtkEventControllerMotion *controller,
-           double                    x,
-           double                    y,
+           gdouble                   x,
+           gdouble                   y,
           GtkTextView              *text_view)
 {
  set_cursor_if_appropriate (text_view, x, y);
@@ -183,8 +183,8 @@ static gboolean hovering_over_link = FALSE;
 */
 static void
 set_cursor_if_appropriate (GtkTextView    *text_view,
-                           int             x,
-                           int             y)
+                           gint            x,
+                           gint            y)
 {
  GSList *tags = NULL, *tagp = NULL;
  GtkTextIter iter;
@@ -196,7 +196,7 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
      for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
        {
          GtkTextTag *tag = tagp->data;
-          int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+          gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));

          if (page != 0)
            {
@@ -237,7 +237,9 @@ do_hypertext (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      view = gtk_text_view_new ();
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -260,7 +262,7 @@ do_hypertext (GtkWidget *do_widget)
      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
      gtk_text_buffer_set_enable_undo (buffer, TRUE);

-      sw = gtk_scrolled_window_new ();
+      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
@@ -273,7 +275,7 @@ do_hypertext (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/iconscroll.c
+++ b/demos/gtk-demo/iconscroll.c
@@ -12,7 +12,7 @@ static GtkWidget *window = NULL;
 static GtkWidget *scrolledwindow;
 static int selected;

-#define N_WIDGET_TYPES 6
+#define N_WIDGET_TYPES 4


 static int hincrement = 5;
@@ -64,7 +64,6 @@ populate_icons (void)
      gtk_grid_attach (GTK_GRID (grid), create_icon (), left, top, 1, 1);

  hincrement = 0;
-  vincrement = 5;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
                                  GTK_POLICY_NEVER,
@@ -75,7 +74,7 @@ populate_icons (void)
 static char *content;
 static gsize content_len;

-extern void fontify (const char *format, GtkTextBuffer *buffer);
+extern void fontify (GtkTextBuffer *buffer);

 static void
 populate_text (gboolean hilight)
@@ -95,13 +94,12 @@ populate_text (gboolean hilight)
  gtk_text_buffer_set_text (buffer, content, (int)content_len);

  if (hilight)
-    fontify ("c", buffer);
+    fontify (buffer);

  textview = gtk_text_view_new ();
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);

  hincrement = 0;
-  vincrement = 5;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
                                  GTK_POLICY_NEVER,
@@ -126,7 +124,6 @@ populate_image (void)
  gtk_picture_set_can_shrink (GTK_PICTURE (image), FALSE);

  hincrement = 5;
-  vincrement = 5;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
                                  GTK_POLICY_AUTOMATIC,
@@ -134,48 +131,6 @@ populate_image (void)
  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), image);
 }

-extern GtkWidget *create_weather_view (void);
-
-static void
-populate_list (void)
-{
-  GtkWidget *list;
-
-  list = create_weather_view ();
-
-  hincrement = 5;
-  vincrement = 0;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), list);
-}
-
-extern GtkWidget *create_color_grid (void);
-extern GListModel *gtk_color_list_new (guint size);
-
-static void
-populate_grid (void)
-{
-  GtkWidget *list;
-  GtkNoSelection *selection;
-
-  list = create_color_grid ();
-
-  selection = gtk_no_selection_new (gtk_color_list_new (2097152));
-  gtk_grid_view_set_model (GTK_GRID_VIEW (list), G_LIST_MODEL (selection));
-  g_object_unref (selection);
-
-  hincrement = 0;
-  vincrement = 5;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), list);
-}
-
 static void
 set_widget_type (int type)
 {
@@ -209,16 +164,6 @@ set_widget_type (int type)
      populate_image ();
      break;

-    case 4:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a list");
-      populate_list ();
-      break;
-
-    case 5:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a grid");
-      populate_grid ();
-      break;
-
    default:
      g_assert_not_reached ();
    }
@@ -226,7 +171,7 @@ set_widget_type (int type)
  tick_cb = gtk_widget_add_tick_callback (window, scroll_cb, NULL, NULL);
 }

-G_MODULE_EXPORT void
+void
 iconscroll_next_clicked_cb (GtkButton *source,
                            gpointer   user_data)
 {
@@ -241,7 +186,7 @@ iconscroll_next_clicked_cb (GtkButton *source,
  set_widget_type (new_index);
 }

-G_MODULE_EXPORT void
+void
 iconscroll_prev_clicked_cb (GtkButton *source,
                            gpointer   user_data)
 {
@@ -255,7 +200,7 @@ iconscroll_prev_clicked_cb (GtkButton *source,
  set_widget_type (new_index);
 }

-G_MODULE_EXPORT GtkWidget *
+GtkWidget *
 do_iconscroll (GtkWidget *do_widget)
 {
  if (!window)
@@ -264,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_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      scrolledwindow = GTK_WIDGET (gtk_builder_get_object (builder, "scrolledwindow"));
      gtk_widget_realize (window);
      hadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "hadjustment"));
      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_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/iconscroll.ui
+++ b/demos/gtk-demo/iconscroll.ui
@@ -6,6 +6,7 @@
    <property name="default-height">500</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
+        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkBox">
            <style>
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -25,7 +25,7 @@ enum


 static GdkPixbuf *file_pixbuf, *folder_pixbuf;
-char *parent;
+gchar *parent;
 GtkWidget *up_button;

 /* Loads the images for the demo and returns whether the operation succeeded */
@@ -47,7 +47,7 @@ static void
 fill_store (GtkListStore *store)
 {
  GDir *dir;
-  const char *name;
+  const gchar *name;
  GtkTreeIter iter;

  /* First clear the store */
@@ -62,7 +62,7 @@ fill_store (GtkListStore *store)
  name = g_dir_read_name (dir);
  while (name != NULL)
    {
-      char *path, *display_name;
+      gchar *path, *display_name;
      gboolean is_dir;

      /* We ignore hidden files that start with a '.' */
@@ -90,14 +90,14 @@ fill_store (GtkListStore *store)
  g_dir_close (dir);
 }

-static int
+static gint
 sort_func (GtkTreeModel *model,
           GtkTreeIter  *a,
           GtkTreeIter  *b,
           gpointer      user_data)
 {
  gboolean is_dir_a, is_dir_b;
-  char *name_a, *name_b;
+  gchar *name_a, *name_b;
  int ret;

  /* We need this function because we want to sort
@@ -158,7 +158,7 @@ item_activated (GtkIconView *icon_view,
                gpointer     user_data)
 {
  GtkListStore *store;
-  char *path;
+  gchar *path;
  GtkTreeIter iter;
  gboolean is_dir;

@@ -192,7 +192,7 @@ up_clicked (GtkButton *item,
            gpointer   user_data)
 {
  GtkListStore *store;
-  char *dir_name;
+  gchar *dir_name;

  store = GTK_LIST_STORE (user_data);

@@ -228,7 +228,7 @@ home_clicked (GtkButton *item,

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

  g_object_unref (file_pixbuf);
@@ -266,24 +266,24 @@ do_iconview (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

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

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

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


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

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

      /* Create the store and fill it with the contents of '/' */
      parent = g_strdup ("/");
@@ -320,7 +320,7 @@ do_iconview (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -19,8 +19,8 @@ static void
 fill_store (GtkListStore *store)
 {
  GtkTreeIter iter;
-  const char *text[] = { "Red", "Green", "Blue", "Yellow" };
-  int i;
+  const gchar *text[] = { "Red", "Green", "Blue", "Yellow" };
+  gint i;

  /* First clear the store */
  gtk_list_store_clear (store);
@@ -49,7 +49,7 @@ set_cell_color (GtkCellLayout   *cell_layout,
                GtkTreeIter     *iter,
                gpointer         data)
 {
-  char *text;
+  gchar *text;
  GdkRGBA color;
  guint32 pixel = 0;
  GdkPixbuf *pixbuf;
@@ -60,10 +60,10 @@ set_cell_color (GtkCellLayout   *cell_layout,

  if (gdk_rgba_parse (&color, text))
    pixel =
-      ((int)(color.red * 255)) << 24 |
-      ((int)(color.green * 255)) << 16 |
-      ((int)(color.blue  * 255)) << 8 |
-      ((int)(color.alpha * 255));
+      ((gint)(color.red * 255)) << 24 |
+      ((gint)(color.green * 255)) << 16 |
+      ((gint)(color.blue  * 255)) << 8 |
+      ((gint)(color.alpha * 255));

  g_free (text);

@@ -77,8 +77,8 @@ set_cell_color (GtkCellLayout   *cell_layout,

 static void
 edited (GtkCellRendererText *cell,
-        char                *path_string,
-        char                *text,
+        gchar               *path_string,
+        gchar               *text,
        gpointer             data)
 {
  GtkTreeModel *model;
@@ -111,7 +111,9 @@ do_iconview_edit (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      store = create_store ();
      fill_store (store);
@@ -150,7 +152,7 @@ do_iconview_edit (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -43,10 +43,10 @@ progressive_prepared_callback (GdkPixbufLoader *loader,

 static void
 progressive_updated_callback (GdkPixbufLoader *loader,
-                              int                  x,
-                              int                  y,
-                              int                  width,
-                              int                  height,
+                              gint                 x,
+                              gint                 y,
+                              gint                 width,
+                              gint                 height,
                              gpointer     data)
 {
  GtkWidget *picture;
@@ -58,7 +58,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
 }

-static int
+static gint
 progressive_timeout (gpointer data)
 {
  GtkWidget *picture;
@@ -91,7 +91,7 @@ progressive_timeout (gpointer data)
          g_error_free (error);

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

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

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

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

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

              gtk_widget_show (dialog);

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

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

              gtk_widget_show (dialog);

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

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

          gtk_widget_show (dialog);

@@ -240,11 +240,11 @@ progressive_timeout (gpointer data)

      pixbuf_loader = gdk_pixbuf_loader_new ();

-      g_signal_connect_object (pixbuf_loader, "area-prepared",
-                               G_CALLBACK (progressive_prepared_callback), picture, 0);
+      g_signal_connect (pixbuf_loader, "area-prepared",
+                        G_CALLBACK (progressive_prepared_callback), picture);

-      g_signal_connect_object (pixbuf_loader, "area-updated",
-                               G_CALLBACK (progressive_updated_callback), picture, 0);
+      g_signal_connect (pixbuf_loader, "area-updated",
+                        G_CALLBACK (progressive_updated_callback), picture);
    }

  /* leave timeout installed */
@@ -261,16 +261,14 @@ start_progressive_loading (GtkWidget *picture)
   * The timeout simply simulates a slow data source by inserting
   * pauses in the reading process.
   */
-  load_timeout = g_timeout_add (1500, progressive_timeout, picture);
+  load_timeout = g_timeout_add (150, progressive_timeout, picture);
  g_source_set_name_by_id (load_timeout, "[gtk] progressive_timeout");
 }

 static void
-cleanup_callback (gpointer  data,
-                  GObject  *former_object)
+cleanup_callback (GObject   *object,
+                  gpointer   data)
 {
-  *(gpointer**)data = NULL;
-
  if (load_timeout)
    {
      g_source_remove (load_timeout);
@@ -295,16 +293,24 @@ static void
 toggle_sensitivity_callback (GtkWidget *togglebutton,
                             gpointer   user_data)
 {
-  GtkWidget *child;
+  GtkContainer *container = user_data;
+  GList *list;
+  GList *tmp;

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


@@ -329,7 +335,11 @@ 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_weak_ref (G_OBJECT (window), cleanup_callback, &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);
      gtk_widget_set_margin_start (base_vbox, 16);
@@ -339,20 +349,20 @@ do_images (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), base_vbox);

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

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

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

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      image = gtk_image_new_from_icon_name ("gtk3-demo");
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
@@ -365,12 +375,12 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Animation loaded from a file</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

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

@@ -381,12 +391,12 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Symbolic themed icon</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
      image = gtk_image_new_from_gicon (gicon);
@@ -397,17 +407,17 @@ do_images (GtkWidget *do_widget)

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

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

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      /* Create an empty image for now; the progressive loader
       * will create the pixbuf and fill it in.
@@ -419,17 +429,17 @@ do_images (GtkWidget *do_widget)

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

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

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      video = gtk_video_new_for_resource ("/images/gtk-logo.webm");
      gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE);
@@ -437,22 +447,22 @@ do_images (GtkWidget *do_widget)

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

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

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

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

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

  return window;
 }
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -8,7 +8,7 @@

 static void
 on_bar_response (GtkInfoBar *info_bar,
-                 int         response_id,
+                 gint        response_id,
                 gpointer    user_data)
 {
  GtkWidget *dialog;
@@ -29,8 +29,10 @@ on_bar_response (GtkInfoBar *info_bar,
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            "Your response has id %d", response_id);

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

  gtk_widget_show (dialog);
 }
@@ -56,7 +58,8 @@ do_infobar (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_widget_set_margin_start (vbox, 8);
@@ -66,73 +69,73 @@ do_infobar (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

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

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

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

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

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

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

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

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

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

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

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

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

      gtk_widget_set_halign (actions, GTK_ALIGN_CENTER);

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

  return window;
 }
--- a/demos/gtk-demo/layoutmanager.c
+++ b/demos/gtk-demo/layoutmanager.c
@@ -1,61 +0,0 @@
-/* Layout Manager
- *
- * This examples shows a simple example of a custom layout manager
- * and a widget using it. The layout manager places the children
- * of the widget in a grid or a circle, or something in between.
- *
- * The widget is animating the transition between the two layouts.
- * Click to start the transition.
- */
-
-#include <gtk/gtk.h>
-
-#include "demowidget.h"
-#include "demochild.h"
-
-
-GtkWidget *
-do_layoutmanager (GtkWidget *parent)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *widget;
-      GtkWidget *child;
-      const char *color[] = {
-        "red", "orange", "yellow", "green",
-        "blue", "grey", "magenta", "lime",
-        "yellow", "firebrick", "aqua", "purple",
-        "tomato", "pink", "thistle", "maroon"
-      };
-      int i;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Layout Manager");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 600);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      widget = demo_widget_new ();
-
-      for (i = 0; i < 16; i++)
-        {
-          child = demo_child_new (color[i]);
-          gtk_widget_set_margin_start (child, 4);
-          gtk_widget_set_margin_end (child, 4);
-          gtk_widget_set_margin_top (child, 4);
-          gtk_widget_set_margin_bottom (child, 4);
-          demo_widget_add_child (DEMO_WIDGET (widget), child);
-        }
-
-      gtk_window_set_child (GTK_WINDOW (window), widget);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-
-}
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -9,15 +9,15 @@

 static void
 response_cb (GtkWidget *dialog,
-             int        response_id,
+             gint       response_id,
             gpointer   data)
 {
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (dialog);
 }

 static gboolean
 activate_link (GtkWidget   *label,
-               const char *uri,
+               const gchar *uri,
               gpointer     data)
 {
  if (g_strcmp0 (uri, "keynav") == 0)
@@ -59,7 +59,8 @@ do_links (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Links");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
                             "title=\"plain text\">text</a> may be marked up "
@@ -87,7 +88,7 @@ do_links (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -81,7 +81,7 @@ spinner_timeout (gpointer data)
 static GtkTreeModel *
 create_model (void)
 {
-  int i = 0;
+  gint i = 0;
  GtkListStore *store;
  GtkTreeIter iter;

@@ -257,7 +257,9 @@ do_list_store (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "List Store");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_widget_set_margin_start (vbox, 8);
@@ -267,14 +269,14 @@ do_list_store (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

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

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

      /* create tree model */
      model = create_model ();
@@ -307,7 +309,7 @@ do_list_store (GtkWidget *do_widget)
    }
  else
    {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
      window = NULL;
      if (timeout != 0)
        {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	abcf2e3bf7	node-editor: Don't use the ::query-tooltip signal Use the vfunc, the signal is going away.	2020-05-09 23:24:59 -04:00
Matthias Clasen	a123d99fcd	inspector: Don't use the ::query-tooltip signal Use the vfunc, the signal is going away.	2020-05-09 22:49:55 -04:00
Matthias Clasen	4f760a9a2a	volumebutton: Don't use the ::query-tooltip signal Use the vfunc, the signal is going away.	2020-05-09 22:31:00 -04:00
Matthias Clasen	7e6be71d38	volumebutton: Enable the tooltips Little point in having a query-tooltip handler if we don't make sure ::query-tooltip is emitted.	2020-05-09 22:31:00 -04:00
Matthias Clasen	ed46982cc5	volumebutton: Remove broken a11y code The accessible of a button is not an AtkImage, so whatever this code was trying to do isn't working. Remove it.	2020-05-09 22:30:59 -04:00
Matthias Clasen	e92270f928	iconview: Stop using the ::query-tooltip signal Use the vfunc instead. The signal is going away.	2020-05-09 22:30:59 -04:00
Matthias Clasen	79a96b9bef	treeview: Don't use the ::query-tooltip signal Use the vfunc instead.	2020-05-09 22:30:59 -04:00
Matthias Clasen	ff55264e60	linkbutton: Don't use the ::query-tooltip signal As a subclass, GtkLinkButton should override the vfunc. The signal will be going away.	2020-05-09 22:30:59 -04:00