Implement dashed and dotted underlines

This is implementing new support in Pango for rendering dashed and dotted lines. This is currently using a linear gradient for dashes and a repeat node for dots.
cellrenderertext: Quiet compiler warnings
2021-03-31 18:57:03 -04:00 · 2021-03-31 18:57:03 -04:00 · 2021-03-31 18:57:03 -04:00 · 2021-03-31 17:51:16 -04:00
2351 changed files with 266978 additions and 294635 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,32 +0,0 @@
-# SPDX-FileCopyrightText: 2021 The GTK Authors
-# SPDX-License-Identifier: CC0-1.0
-
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-trim_trailing_whitespace = true
-
-[*.[ch]]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-# For the legacy tabs which still exist in the code:
-tab_width = 8
-
-[*.ui]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-
-[*.xml]
-indent_size = 2
-indent_style = space
-
-[meson.build]
-indent_size = 2
-indent_style = space
-
-[*.md]
-max_line_length = 80
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@ stages:
  - analysis
  - docs
  - flatpak
-  - publish
  - deploy

 .cache-paths: &cache-paths
@@ -25,8 +24,9 @@ variables:
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v36"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v28"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v26"

 .only-default:
  only:
@@ -58,10 +58,8 @@ style-check-diff:
      - "${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/tools/output/*/*"
      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
-      - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
  cache:
    key: "$CI_JOB_NAME"
    paths:
@@ -79,19 +77,12 @@ fedora-x86_64:
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
  script:
-    - .gitlab-ci/show-info-linux.sh
    - meson subprojects update
-    - mkdir _install
-    - meson --prefix=${CI_PROJECT_DIR}/_install
-            ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
            _build
-    - meson compile -C _build
-    - meson install -C _build
-    - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
-    - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
+    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build x11
    - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build waylandgles
    - .gitlab-ci/run-tests.sh _build broadway

 release-build:
@@ -101,7 +92,6 @@ release-build:
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
-    - .gitlab-ci/show-info-linux.sh
    - meson subprojects update
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
            _build
@@ -116,7 +106,6 @@ installed-tests:
    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
    G_TEST_ACCESSIBLE: 1
  script:
-    - .gitlab-ci/show-info-linux.sh
    - meson subprojects update
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
            _build
@@ -156,11 +145,6 @@ msys2-mingw64:
  variables:
    MSYSTEM: "MINGW64"
    CHERE_INVOKING: "yes"
-  artifacts:
-    when: always
-    expose_as: 'Windows_DLL_MSYS2_64_bit_toolchain'
-    paths:
-      - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"

 macos:
  extends: .only-default
@@ -171,16 +155,13 @@ macos:
    - macos
  needs: []
  before_script:
-    - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson==0.59
+    - bash .gitlab-ci/show-execution-environment.sh
+    - pip3 install --user meson==0.56
    - pip3 install --user ninja
    - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
    - export MESON_FORCE_BACKTRACE=1
  script:
    - meson -Dx11-backend=false
-            -Dbroadway-backend=true
-            -Dmacos-backend=true
-            -Dmedia-gstreamer=disabled
            -Dintrospection=disabled
            -Dcpp_std=c++11
            -Dpixman:tests=disabled
@@ -191,22 +172,6 @@ macos:
    paths:
      - "${CI_PROJECT_DIR}/_build/meson-logs"

-vs2017-x64:
-  extends: .only-default
-  # TODO: Uncomment this when ready to merge.
-  #only:
-  #  - branches@GNOME/gtk
-  stage: build
-  tags:
-    - win32-ps
-  needs: []
-  script:
-    - .gitlab-ci/test-msvc.bat
-  artifacts:
-    when: always
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-
 .flatpak-defaults:
  image: $FLATPAK_IMAGE
  stage: flatpak
@@ -226,11 +191,11 @@ vs2017-x64:
  extends: .flatpak-defaults
  when: manual

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

 flatpak-manual:demo:
  extends: .flatpak-manual
@@ -238,8 +203,8 @@ flatpak-manual:demo:
  variables:
    APPID: org.gtk.Demo4

-flatpak-main:demo:
-  extends: .flatpak-main
+flatpak-master:demo:
+  extends: .flatpak-master
  needs: []
  variables:
    APPID: org.gtk.Demo4
@@ -250,8 +215,8 @@ flatpak-manual:widget-factory:
  variables:
    APPID: org.gtk.WidgetFactory4

-flatpak-main:widget-factory:
-  extends: .flatpak-main
+flatpak-master:widget-factory:
+  extends: .flatpak-master
  needs: []
  variables:
    APPID: org.gtk.WidgetFactory4
@@ -262,8 +227,8 @@ flatpak-manual:icon-browser:
  variables:
    APPID: org.gtk.IconBrowser4

-flatpak-main:icon-browser:
-  extends: .flatpak-main
+flatpak-master:icon-browser:
+  extends: .flatpak-master
  needs: []
  variables:
    APPID: org.gtk.IconBrowser4
@@ -273,18 +238,18 @@ flatpak-main:icon-browser:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
    extends: '.publish_nightly'
-    dependencies: ['flatpak-main:demo']
-    needs: ['flatpak-main:demo']
+    dependencies: ['flatpak-master:demo']
+    needs: ['flatpak-master:demo']

 nightly factory:
    extends: '.publish_nightly'
-    dependencies: ['flatpak-main:widget-factory']
-    needs: ['flatpak-main:widget-factory']
+    dependencies: ['flatpak-master:widget-factory']
+    needs: ['flatpak-master:widget-factory']

 nightly icon-browser:
    extends: '.publish_nightly'
-    dependencies: ['flatpak-main:icon-browser']
-    needs: ['flatpak-main:icon-browser']
+    dependencies: ['flatpak-master:icon-browser']
+    needs: ['flatpak-master:icon-browser']

 static-scan:
  image: $FEDORA_IMAGE
@@ -318,7 +283,7 @@ asan-build:
  allow_failure: true

 reference:
-  image: $FEDORA_IMAGE
+  image: $DOCS_IMAGE
  stage: docs
  needs: []
  variables:
@@ -344,11 +309,14 @@ reference:
    paths:
      - _reference

-publish-docs:
-  stage: publish
+pages:
+  stage: deploy
  needs: ['reference']
  script:
-    - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
+    - mv _reference/ public/
+    - cp .gitlab-ci/pages/* public/
+  artifacts:
+    paths:
+      - public
  only:
-    refs:
-      - main
+    - master
--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -0,0 +1,89 @@
+FROM fedora:33
+
+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 \
+    libcloudproviders-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-libGLES-devel \
+    meson \
+    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
--- a/.gitlab-ci/fedora-docs.Dockerfile
+++ b/.gitlab-ci/fedora-docs.Dockerfile
@@ -0,0 +1,17 @@
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28
+
+RUN dnf -y install \
+        python3-jinja2 \
+        python3-markdown \
+        python3-pygments \
+        python3-toml \
+        python3-typogrify
+
+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,103 +1,4 @@
-FROM fedora:34
-
-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 \
-    clang-tools-extra \
-    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 \
-    graphviz \
-    gstreamer1-devel \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-base-devel \
-    hicolor-icon-theme \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    lcov \
-    libasan \
-    libattr-devel \
-    libcloudproviders-devel \
-    libepoxy-devel \
-    libffi-devel \
-    libjpeg-turbo-devel \
-    libmount-devel \
-    libpng-devel \
-    librsvg2 \
-    libselinux-devel \
-    libtiff-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-libGLES-devel \
-    meson \
-    ninja-build \
-    pango-devel \
-    pcre-devel \
-    pcre-static \
-    python3 \
-    python3-docutils \
-    python3-gobject \
-    python3-jinja2 \
-    python3-markdown \
-    python3-pip \
-    python3-pygments \
-    python3-toml \
-    python3-typogrify \
-    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 install -y 'dnf-command(builddep)' \
- && dnf builddep -y wayland \
- && dnf clean all
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v28

 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
--- a/.gitlab-ci/flatpak-build.sh
+++ b/.gitlab-ci/flatpak-build.sh
@@ -24,7 +24,6 @@ flatpak build ${builddir} meson \
                -Dbuild-examples=false \
                -Dintrospection=disabled \
                -Ddemos=true \
-                -Dprofile=devel \
                _flatpak_build

 flatpak build ${builddir} ninja -C _flatpak_build install
@@ -43,6 +42,6 @@ flatpak build-bundle \
        ${appid}

 # to be consumed by the nightly publish jobs
-if [[ $CI_COMMIT_BRANCH == main ]]; then
+if [[ $CI_COMMIT_BRANCH == master ]]; then
        tar cf repo.tar ${repodir}
 fi
--- a/.gitlab-ci/meson-html-report.py
+++ b/.gitlab-ci/meson-html-report.py
@@ -268,7 +268,7 @@ aparser.add_argument('--job-id', metavar='ID',
                     default=None)
 aparser.add_argument('--branch', metavar='NAME',
                     help='Branch of the project being tested',
-                     default='main')
+                     default='master')
 aparser.add_argument('--output', metavar='FILE',
                     help='The output HTML file, stdout by default',
                     type=argparse.FileType('w', encoding='UTF-8'),
--- a/.gitlab-ci/meson-junit-report.py
+++ b/.gitlab-ci/meson-junit-report.py
@@ -27,7 +27,7 @@ aparser.add_argument('--job-id', metavar='ID',
                     default='Unknown')
 aparser.add_argument('--branch', metavar='NAME',
                     help='Branch of the project being tested',
-                     default='main')
+                     default='master')
 aparser.add_argument('--output', metavar='FILE',
                     help='The output file, stdout by default',
                     type=argparse.FileType('w', encoding='UTF-8'),
--- a/.gitlab-ci/run-style-check-diff.sh
+++ b/.gitlab-ci/run-style-check-diff.sh
@@ -2,7 +2,7 @@

 set -e

-# We need to add a new remote for the upstream main, since this script could
+# 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}..."
@@ -16,7 +16,7 @@ fi

 # 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
-# `upstream/main` or `upstream/gtk-3-24`).
+# `upstream/master` or `upstream/gtk-3-24`).
 #
 # `${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.
@@ -36,7 +36,7 @@ exit_status=$?
 echo ""
 echo "Note that clang-format output is advisory and cannot always match the"
 echo "GTK coding style, documented at:"
-echo "   https://gitlab.gnome.org/GNOME/gtk/blob/main/docs/CODING-STYLE"
+echo "   https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
 echo "Warnings from this tool can be ignored in favour of the documented "
 echo "coding style, or in favour of matching the style of existing"
 echo "surrounding code."
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -44,24 +44,6 @@ case "${backend}" in
    kill ${compositor}
    ;;

-  waylandgles)
-    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-    weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
-    compositor=$!
-    export WAYLAND_DISPLAY=wayland-6
-
-    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)"

@@ -80,12 +62,6 @@ case "${backend}" in
    exit_code=0
    kill ${server}
    ;;
-
-  *)
-    echo "Failed to add ${backend} to .gitlab-ci/run-tests.sh"
-    exit 1
-    ;;
-
 esac

 cd ${builddir}
--- a/.gitlab-ci/show-execution-environment.sh
+++ b/.gitlab-ci/show-execution-environment.sh
--- a/.gitlab-ci/show-info-linux.sh
+++ b/.gitlab-ci/show-info-linux.sh
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-. /etc/os-release
-
-echo $PRETTY_NAME
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -15,7 +15,7 @@ meson \
        -Dx11-backend=true \
        -Dwayland-backend=true \
        -Dbroadway-backend=true \
-        -Dvulkan=enabled \
+        -Dvulkan=yes \
        -Dprofiler=true \
        --werror \
        ${EXTRA_MESON_FLAGS:-} \
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -1,14 +0,0 @@
-@echo on
-:: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the
-:: specified build architecture
-call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x64
-@echo on
-
-:: FIXME: make warnings fatal
-pip3 install --upgrade --user meson==0.59 || goto :error
-meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
-ninja -C _build || goto :error
-
-goto :EOF
-:error
-exit /b 1
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -15,9 +15,9 @@ pacman --noconfirm -Suy
 pacman --noconfirm -S --needed \
    base-devel \
    git \
-    mingw-w64-$MSYS2_ARCH-cc \
+    mingw-w64-$MSYS2_ARCH-toolchain \
    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-pkgconf \
+    mingw-w64-$MSYS2_ARCH-pkg-config \
    mingw-w64-$MSYS2_ARCH-gobject-introspection \
    mingw-w64-$MSYS2_ARCH-meson \
    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
@@ -30,9 +30,8 @@ pacman --noconfirm -S --needed \
    mingw-w64-$MSYS2_ARCH-libepoxy \
    mingw-w64-$MSYS2_ARCH-pango \
    mingw-w64-$MSYS2_ARCH-fribidi \
-    mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-python-gobject
+    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
+    mingw-w64-$MSYS2_ARCH-shared-mime-info

 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -41,7 +40,7 @@ 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.66.0 glib-2.0; then
+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
@@ -49,7 +48,7 @@ if ! pkg-config --atleast-version=2.66.0 glib-2.0; then
 fi
 pkg-config --modversion glib-2.0

-if ! pkg-config --atleast-version=1.50.0 pango; then
+if ! pkg-config --atleast-version=1.47.0 pango; then
    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
    meson setup _pango_build _pango
    meson compile -C _pango_build
@@ -73,5 +72,3 @@ unset CCACHE_DISABLE

 ninja -C _build
 ccache --show-stats
-
-tar zcf _build/gtkdll.tar.gz _build/gtk/libgtk*.dll
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,7 +1,7 @@
 <!--
  Please, read the CONTRIBUTING.md guide on how to file a new issue.

-  https://gitlab.gnome.org/GNOME/gtk/-/blob/main/CONTRIBUTING.md
+  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
 -->
 ## Steps to reproduce
 <!--
--- a/.gitlab/issue_templates/Crash.md
+++ b/.gitlab/issue_templates/Crash.md
@@ -1,7 +1,7 @@
 <!--
  Please, read the CONTRIBUTING.md guide on how to file a new issue.

-  https://gitlab.gnome.org/GNOME/gtk/-/blob/main/CONTRIBUTING.md
+  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
 -->

 ## Steps to reproduce
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -256,7 +256,7 @@ people committing to GTK to follow a few rules:
 0. Always write a meaningful commit message. Changes without a sufficient
   commit message will be reverted.

-0. Never push to the `main` branch, or any stable branches, directly; you
+0. Never push to the `master` branch, or any stable branches, directly; you
   should always go through a merge request, to ensure that the code is
   tested on the CI infrastructure at the very least. A merge request is
   also the proper place to get a comprehensive code review from the core
--- a/695
+++ b/695
@@ -1,698 +1,3 @@
-Overview of Changes in 4.6.1, 11-02-2022
-========================================
-
-* GtkFontChooser:
- - Stop using PangoFc api
- - Fix a crash
- - Use new HarfBuzz api
-
-* GtkMenuButton:
- - Update accessible description
-
-* GtkTextView:
- - Fix intra-widget dnd
-
-* Printing:
- - Fix an fd leak
-
-* Input:
- - Make sure input methods get focus-in events
- - Always flush events to avoid scroll event pileup
- - Support hold events
- - Update keysyms from libxkbcommon
-
-* Theme:
- - Improve text selection legibility
-
-* Introspection:
- - Add missing nullable annotations everywhere
-
-* Build:
- - Make stack noexec again
- - Avoid symbol leaks
- - Drop unneeded script data
-
-* Windows:
- - Stop using WM_SYNCPAINT
- - Relax check for GL 3.x legacy contexts
- - Use native apis for language names
- - Rewrite the keymap code
- - Use the GL renderer by default
-
-* Wayland:
- - Fix support for the new high-contrast setting
- - Avoid redundant scale changes
- - Fix DND hotspot handling
- - Don't always restore the saved size when floating
-
-* MacOS:
- - Various performance improvements
-
-* Translation updates:
- Brazilian Portuguese
- Catalan
- Chinese (China)
- Galician
- Hebrew
- Japanese
- Lithuanian
- Persian
- Polish
- Portuguese
- Russian
- Slovenian
- Spanish
- Ukrainian
-
-
-Overview of Changes in 4.6.0, 30-12-2021
-========================================
-
-* GtkProgressBar:
- - Fix handling of "inverted"
-
-* GtkLabel:
- - Add a "natural wrap mode" property to influence how
-   natural width is determined
-
-* GtkTextView
- - Scroll insertion on-screen after undo / redo
-
-* gsk:
- - Abort region diffing when changes are too complex
-
-* gdk:
- - Avoid compressing discrete scroll events
- - Fix problems with hiding windows
- - Improve GL and GLES version checks
-
-* Wayland:
- - Support new high-contrast setting
-
-* Inspector:
- - Add DND inspection support
-
-* build:
- - Avoid deprecated meson apis
-
-* Translation updates
- Galician
- Portuguese
- Ukrainian
-
-
-Overview of Changes in 4.5.1, 16-12-2021
-========================================
-
-* GtkWidget sizing has been rewritten to implement
-  width-for-height more properly. This had some fallout,
-  and some widgets may still not react kindly to the
-  new way of doing things.
-
-  See https://blog.gtk.org/2021/12/03/sizable-news/
-  for details, and please file issues if you notice fallout.
-
-* Rename git `master` branch to `main`
-
-* Css:
- - Fully support font-variant-caps
- - Fix a crash with gradients
-
-* Make various widgets activatable:
- - GtkComboBox
- - GtkDropDown
-
-* GtkPopover:
- - Make focus indicators not disappear
-
-* GtkTextView:
- - Don't leave embedded children stranded when scrolling
- - Don't insert Emoji into non-editable textviews
- - Fix Emoji chooser positioning
- - Fix problems with pasting text
- - Improve scroll-to-mark behavior
- - Support right-aligned, centered and decimal tabs
- - Make child anchor replacement character settable
- - Provide more context to input methods
-
-* GtkDragIcon:
- - Provide default icons for paintables and files
-
-* GtkBuilder:
- - Speed up template precompilation
-
-* Actions:
- - Reduce allocations during signal emissions
- - Avoid duplication and unnecessary recursion
-
-* Inspector:
- - Show the selected im-module in the General tab
- - Add a clipboard viewer
- - Make the recorder record events too
- - Add a graph visualizing gtk_widget_measure()
-
-* Gsk:
- - Fix hexbox rendering
- - Fix transformed linear gradient rendering
-
-* Printing:
- - Fix dialog-less printing
-
-* Windows:
- - Use the common EGL setup code
- - Respect GDK_DEBUG=gl-egl
- - Fix AeroSnap indicator and positioning
-
-* X11:
- - Improve behavior of windows drags on headerbar controls
- - Trap errors for RANDR changes
- - Fix problems with drag icons
-
-* Wayland:
- - Ensure we prefer the Wayland im-module over others
-
-* Translation updates
- Basque
- Catalan
- Croatian
- Friulian
- Galician
- Hebrew
- Icelandic
- Italian
- Latvian
- Lithuanian
- Occitan
- Persian
- Portuguese
- Spanish
- Swedish
- Ukrainian
-
-Overview of Changes in 4.5.0
-============================
-
-* gsk:
- - Drop the GL renderer in favor of NGL
- - Rename NGL to GL
- - Fix some coordinate overflow issues
- - Reimplement texture upload and download for better
-   support of image formats and color spaces
- - New api:
-   gsk_transform_skew
-   gsk_transform_to_2d_components
-
-* gdk:
- - Support HSL in gdk_rgba_parse
- - Use libpng, libjpeg and libtiff directly when loading
-   textures, and support more image formats (including 16bit
-   and float formats)
- - New apis:
-   gdk_texture_new_from_bytes
-   gdk_texture_new_from_filename
-   gdk_texture_download_float
-   gdk_texture_save_to_png_bytes
-   gdk_texture_save_to_tiff
-   gdk_texture_save_to_tiff_bytes
-   gdk_display_create_gl_context
- - Implement GIcon and GLoadableIcon in GdkTexture
- - Move EGL initialization to the frontend
- - Use configless EGL contexts, if supported
- - Use >8bit pixel formats, if supported and requested
-
-* css:
- - Add support for line-height
- - Add support for text-transform
-
-* theme:
- - Fixes for buttons in toolbars
-
-* input:
- - Update compose sequences from libX11 1.7.2
- - Accept replacement string longer than 20 characters
-
-* text:
- - Implement sloped caret drawing
- - Add a gtk-hint-font-metrics setting to switch
-   font rendering to be more similar to GTK3
-
-* GtkTextView:
- - Add support for line height
- - Add support for text transforms
- - Misc fixes for css->pango attribute translations
- - Invalidate pango contexts when font settings change
- - Improve undo grouping when overwriting
-
-* GtkListView:
- - Make tree indentation more flexible with
-   GtkTreeExpander:indent-for-icon
-
-* GtkMenuButton:
- - Support custom children
-
-* GtkFlowBox:
- - Add prepend and append
-
-* GtkCalendar:
- - Fix handling of weeks starting on Monday
-
-* GtkWindow:
- - Add a titlebar property
-
-* GtkDropDown:
- - Add a show-arrow property
-
-* GtkPopoverMenu:
- - Support a use-markup attribute in menu models
-
-* Add GtkSymbolicPaintable
-
-* Tools:
- - Support DND in gtk4-node-editor and the inspector's recorder
-
-* Demos:
- - Improve the font rendering demo
-
-* Build:
- - Require Pango 1.49
- - Require libpng, libtiff and libjpeg
- - Speed up handling of resources during build
-
-* X11:
- - Support touchpad gestures with XInput 2.4
-
-* Windows:
- - Fix DND coordinates
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Chinese (China)
- Croatian
- Czech
- Dutch
- Finnish
- French
- Galician
- German
- Hebrew
- Hungarian
- Icelandic
- Indonesian
- Kazakh
- Korean
- Latvian
- Lithuanian
- Persian
- Portuguese
- Romanian
- Serbian
- Slovak
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.4.0
-============================
-
-* Input:
- - Match IBus for display of Compose sequences
- - Match IBus for handling of mismatches
- - Handle Escape in Compose sequences
- - Allow multiple dead keys
- - Support 32bit keysyms
-
-* GtkCheckButton:
- - Activate when moving focus
-
-* GtkLabel:
- - Propertly ignore double underscores for mnemonics
-
-* GtkPopoverMenu:
- - Fix focus cycling
-
-* GtkTextView:
- - Improve word selection
- - Fix block cursors on empty lines
-
-* GdkToplevel:
- - Support the gnome-shell titlebar gesture protocol
-
-* GdkDropTarget:
- - Allow creating drop targets in ui files
-
-* gsk:
- - Handle partial color fonts correctly
- - Use harfbuzz for color font information
- - Avoid pango for glyph cache rendering
- - Shrink shadow extents
-
-* Settings:
- - Change the default for gtk-split-cursor to FALSE
-
-* Demos:
- - Small improvements to widget-factory
- - gtk-demo: Improve the hypertext demo
- - gtk-dem: Improve the clipboard demo
-
-* X11:
- - Set WM_CLASS on toplevels
-
-* Wayland:
- - Support wl_seat v7
-
-* Windows:
- - Drop the local DND protocol
- - Avoid WGL if shaders don't work
- - Use WinPointer API
-
-* Translation updates:
- Belarusian
- Friulian
- Hebrew
- Khmer
- Persian
- Polish
-
-
-Overview of Changes in 4.3.2
-============================
-
-* GtkToggleButton:
- - Fix the actionable implementation
-
-* GtkCheckButton:
- - Fix the actionable implementation
- - Cancel activation on when the pointer leaves
-
-* GtkMenuButton:
- - Make activatable again
- - Add a way to have an icon + arrow
-
-* GtkColorButton:
- - Make activatable again
-
-* GtkFontButton:
- - Make activatable again
-
-* GtkAppChooserButton:
- - Make activatable again
-
-* GtkColumnView:
- - Fix double activation
-
-* GtkLabel:
- - Fix mnemonics without markup
-
-* GtkTreeView:
- - Clip header buttons
-
-* GtkTextView:
- - Add api to get the RTL and LTR contexts
- - Fix some errors in text history grouping
-
-* GtkText:
- - Don't show placeholder text on top of entry text
- - Add api to compute the cursor extents
- - Fix y coordinates for text selection
-
-* GtkFileChooser:
- - Don't show Trash in the side bar
-
-* GtkPopoverMenu:
- - Add scrollbars to long menus
-
-* GtkActionMuxer:
- - Fix propagation of accel changes
-
-* Introspection:
- - Annotate all filename arguments
- - Rename GtkMediaStream apis to avoid name collisions
- - Rename GtkDropTarget properties to avoid name collisions
- - Make GtkPasswordEntryBuffer introspectable
-
-* Printing:
- - Remove the Google Cloud Print backend
-
-* Theme:
- - Sync included icons with the Adwaita icon theme
-
-* GSK:
- - Avoid overflowing the vertex counter
- - Handle negative scales correctly in the ngl renderer
-
-* GDK:
- - Cleanup and simplify OpenGL setup code
- - Add a GdkDisplay::init_gl vfunc and gdk_display_prepare_gl() api
- - Require EGL 1.4
- - Fix EGL + NVidia
-
-* Build:
- - Enable gstreamer by default
- - Disable Vulkan by default
- - Remove the sassc option
- - Remove options and checks for X11 extensions
-
-* X11:
- - Stop using XComposite
- - Remove the Visual cache
-
-* Wayland:
- - Fix some DND corner cases
- - Work with version 2 of pointer-gestures-v1
- - Look for cursor themes in $HOME/.icons
-
-* Windows:
- - Fix SIGILL on x64 due to popcnt
- - Fix popup placement
- - Fix drag icon placement
- - Clean up HiDPI and WGL support
- - Default to WGL
-
-* MacOs:
- - Fix input method support
- - Register known clipboard types for drop targets
- - Add initial DND support
-
-* Translation updates:
- Brazilian Portuguese
- Portuguese
- Romanian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.3.1
-============================
-
-* GtkEmojiChooser:
- - Update data from CLDR 39
- - Load Emoji data for both language and territory
-
-* GtkCalendar:
- - Fix an off-by-one error in day numbers
-
-* GtkListView:
- - Add .activatable style class to activatable items
-
-* GtkCheckButton:
- - Don't allow unchecking grouped radio buttons
-
-*GtkToggleButton:
- - Fix mnemonic activation propagation
-
-* GtkLabel:
- - Make mnemonics work even when invisible
- - Fix mnemonic activation propagation
-
-* GtkMenuButton:
- - Add a property to mark primary menus and make F10 work
-
-* GtkApplication:
- - Fix initial screensaver state async
-
-* GtkEntry:
- - Apply xalign to placeholder text (as it was in GTK 3)
-
-* GtkSpinButton:
- - Fix swipe gestures
-
-* GtkStackSwitcher:
- - Implement GtkOrientable (as it was in GTK 3)
- - Fix a use-after-free problem with drag timeouts
-
-* GtkFileChooser:
- - Add support for (case-insensitive) suffix matches in GtkFileFilter
-
-* GtkPasswordEntry:
- - Make GtkPasswordEntryBuffer public, to make it easier
-   to write your own password entry widget
-
-* Input:
- - Fix interference between various obscure XKB features
-   (e.g. overlays) and Compose sequences
-
-* Action support:
- - Fix submenu-action handling
-
-* Theme:
- - Update icons from the Adwaita icon theme
- - Fix icon names for GtkSwitch
- - Fix switch-off icon
-
-* GSK:
- - Improve transformed offscreen rendering
- - Add padding between cached glyphs
-
-* Wayland:
- - Fix monitor sizes in the presence of transforms
- - Add a getter for the EGLDisplay
- - Fix click-drag-release sequences for popovers
-
-* X11:
- - Support EGL for X11. Fall back to GLX if EGL isn't available
- - Always fall back to GLX on NVidia
- - Add a getter for the EGLDisplay
-
-* Broadway:
- - Add a setter for display scale
-
-* Windows:
- - Add a getter for the EGLDisplay
- - Make GL work for media playback
-
-* MacOS:
- - Fix menubar appearance
-
-* Tools:
- - gtk4-builder-tool: Replace can-focus with focusable in 3-to-4 conversion
-
-* Introspection:
- - Add missing annotations in a few places (e.g. gtk_free_view_row_activated)
-
-* Build:
- - Only build one source file with -mf16c
- - Fix devel styling for ci flatpak builds
- - Generate appdata for demo flatpaks
-
-* Docs:
- - Numerous fixes and additions
-
-* Translation updates:
- Friulian
- Nepali
- Norwegian Bokmål
- Ukrainian
-
-
-Overview of Changes in 4.3.0
-============================
-
-* GtkVideo:
- - Detect stream metadata when using gstreamer
-
-* GtkFileChooser:
- - Fix a crash
-
-* GtkButton:
- - Add back visual feedback for keynav activation
-
-* GtkFontChooser:
- - Fix initial font selection
-
-* Text widgets:
- - Replace squiggly error underlines by dotted lines
- - Support translucent selections
-
-* GtkTextView:
- - Various improvements to rendering performance
-
-* GtkScrolledWindow:
- - Stop using scroll cursors
-
-* GtkMenuButton:
- - Make focus-on-click work
-
-* GtkToggleButton:
- - Make grouped buttons mutually exclusive
-
-* GtkPasswordEntry:
- - Use MADV_DONTDUMP for secure memory
-
-* GtkListBox:
- - Allow repeated selection extension for MULTIPLE
-
-* Themes:
- - Reorganize and rename included themes. The theme is now
-   called Default, with dark, hc and hc-dark variants.
-   Visually, the themes are unchanged.
- - The theme variants are also available as standalone
-   themes called Default-dark, etc.
- - The theme named Adwaita is moving to libadwaita
- - Fix resize border sizing
- - Fix solid-csd window decorations
-
-* Input:
- - Revert some Compose sequence changes (mainly around dead
-   acute and apostrophe)
- - Consume all key events during preedit, to avoid unexpected
-   interactions
- - Ignore more modifiers during preedit, to allow using 3rd and
-   5th level choosers
- - Fix handling of cursor positions in non-ASCII preedit text
- - Fix a problem with deferred focus setting
-
-* GdkClipboard:
- - Ensure strings are nul-terminated
-
-* GSK:
- - Improvements to the ngl renderer
-   - Fix offscreen rendering with transforms
-   - Fix downscaled textures
-   - Avoid huge intermediate textures
-   - Use fp16 for colors
-   - Optimize handling of underlines in text
-   - Fix corner cases of shadow rendering
- - Reorganize shader resources
- - Make shadow rendering match across renderers
-
-* Accessibility:
- - Various fixes to get Orca to speak (still a work in progress)
-
-* Wayland:
- - Improve font settings fallback
- - Avoid unintentional rendering freezes with popovers
- - Support the xdg_activation_v1 protocol
-
-* X11:
- - Don't beep on untrusted displays
- - Don't crash when popovers are outside the workarea
-
-* Windows:
- - Fix using GL rendering with Mesa drivers
-
-* Tools:
- - Add support for copy/paste in gtk4-node-editor
- - Make syntax highlighting work in the gtk4-demo flatpak
-
-* Inspector:
- - Enable the inspector by default, in all cases
- - Show keyboard layouts
- - Improve monitor information
-
-* Translation updates:
- Catalan
- Chinese (Taiwan)
- Dutch
- Nepali
- Polish
- Swedish
- Ukrainian
-
-
 Overview of Changes in 4.2.0
 ============================

--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 GTK — The GTK toolkit
 =====================

-[![Build status](https://gitlab.gnome.org/GNOME/gtk/badges/main/pipeline.svg)](https://gitlab.gnome.org/GNOME/gtk/-/commits/main)
+[![Build status](https://gitlab.gnome.org/GNOME/gtk/badges/master/pipeline.svg)](https://gitlab.gnome.org/GNOME/gtk/-/commits/master)

 General information
 -------------------
@@ -10,12 +10,10 @@ GTK is a multi-platform toolkit for creating graphical user interfaces.
 Offering a complete set of widgets, GTK is suitable for projects ranging
 from small one-off projects to complete application suites.

-GTK is a free and open-source software project. The licensing terms
-for GTK, the GNU LGPL, allow it to be used by all developers, including those
-developing proprietary software, without any license fees or royalties.
-
-GTK is hosted by the GNOME project (thanks!) and used by a wide variety
-of applications and projects.
+GTK is free software and part of the GNU Project. However, the
+licensing terms for GTK, the GNU LGPL, allow it to be used by all
+developers, including those developing proprietary software, without any
+license fees or royalties.

 The official download location

@@ -38,13 +36,6 @@ Nightly documentation can be found at
  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk4/
  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk4/

-Nightly flatpaks of our demos can be installed from the
-[GNOME Nightly](https://wiki.gnome.org/Apps/Nightly) repository:
-  - `flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo`
-  - `flatpak install gnome-nightly org.gtk.Demo4`
-  - `flatpak install gnome-nightly org.gtk.WidgetFactory4`
-  - `flatpak install gnome-nightly org.gtk.IconBrowser4`
-
 Building and installing
 -----------------------

@@ -114,21 +105,7 @@ can be found in the file:
 docs/reference/gtk/html/gtk-building.html
 ```

-Or [online](https://docs.gtk.org/gtk4/building.html)
-
-Default branch renamed to `main`
--------------------------------
-
-The default development branch of GTK has been renamed to `main`.
-To update your local checkout, use:
-```sh
-git checkout master
-git branch -m master main
-git fetch
-git branch --unset-upstream
-git branch -u origin/main
-git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
-```
+Or [online](https://developer.gnome.org/gtk4/stable/gtk-building.html)

 How to report bugs
 ------------------
@@ -167,17 +144,14 @@ Contributing to GTK
 Please, follow the [contribution guide](./CONTRIBUTING.md) to know how to
 start contributing to GTK.

-If you want to support GTK financially, please consider donating to
-the GNOME project, which runs the infrastructure hosting GTK.
-
 Release notes
 -------------

 The release notes for GTK are part of the migration guide in the API
 reference. See:

- - [3.x release notes](https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html)
- - [4.x release notes](https://docs.gtk.org/gtk4/migrating-3to4.html)
+ - [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
+ - [4.x release notes](https://developer.gnome.org/gtk4/unstable/gtk-migrating-3-to-4.html)

 Licensing terms
 ---------------
--- a/build-aux/flatpak/lua-5.1.5-so.patch
+++ b/build-aux/flatpak/lua-5.1.5-so.patch
@@ -1,43 +0,0 @@
-diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
--- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
-+++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
-@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
- ALL_A= $(LUA_A)
- 
- default: $(PLAT)
-@@ -51,6 +52,11 @@
- 	$(AR) $@ $?
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO)
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 
--- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
-+++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
-@@ -53,7 +53,7 @@
- all:	$(PLAT)
- 
- $(PLATS) clean:
-	cd src && $(MAKE) $@
-+	cd src && $(MAKE) $@ V=$(V) R=$(R)
- 
- test:	dummy
- 	src/lua test/hello.lua
--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -43,8 +43,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                }
            ]
        },
@@ -94,92 +93,6 @@
                }
            ]
        },
-        {
-            "name": "boost",
-            "buildsystem": "simple",
-            "build-commands": [
-                "./bootstrap.sh --prefix=/app --with-libraries=date_time,filesystem,iostreams,locale,regex,system,thread,python,program_options,test,serialization",
-                "./b2 --build-type=minimal link=shared -j $FLATPAK_BUILDER_N_JOBS",
-                "./b2 --build-type=minimal link=shared install"
-             ],
-             "sources": [
-                 {
-                     "type": "archive",
-                     "url": "https://boostorg.jfrog.io/artifactory/main/release/1.69.0/source/boost_1_69_0.tar.bz2",
-                     "sha256": "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"
-                 }
-            ]
-        },
-        {
-            "name": "lua-5.1",
-            "buildsystem": "simple",
-            "build-commands": [
-                "make -j $FLATPAK_BUILDER_N_JOBS CFLAGS=\"$CFLAGS -fPIC -DLUA_USE_LINUX\" linux",
-                "make INSTALL_TOP=$FLATPAK_DEST TO_LIB='liblua.a liblua.so.5.1.5' install",
-                "ln -sf liblua.so.5.1.5 $FLATPAK_DEST/lib/liblua.so",
-                "ln -sf liblua.so.5.1.5 $FLATPAK_DEST/lib/liblua.so.5.1",
-                "install -Dm0644 etc/lua.pc $FLATPAK_DEST/lib/pkgconfig/lua.pc",
-                "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua51.pc",
-                "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua5.1.pc",
-                "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua-5.1.pc"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://www.lua.org/ftp/lua-5.1.5.tar.gz",
-                    "sha256": "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"
-                },
-                {
-                    "type": "patch",
-                    "path": "lua-5.1.5-so.patch"
-                },
-                {
-                    "type": "shell",
-                    "commands": [
-                        "sed -i \"s|/usr/local|$FLATPAK_DEST|\" etc/lua.pc src/luaconf.h"
-                    ]
-                }
-            ],
-            "cleanup": [
-                "*.a",
-                "/bin",
-                "/include",
-                "/lib/pkgconfig",
-                "/man"
-            ]
-        },
-        {
-            "name" : "highlight",
-            "buildsystem" : "simple",
-            "builddir" : true,
-            "build-commands" : [
-                "sed -i -e 's#^PREFIX = /usr#PREFIX = /app#' makefile",
-                "make",
-                "make install"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "http://www.andre-simon.de/zip/highlight-4.0.tar.bz2",
-                    "sha256" : "f40dcba26e011a2c67df874f4d9b0238c2c6b065163ce8de3d8371b9dfce864d"
-                }
-            ]
-        },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
        {
            "name" : "gtk",
            "buildsystem" : "meson",
@@ -193,8 +106,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
                }
            ]
        }
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -43,8 +43,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                }
            ]
        },
@@ -94,21 +93,6 @@
                }
            ]
        },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
        {
            "name" : "gtk",
            "buildsystem" : "meson",
@@ -122,8 +106,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
                }
            ]
        }
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -43,8 +43,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                }
            ]
        },
@@ -94,21 +93,6 @@
                }
            ]
        },
-        {
-            "name" : "pango",
-            "buildsystem" : "meson",
-            "builddir" : true,
-            "config-opts" : [
-                "--libdir=/app/lib"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/pango.git",
-                    "branch" : "main"
-                }
-            ]
-        },
        {
            "name" : "gtk",
            "buildsystem" : "meson",
@@ -122,8 +106,7 @@
            "sources" : [
                {
                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "branch" : "main"
+                    "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
                }
            ]
        }
--- a/build-aux/meson/dist-data.py
+++ b/build-aux/meson/dist-data.py
@@ -8,10 +8,10 @@ from pathlib import PurePath


 stylesheets = [
-    'gtk/theme/Default/Default-light.css',
-    'gtk/theme/Default/Default-dark.css',
-    'gtk/theme/Default/Default-hc.css',
-    'gtk/theme/Default/Default-hc-dark.css',
+    'gtk/theme/Adwaita/Adwaita.css',
+    'gtk/theme/Adwaita/Adwaita-dark.css',
+    'gtk/theme/HighContrast/HighContrast.css',
+    'gtk/theme/HighContrast/HighContrast-dark.css',
 ]

 references = [
--- a/build-aux/meson/gen-demo-header.py
+++ b/build-aux/meson/gen-demo-header.py
@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-repodir = sys.argv[1]
-profile = sys.argv[2]
-
-sys.stdout.write("/* This file is auto-generated. Do not edit. */\n")
-sys.stdout.write("#pragma once\n")
-sys.stdout.write("\n")
-sys.stdout.write(f"#define PROFILE \"{profile}\"\n")
-
-short_sha = os.environ.get('CI_COMMIT_SHORT_SHA')
-if short_sha is None:
-    cmd = ["git", "-C", repodir, "rev-parse", "--short", "HEAD"]
-    try:
-        with subprocess.Popen(cmd, stdout=subprocess.PIPE) as p:
-            short_sha = p.stdout.read().decode('utf-8').rstrip("\n")
-    except FileNotFoundError:
-        short_sha = ''
-        if profile != 'default':
-            short_sha = 'devel'
-
-sys.stdout.write(f"#define VCS_TAG \"{short_sha}\"\n")
--- a/build-aux/meson/post-install.py
+++ b/build-aux/meson/post-install.py
@@ -13,7 +13,7 @@ if 'DESTDIR' not in os.environ:

    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
-    gtk_mediamodule_dir = os.path.join(gtk_moduledir, 'media')
+    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')

    print('Compiling GSettings schemas...')
    glib_compile_schemas = subprocess.check_output(['pkg-config',
@@ -40,6 +40,6 @@ if 'DESTDIR' not in os.environ:
        gio_querymodules = 'gio-querymodules'
    subprocess.call([gio_querymodules, gtk_printmodule_dir])

-    print('Updating module cache for media backends...')
-    os.makedirs(gtk_mediamodule_dir, exist_ok=True)
-    subprocess.call([gio_querymodules, gtk_mediamodule_dir])
+    print('Updating module cache for input methods...')
+    os.makedirs(gtk_immodule_dir, exist_ok=True)
+    subprocess.call([gio_querymodules, gtk_immodule_dir])
--- a/config.h.meson
+++ b/config.h.meson
@@ -0,0 +1,281 @@
+/* always defined to indicate that i18n is enabled */
+#define ENABLE_NLS 1
+
+/* Use structured logging */
+#define G_LOG_STRUCTURED 1
+
+/* The prefix for our gettext translation domains. */
+#mesondefine GETTEXT_PACKAGE
+
+/* Disable deprecation warnings from glib */
+#mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
+
+/* Define the location where the catalogs will be installed */
+#mesondefine GTK_LOCALEDIR
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Have the cloudproviders library */
+#mesondefine HAVE_CLOUDPROVIDERS
+
+/* define if we have colord */
+#mesondefine HAVE_COLORD
+
+/* Define to 1 if you have the <crt_externs.h> header file. */
+#mesondefine HAVE_CRT_EXTERNS_H
+
+/* Define to 1 if you have the `dcgettext' function. */
+#mesondefine HAVE_DCGETTEXT
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#mesondefine HAVE_DLFCN_H
+
+/* Have the ffmpeg library */
+#mesondefine HAVE_FFMPEG
+
+/* Define to 1 if you have the <ftw.h> header file. */
+#mesondefine HAVE_FTW_H
+
+/* Define to 1 if you have the `getpagesize' function. */
+#mesondefine HAVE_GETPAGESIZE
+
+/* Define to 1 if you have the `getresuid' function. */
+#mesondefine HAVE_GETRESUID
+
+/* Define if gio-unix is available */
+#mesondefine HAVE_GIO_UNIX
+
+/* Define if GStreamer support is available */
+#mesondefine HAVE_GSTREAMER
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#mesondefine HAVE_INTTYPES_H
+
+/* Define to 1 if the system has the type `IPrintDialogCallback'. */
+#mesondefine HAVE_IPRINTDIALOGCALLBACK
+
+/* Define to 1 if you have the <locale.h> header file. */
+#mesondefine HAVE_LOCALE_H
+
+/* Define to 1 if you have the `lstat' function. */
+#mesondefine HAVE_LSTAT
+
+/* Define to 1 if you have the `mallinfo' function. */
+#mesondefine HAVE_MALLINFO
+
+/* Define to 1 if you have the <memory.h> header file. */
+#mesondefine HAVE_MEMORY_H
+
+/* Define to 1 if you have the `mkstemp' function. */
+#mesondefine HAVE_MKSTEMP
+
+/* Define to 1 if you have the `mlock` function. */
+#mesondefine HAVE_MLOCK
+
+/* Define to 1 if you have a working `mmap' system call. */
+#mesondefine HAVE_MMAP
+
+/* Define to 1 if you have the `posix_fallocate' function. */
+#mesondefine HAVE_POSIX_FALLOCATE
+
+/* Have the Xrandr extension library */
+#mesondefine HAVE_RANDR
+
+/* Have the Xrandr 1.5 extension library */
+#mesondefine HAVE_RANDR15
+
+/* Define to 1 if you have the `sincos' function. */
+#mesondefine HAVE_SINCOS
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#mesondefine HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#mesondefine HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#mesondefine HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#mesondefine HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#mesondefine HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#mesondefine HAVE_SYS_PARAM_H
+
+/* Have the sysprof-capture library */
+#mesondefine HAVE_SYSPROF
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#mesondefine HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#mesondefine HAVE_SYS_TIME_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#mesondefine HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#mesondefine HAVE_UNISTD_H
+
+/* Have the XCOMPOSITE X extension */
+#mesondefine HAVE_XCOMPOSITE
+
+/* Have the Xcursor library */
+#mesondefine HAVE_XCURSOR
+
+/* Have the XDAMAGE X extension */
+#mesondefine HAVE_XDAMAGE
+
+/* Have the XFIXES X extension */
+#mesondefine HAVE_XFIXES
+
+/* Define to 1 if XFree Xinerama is available */
+#mesondefine HAVE_XFREE_XINERAMA
+
+/* Have XGenericEvent */
+#mesondefine HAVE_XGENERICEVENTS
+
+/* Define to use XKB extension */
+#mesondefine HAVE_XKB
+
+/* Have the SYNC extension library */
+#mesondefine HAVE_XSYNC
+
+/* Define to 1 if you have the `_lock_file' function */
+#mesondefine HAVE__LOCK_FILE
+
+/* Define to 1 if you have the `flockfile' function */
+#mesondefine HAVE_FLOCKFILE
+
+/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
+#mesondefine HAVE__NL_MEASUREMENT_MEASUREMENT
+
+/* Define if _NL_PAPER_HEIGHT is available */
+#mesondefine HAVE__NL_PAPER_HEIGHT
+
+/* Define if _NL_PAPER_WIDTH is available */
+#mesondefine HAVE__NL_PAPER_WIDTH
+
+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
+#mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#mesondefine LT_OBJDIR
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#mesondefine NO_MINUS_C_MINUS_O
+
+/* Define to the address where bug reports for this package should be sent. */
+#mesondefine PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#mesondefine PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#mesondefine PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#mesondefine PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#mesondefine PACKAGE_URL
+
+/* Define to the version of this package. */
+#mesondefine PACKAGE_VERSION
+
+/* Use NSBundle functions to determine load paths for libraries, translations,
+   etc. */
+#mesondefine QUARTZ_RELOCATION
+
+/* Define to 1 if you have the ANSI C header files. */
+#mesondefine STDC_HEADERS
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define to 1 if XInput 2.2 is available */
+#mesondefine XINPUT_2_2
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#mesondefine X_DISPLAY_MISSING
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#mesondefine _FILE_OFFSET_BITS
+
+/* defines how to decorate public symbols while building */
+#mesondefine _GDK_EXTERN
+
+/* Define for large files, on AIX-style hosts. */
+#mesondefine _LARGE_FILES
+
+/* Define to 1 if on MINIX. */
+#mesondefine _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#mesondefine _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#mesondefine _POSIX_SOURCE
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#mesondefine gid_t
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#mesondefine uid_t
+
+/* Define to 1 if linux/memfd.h exists */
+#mesondefine HAVE_LINUX_MEMFD_H
+
+#mesondefine HAVE_LINUX_INPUT_H
+
+#mesondefine HAVE_DEV_EVDEV_INPUT_H
+
+#mesondefine GTK_SYSCONFDIR
+
+#mesondefine GTK_LOCALEDIR
+
+#mesondefine GTK_DATADIR
+
+#mesondefine GTK_LIBDIR
+
+#mesondefine GTK_PRINT_BACKENDS
+
+#mesondefine HAVE_CAIRO_SCRIPT_INTERPRETER
+
+#mesondefine HAVE_HARFBUZZ
+
+#mesondefine HAVE_PANGOFT
+
+#mesondefine ISO_CODES_PREFIX
+
+/* Define if tracker3 is available */
+#mesondefine HAVE_TRACKER3
--- a/demos/constraint-editor/meson.build
+++ b/demos/constraint-editor/meson.build
@@ -17,7 +17,7 @@ executable('gtk4-constraint-editor',
  c_args: common_cflags,
  dependencies: libgtk_dep,
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: false,
 )
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -1,10 +1,12 @@
 /* Clipboard
 *
 * GdkClipboard is used for clipboard handling. This demo shows how to
- * copy and paste text, images, colors or files to and from the clipboard.
+ * copy and paste text to and from the clipboard.
 *
- * You can also use Drag-And-Drop to copy the data from the source to the
- * target.
+ * It also shows how to transfer images via the clipboard or via
+ * drag-and-drop, and how to make clipboard contents persist after
+ * the application exits. Clipboard persistence requires a clipboard
+ * manager to run.
 */

 #include <glib/gi18n.h>
@@ -12,103 +14,22 @@
 #include <string.h>
 #include "demoimage.h"

+static GtkWidget *window = NULL;
+
 static void
-copy_button_clicked (GtkStack *source_stack,
-                     gpointer  user_data)
+copy_button_clicked (GtkWidget *button,
+                     gpointer   user_data)
 {
+  GtkWidget *entry;
  GdkClipboard *clipboard;
-  const char *visible_child_name;
-  GtkWidget *visible_child;

-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (source_stack));
+  entry = GTK_WIDGET (user_data);

-  visible_child = gtk_stack_get_visible_child (source_stack);
-  visible_child_name = gtk_stack_get_visible_child_name (source_stack);
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry);

-  if (strcmp (visible_child_name, "Text") == 0)
-    {
-      gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (visible_child)));
-    }
-  else if (strcmp (visible_child_name, "Image") == 0)
-    {
-      GtkWidget *child;
-
-      for (child = gtk_widget_get_first_child (visible_child); child; child = gtk_widget_get_next_sibling (child))
-        {
-          if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (child)))
-            {
-              GtkWidget *image = gtk_widget_get_first_child (child);
-              GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
-
-              if (GDK_IS_TEXTURE (paintable))
-                gdk_clipboard_set (clipboard, GDK_TYPE_TEXTURE, paintable);
-              else
-                gdk_clipboard_set (clipboard, GDK_TYPE_PAINTABLE, paintable);
-              break;
-            }
-        }
-    }
-  else if (strcmp (visible_child_name, "Color") == 0)
-    {
-      GdkRGBA color;
-
-      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (visible_child), &color);
-      gdk_clipboard_set (clipboard, GDK_TYPE_RGBA, &color);
-    }
-  else if (strcmp (visible_child_name, "File") == 0)
-    {
-      gdk_clipboard_set (clipboard, G_TYPE_FILE, g_object_get_data (G_OBJECT (visible_child), "file"), NULL);
-    }
-  else
-    {
-      g_print ("TODO");
-    }
-}
-
-static void
-present_value (GtkStack     *dest_stack,
-               const GValue *value)
-{
-  GtkWidget *child;
-
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      GFile *file;
-
-      gtk_stack_set_visible_child_name (dest_stack, "File");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      file = g_value_get_object (value);
-      g_object_set (child, "label", g_file_peek_path (file), NULL);
-    }
-  else if (G_VALUE_HOLDS (value, GDK_TYPE_RGBA))
-    {
-      GdkRGBA *color;
-
-      gtk_stack_set_visible_child_name (dest_stack, "Color");
-      child = gtk_widget_get_first_child (gtk_stack_get_visible_child (dest_stack));
-
-      color = g_value_get_boxed (value);
-      g_object_set (child, "rgba", color, NULL);
-    }
-  else if (G_VALUE_HOLDS (value, GDK_TYPE_TEXTURE) ||
-           G_VALUE_HOLDS (value, GDK_TYPE_PAINTABLE))
-    {
-      GdkPaintable *paintable;
-
-      gtk_stack_set_visible_child_name (dest_stack, "Image");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      paintable = g_value_get_object (value);
-      g_object_set (child, "paintable", paintable, NULL);
-    }
-  else if (G_VALUE_HOLDS (value, G_TYPE_STRING))
-    {
-      gtk_stack_set_visible_child_name (dest_stack, "Text");
-      child = gtk_stack_get_visible_child (dest_stack);
-
-      gtk_label_set_label (GTK_LABEL (child), g_value_get_string (value));
-    }
+  /* Set clipboard text */
+  gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (entry)));
 }

 static void
@@ -116,259 +37,149 @@ paste_received (GObject      *source_object,
                GAsyncResult *result,
                gpointer      user_data)
 {
-  GtkStack *dest_stack = user_data;
  GdkClipboard *clipboard;
-  const GValue *value;
+  GtkWidget *entry;
+  char *text;
  GError *error = NULL;

  clipboard = GDK_CLIPBOARD (source_object);
+  entry = GTK_WIDGET (user_data);

-  value = gdk_clipboard_read_value_finish (clipboard, result, &error);
-  if (value)
+  /* Get the resulting text of the read operation */
+  text = gdk_clipboard_read_text_finish (clipboard, result, &error);
+
+  if (text)
    {
-      present_value (dest_stack, value);
+      /* Set the entry text */
+      gtk_editable_set_text (GTK_EDITABLE (entry), text);
+      g_free (text);
    }
  else
    {
-      g_print ("%s\n", error->message);
+      GtkWidget *dialog;
+
+      /* Show an error about why pasting failed.
+       * Usually you probably want to ignore such failures,
+       * but for demonstration purposes, we show the error.
+       */
+      dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+                                       GTK_MESSAGE_ERROR,
+                                       GTK_BUTTONS_CLOSE,
+                                       "Could not paste text: %s",
+                                       error->message);
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (gtk_window_destroy), NULL);
+      gtk_widget_show (dialog);
+
      g_error_free (error);
    }
 }

 static void
-paste_button_clicked (GtkStack *dest_stack,
-                      gpointer  user_data)
+paste_button_clicked (GtkWidget *button,
+                      gpointer   user_data)
 {
+  GtkWidget *entry;
  GdkClipboard *clipboard;
-  GdkContentFormats *formats;

-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (dest_stack));
-  formats = gdk_clipboard_get_formats (clipboard);
+  entry = GTK_WIDGET (user_data);

-  if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_TEXTURE))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_TEXTURE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_PAINTABLE))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_PAINTABLE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, GDK_TYPE_RGBA))
-    gdk_clipboard_read_value_async (clipboard, GDK_TYPE_RGBA, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, G_TYPE_FILE))
-    gdk_clipboard_read_value_async (clipboard, G_TYPE_FILE, 0, NULL, paste_received, dest_stack);
-  else if (gdk_content_formats_contain_gtype (formats, G_TYPE_STRING))
-    gdk_clipboard_read_value_async (clipboard, G_TYPE_STRING, 0, NULL, paste_received, dest_stack);
-}
+  /* Get the clipboard object */
+  clipboard = gtk_widget_get_clipboard (entry);

-static void
-update_copy_button_sensitivity (GtkWidget *source_stack)
-{
-  GtkButton *copy_button;
-  const char *visible_child_name;
-  GtkWidget *visible_child;
-  gboolean sensitive;
-
-  copy_button = GTK_BUTTON (g_object_get_data (G_OBJECT (source_stack), "copy-button"));
-
-  visible_child = gtk_stack_get_visible_child (GTK_STACK (source_stack));
-  visible_child_name = gtk_stack_get_visible_child_name (GTK_STACK (source_stack));
-  if (strcmp (visible_child_name, "Text") == 0)
-    {
-      sensitive = strlen (gtk_editable_get_text (GTK_EDITABLE (visible_child))) > 0;
-    }
-  else if (strcmp (visible_child_name, "Color") == 0 ||
-           strcmp (visible_child_name, "Image") == 0)
-    {
-      sensitive = TRUE;
-    }
-  else if (strcmp (visible_child_name, "File") == 0)
-    {
-      sensitive = g_object_get_data (G_OBJECT (visible_child), "file") != NULL;
-    }
-  else
-    {
-      sensitive = FALSE;
-    }
-
-  gtk_widget_set_sensitive (GTK_WIDGET (copy_button), sensitive);
-}
-
-static void
-source_changed_cb (GtkButton  *copy_button,
-                   GParamSpec *pspec,
-                   GtkWidget  *source_stack)
-{
-  update_copy_button_sensitivity (source_stack);
-}
-
-static void
-text_changed_cb (GtkButton  *copy_button,
-                 GParamSpec *pspec,
-                 GtkWidget  *entry)
-{
-  update_copy_button_sensitivity (gtk_widget_get_ancestor (entry, GTK_TYPE_STACK));
-}
-
-static void
-file_button_set_file (GtkButton *button,
-                      GFile     *file)
-{
-  gtk_label_set_label (GTK_LABEL (gtk_button_get_child (button)), g_file_peek_path (file));
-  g_object_set_data_full (G_OBJECT (button), "file", g_object_ref (file), g_object_unref);
-}
-
-static void
-file_chooser_response (GtkNativeDialog *dialog,
-                       int              response,
-                       GtkButton       *button)
-{
-  gtk_native_dialog_hide (dialog);
-
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      GFile *file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-      file_button_set_file (button, file);
-      g_object_unref (file);
-
-      update_copy_button_sensitivity (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_STACK));
-    }
-
-  gtk_native_dialog_destroy (dialog);
-}
-
-static void
-open_file_cb (GtkWidget *button)
-{
-  GtkFileChooserNative *chooser;
-
-  chooser = gtk_file_chooser_native_new ("Choose a file",
-                                         GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
-                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                         "_Open",
-                                         "_Cancel");
-
-  g_signal_connect (chooser, "response", G_CALLBACK (file_chooser_response), button);
-  gtk_native_dialog_show (GTK_NATIVE_DIALOG (chooser));
-}
-
-static void
-update_paste_button_sensitivity (GdkClipboard *clipboard,
-                                 GtkWidget    *paste_button)
-{
-  GdkContentFormats *formats;
-  gboolean sensitive = FALSE;
-
-  formats = gdk_clipboard_get_formats (clipboard);
-
-  if (gdk_content_formats_contain_gtype (formats, G_TYPE_FILE) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_RGBA) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_TEXTURE) ||
-      gdk_content_formats_contain_gtype (formats, GDK_TYPE_PAINTABLE) ||
-      gdk_content_formats_contain_gtype (formats, G_TYPE_STRING))
-    sensitive = TRUE;
-
-  gtk_widget_set_sensitive (paste_button, sensitive);
-}
-
-static void
-unset_clipboard_handler (gpointer data)
-{
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-
-  g_signal_handlers_disconnect_by_func (clipboard, update_paste_button_sensitivity, data);
-}
-
-static gboolean
-on_drop (GtkStack      *dest_stack,
-         const GValue  *value,
-         double         x,
-         double         y,
-         gpointer       data)
-{
-  present_value (dest_stack, value);
-  return TRUE;
-}
-
-static GdkContentProvider *
-drag_prepare (GtkDragSource *drag_source,
-              double         x,
-              double         y,
-              gpointer       data)
-{
-  GtkWidget *button;
-  GValue value = G_VALUE_INIT;
-
-  button = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (drag_source));
-
-  if (GTK_IS_TOGGLE_BUTTON (button))
-    {
-      GtkWidget *image = gtk_widget_get_first_child (button);
-      GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
-
-      if (GDK_IS_TEXTURE (paintable))
-        {
-          g_value_init (&value, GDK_TYPE_TEXTURE);
-          g_value_set_object (&value, paintable);
-        }
-      else
-        {
-          g_value_init (&value, GDK_TYPE_PAINTABLE);
-          g_value_set_object (&value, paintable);
-        }
-    }
-  else
-    {
-      GFile *file = g_object_get_data (G_OBJECT (button), "file");
-
-      if (file)
-        {
-          g_value_init (&value, G_TYPE_FILE);
-          g_value_set_object (&value, file);
-        }
-      else
-        return NULL;
-    }
-
-  return gdk_content_provider_new_for_value (&value);
+  /* Request the contents of the clipboard, contents_received will be
+     called when we do get the contents.
+   */
+  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
 }

 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
-  static GtkWidget *window = NULL;
-
  if (!window)
    {
-      GtkBuilderScope *scope;
-      GtkBuilder *builder;
-      GtkWidget *button;
+      GtkWidget *vbox, *hbox;
+      GtkWidget *label;
+      GtkWidget *entry, *button;
+      GtkWidget *image;

-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbols (GTK_BUILDER_CSCOPE (scope),
-                                               "copy_button_clicked", G_CALLBACK (copy_button_clicked),
-                                               "paste_button_clicked", G_CALLBACK (paste_button_clicked),
-                                               "source_changed_cb", G_CALLBACK (source_changed_cb),
-                                               "text_changed_cb", G_CALLBACK (text_changed_cb),
-                                               "open_file_cb", G_CALLBACK (open_file_cb),
-                                               "on_drop", G_CALLBACK (on_drop),
-                                               "drag_prepare", G_CALLBACK (drag_prepare),
-                                               NULL);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/clipboard/clipboard.ui", NULL);
-
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "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), "Clipboard");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));

-      button = GTK_WIDGET (gtk_builder_get_object (builder, "copy_button"));
-      g_object_set_data (gtk_builder_get_object (builder, "source_stack"), "copy-button", button);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      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);

-      button = GTK_WIDGET (gtk_builder_get_object (builder, "paste_button"));
-      g_signal_connect (gtk_widget_get_clipboard (button), "changed",
-                        G_CALLBACK (update_paste_button_sensitivity), button);
-      g_object_set_data_full (G_OBJECT (button), "clipboard-handler", button, unset_clipboard_handler);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);

-      g_object_unref (builder);
-      g_object_unref (scope);
+      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
+
+      gtk_box_append (GTK_BOX (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);
+
+      /* Create the first entry */
+      entry = gtk_entry_new ();
+      gtk_box_append (GTK_BOX (hbox), entry);
+
+      /* Create the button */
+      button = gtk_button_new_with_mnemonic (_("_Copy"));
+      gtk_box_append (GTK_BOX (hbox), button);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (copy_button_clicked), entry);
+
+      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
+      gtk_box_append (GTK_BOX (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);
+
+      /* Create the second entry */
+      entry = gtk_entry_new ();
+      gtk_box_append (GTK_BOX (hbox), entry);
+
+      /* Create the button */
+      button = gtk_button_new_with_mnemonic (_("_Paste"));
+      gtk_box_append (GTK_BOX (hbox), button);
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (paste_button_clicked), entry);
+
+      label = gtk_label_new ("Images can be transferred via the clipboard, too");
+      gtk_box_append (GTK_BOX (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);
+
+      /* Create the first image */
+      image = demo_image_new ("dialog-warning");
+      gtk_box_append (GTK_BOX (hbox), image);
+
+      /* Create the second image */
+      image = demo_image_new ("process-stop");
+      gtk_box_append (GTK_BOX (hbox), image);
+
+      /* Create the third image */
+      image = demo_image_new ("weather-clear");
+      gtk_box_append (GTK_BOX (hbox), image);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/clipboard.ui
+++ b/demos/gtk-demo/clipboard.ui
@@ -1,288 +0,0 @@
-
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="resizable">1</property>
-    <property name="title">Clipboard</property>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">“Copy” will copy the selected data the clipboard, “Paste” will show the current clipboard contents. You can also drag the data to the bottom.</property>
-            <property name="wrap">1</property>
-            <property name="max-width-chars">40</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkDropDown" id="source_chooser">
-                <property name="valign">center</property>
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item>Text</item>
-                      <item>Color</item>
-                      <item>Image</item>
-                      <item>File</item>
-                    </items>
-                  </object>
-                </property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStack" id="source_stack">
-                <signal name="notify::visible-child" handler="source_changed_cb" object="copy_button"/>
-                <property name="vexpand">1</property>
-                <binding name="visible-child-name">
-                  <lookup name="string" type="GtkStringObject">
-                    <lookup name="selected-item">
-                      source_chooser
-                    </lookup>
-                  </lookup>
-                </binding>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Text</property>
-                    <property name="child">
-                      <object class="GtkEntry" id="source_text">
-                        <property name="valign">center</property>
-                        <signal name="notify::text" handler="text_changed_cb" object="copy_button"/>
-                        <property name="text">Copy this!</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Color</property>
-                    <property name="child">
-                      <object class="GtkColorButton" id="source_color">
-                        <property name="valign">center</property>
-                        <property name="rgba">purple</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Image</property>
-                    <property name="child">
-                      <object class="GtkBox">
-                        <property name="valign">center</property>
-                        <style>
-                          <class name="linked"/>
-                        </style>
-                        <child>
-                          <object class="GtkToggleButton" id="image_rose">
-                            <property name="active">1</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <signal name="prepare" handler="drag_prepare"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <style>
-                                  <class name="large-icons"/>
-                                </style>
-                                <property name="paintable">resource:///transparent/portland-rose.jpg</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="image_floppy">
-                            <property name="group">image_rose</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <signal name="prepare" handler="drag_prepare"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <style>
-                                  <class name="large-icons"/>
-                                </style>
-                                <property name="paintable">resource:///images/floppybuddy.gif</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkToggleButton" id="image_logo">
-                            <property name="group">image_floppy</property>
-                            <child>
-                              <object class="GtkDragSource">
-                                <signal name="prepare" handler="drag_prepare"/>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage">
-                                <style>
-                                  <class name="large-icons"/>
-                                </style>
-                                <property name="paintable">resource:///images/org.gtk.Demo4.svg</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">File</property>
-                    <property name="child">
-                      <object class="GtkButton" id="source_file">
-                        <child>
-                          <object class="GtkDragSource">
-                            <property name="propagation-phase">capture</property>
-                            <signal name="prepare" handler="drag_prepare"/>
-                          </object>
-                        </child>
-                        <property name="valign">center</property>
-                        <property name="child">
-                          <object class="GtkLabel">
-                            <property name="label">—</property>
-                            <property name="xalign">0</property>
-                            <property name="ellipsize">start</property>
-                          </object>
-                        </property>
-                        <signal name="clicked" handler="open_file_cb"/>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="copy_button">
-                <property name="valign">center</property>
-                <property name="label" translatable="yes">_Copy</property>
-                <signal name="clicked" handler="copy_button_clicked" object="source_stack"/>
-                <property name="use-underline">1</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkDropTarget">
-                <property name="actions">copy</property>
-                <property name="formats">GdkTexture GdkPaintable GFile GdkRGBA gchararray</property>
-                <signal name="drop" handler="on_drop" object="dest_stack"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="paste_button">
-                <property name="label" translatable="yes">_Paste</property>
-                <signal name="clicked" handler="paste_button_clicked" object="dest_stack"/>
-                <property name="use-underline">1</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="xalign">0</property>
-                <binding name="label">
-                  <lookup name="visible-child-name" type="GtkStack">
-                    dest_stack
-                  </lookup>
-                </binding>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStack" id="dest_stack">
-                <property name="halign">end</property>
-                <property name="valign">center</property>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name"></property>
-                    <property name="child">
-                      <object class="GtkLabel">
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Text</property>
-                    <property name="child">
-                      <object class="GtkLabel">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <property name="xalign">0</property>
-                        <property name="ellipsize">end</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Image</property>
-                    <property name="child">
-                      <object class="GtkImage">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <style>
-                          <class name="large-icons"/>
-                        </style>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Color</property>
-                    <property name="child">
-                      <object class="GtkBox">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <child>
-                          <object class="GtkColorSwatch">
-                            <property name="accessible-role">img</property>
-                            <property name="can-focus">0</property>
-                            <property name="selectable">0</property>
-                            <property name="has-menu">0</property>
-                          </object>
-                        </child>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">File</property>
-                    <property name="child">
-                      <object class="GtkLabel">
-                        <property name="halign">end</property>
-                        <property name="valign">center</property>
-                        <property name="xalign">0</property>
-                        <property name="hexpand">1</property>
-                        <property name="ellipsize">start</property>
-                      </object>
-                    </property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
--- a/demos/gtk-demo/cursors.c
+++ b/demos/gtk-demo/cursors.c
@@ -24,7 +24,6 @@ do_cursors (GtkWidget *do_widget)

      builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      g_signal_connect (window, "destroy",
@@ -35,7 +34,9 @@ do_cursors (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    {
+      gtk_window_destroy (GTK_WINDOW (window));
+    }

  return window;
 }
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -15,7 +15,6 @@
    <file>demo.ui</file>
  </gresource>
  <gresource prefix="/clipboard">
-    <file>clipboard.ui</file>
    <file>demoimage.c</file>
    <file>demoimage.h</file>
  </gresource>
@@ -322,7 +321,6 @@
    <file>paintable_emblem.c</file>
    <file>paintable_mediastream.c</file>
    <file>paintable_svg.c</file>
-    <file>paintable_symbolic.c</file>
    <file>panes.c</file>
    <file>password_entry.c</file>
    <file>peg_solitaire.c</file>
--- a/demos/gtk-demo/demoimage.c
+++ b/demos/gtk-demo/demoimage.c
@@ -100,11 +100,7 @@ prepare_drag (GtkDragSource *source,
  DemoImage *demo = DEMO_IMAGE (widget);
  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));

-  /* Textures can be serialized, paintables can't, so special case the textures */
-  if (GDK_IS_TEXTURE (paintable))
-    return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, paintable);
-  else
-    return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
+  return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
 }

 static gboolean
@@ -133,11 +129,7 @@ copy_image (GtkWidget *widget,
  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));
  GValue value = G_VALUE_INIT;

-  /* Textures can be serialized, paintables can't, so special case the textures */
-  if (GDK_IS_TEXTURE (paintable))
-    g_value_init (&value, GDK_TYPE_TEXTURE);
-  else
-    g_value_init (&value, GDK_TYPE_PAINTABLE);
+  g_value_init (&value, GDK_TYPE_PAINTABLE);
  g_value_set_object (&value, paintable);
  gdk_clipboard_set_value (clipboard, &value);
  g_value_unset (&value);
@@ -146,46 +138,24 @@ copy_image (GtkWidget *widget,
    g_object_unref (paintable);
 }

-static void
-paste_image_cb (GObject      *source,
-                GAsyncResult *result,
-                gpointer      data)
-{
-  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
-  DemoImage *demo = DEMO_IMAGE (data);
-  const GValue *value;
-
-  value = gdk_clipboard_read_value_finish (clipboard, result, NULL);
-  if (value == NULL)
-    {
-      gtk_widget_error_bell (GTK_WIDGET (demo));
-      g_object_unref (demo);
-      return;
-    }
-
-  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), g_value_get_object (value));
-  g_object_unref (demo);
-}
-
 static void
 paste_image (GtkWidget *widget,
             const char *action_name,
             GVariant *parameter)
 {
  GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
-  GType type;
+  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkContentProvider *content = gdk_clipboard_get_content (clipboard);
+  GValue value = G_VALUE_INIT;
+  GdkPaintable *paintable;

-  if (gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GDK_TYPE_TEXTURE))
-    type = GDK_TYPE_TEXTURE;
-  else
-    type = GDK_TYPE_PAINTABLE;
+  g_value_init (&value, GDK_TYPE_PAINTABLE);
+  if (!gdk_content_provider_get_value (content, &value, NULL))
+    return;

-  gdk_clipboard_read_value_async (clipboard, 
-                                  type,
-                                  G_PRIORITY_DEFAULT,
-                                  NULL,
-                                  paste_image_cb,
-                                  g_object_ref (widget));
+  paintable = GDK_PAINTABLE (g_value_get_object (&value));
+  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), paintable);
+  g_value_unset (&value);
 }

 static void
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -13,13 +13,13 @@
            </style>
            <child>
              <object class="GtkButton">
-                <property name="icon-name">go-previous-symbolic</property>
+                <property name="icon-name">pan-start-symbolic</property>
                <signal name="clicked" handler="fishbowl_prev_button_clicked_cb" object="bowl" swapped="no"/>
              </object>
            </child>
            <child>
              <object class="GtkButton">
-                <property name="icon-name">go-next-symbolic</property>
+                <property name="icon-name">pan-end-symbolic</property>
                <signal name="clicked" handler="fishbowl_next_button_clicked_cb" object="bowl" swapped="no"/>
              </object>
            </child>
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -10,8 +10,12 @@
          <object class="GtkButton" id="reset">
            <property name="receives-default">1</property>
            <property name="tooltip-text">Reset</property>
-            <property name="icon-name">view-refresh-symbolic</property>
            <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
+            <child>
+              <object class="GtkImage">
+                <property name="icon-name">view-refresh-symbolic</property>
+              </object>
+            </child>
          </object>
        </child>
      </object>
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -12,6 +12,7 @@
 */

 #include <gtk/gtk.h>
+#include <pango/pangofc-font.h>
 #include <hb.h>
 #include <hb-ot.h>
 #include <glib/gi18n.h>
@@ -1135,7 +1136,7 @@ done:
  g_free (design_coords);
 }

-G_MODULE_EXPORT void
+void
 font_features_font_changed (void)
 {
  update_script_combo ();
@@ -1143,14 +1144,14 @@ font_features_font_changed (void)
  update_font_variations ();
 }

-G_MODULE_EXPORT void
+void
 font_features_script_changed (void)
 {
  update_features ();
  update_display ();
 }

-G_MODULE_EXPORT void
+void
 font_features_reset_features (void)
 {
  GList *l;
@@ -1196,7 +1197,7 @@ switch_to_label (void)
  update_display ();
 }

-G_MODULE_EXPORT void
+void
 font_features_toggle_edit (void)
 {
  if (strcmp (gtk_stack_get_visible_child_name (GTK_STACK (stack)), "label") == 0)
@@ -1205,7 +1206,7 @@ font_features_toggle_edit (void)
    switch_to_label ();
 }

-G_MODULE_EXPORT void
+void
 font_features_stop_edit (void)
 {
  g_signal_emit_by_name (edit_toggle, "clicked");
--- a/demos/gtk-demo/fontify.c
+++ b/demos/gtk-demo/fontify.c
@@ -131,19 +131,6 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
      gtk_text_buffer_apply_tag (buffer, tag, start, end); \
    }

-#define VOID_ATTR(attr_name) \
-    { \
-      tag = gtk_text_tag_table_lookup (table, #attr_name); \
-      if (!tag) \
-        { \
-          tag = gtk_text_tag_new (#attr_name); \
-          g_object_set (tag, #attr_name, TRUE, NULL); \
-          gtk_text_tag_table_add (table, tag); \
-          g_object_unref (tag); \
-        } \
-      gtk_text_buffer_apply_tag (buffer, tag, start, end); \
-    }
-
  fg_alpha = bg_alpha = 1.;

  attrs = pango_attr_iterator_get_attrs (iter);
@@ -268,29 +255,6 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
          INT_ATTR (insert_hyphens);
          break;

-        case PANGO_ATTR_LINE_HEIGHT:
-          FLOAT_ATTR (line_height);
-          break;
-
-        case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
-          break;
-
-        case PANGO_ATTR_WORD:
-          VOID_ATTR (word);
-          break;
-
-        case PANGO_ATTR_SENTENCE:
-          VOID_ATTR (sentence);
-          break;
-
-        case PANGO_ATTR_BASELINE_SHIFT:
-          INT_ATTR (baseline_shift);
-          break;
-
-        case PANGO_ATTR_FONT_SCALE:
-          INT_ATTR (font_scale);
-          break;
-
        case PANGO_ATTR_SHAPE:
        case PANGO_ATTR_ABSOLUTE_SIZE:
        case PANGO_ATTR_GRAVITY:
@@ -299,10 +263,6 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
        case PANGO_ATTR_BACKGROUND_ALPHA:
          break;

-        case PANGO_ATTR_TEXT_TRANSFORM:
-          INT_ATTR (text_transform);
-          break;
-
        case PANGO_ATTR_INVALID:
        default:
          g_assert_not_reached ();
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -1,11 +1,6 @@
 /* Pango/Font Rendering
 *
- * Demonstrates various aspects of font rendering,
- * such as hinting, antialiasing and grid alignment.
- *
- * The demo lets you explore font rendering options
- * interactively to get a feeling for they affect the
- * shape and positioning of the glyphs.
+ * Demonstrates various aspects of font rendering.
 */

 #include <gtk/gtk.h>
@@ -15,21 +10,16 @@ static GtkWidget *font_button = NULL;
 static GtkWidget *entry = NULL;
 static GtkWidget *image = NULL;
 static GtkWidget *hinting = NULL;
-static GtkWidget *anti_alias = NULL;
 static GtkWidget *hint_metrics = NULL;
 static GtkWidget *up_button = NULL;
 static GtkWidget *down_button = NULL;
 static GtkWidget *text_radio = NULL;
 static GtkWidget *show_grid = NULL;
 static GtkWidget *show_extents = NULL;
-static GtkWidget *show_pixels = NULL;
-static GtkWidget *show_outlines = NULL;

 static PangoContext *context;

-static int scale = 7;
-static double pixel_alpha = 1.0;
-static double outline_alpha = 0.0;
+static int scale = 9;

 static void
 update_image (void)
@@ -37,7 +27,7 @@ update_image (void)
  const char *text;
  PangoFontDescription *desc;
  PangoLayout *layout;
-  PangoRectangle ink, logical;
+  PangoRectangle ink, pink, logical;
  int baseline;
  cairo_surface_t *surface;
  cairo_t *cr;
@@ -47,8 +37,6 @@ update_image (void)
  cairo_font_options_t *fopt;
  cairo_hint_style_t hintstyle;
  cairo_hint_metrics_t hintmetrics;
-  cairo_antialias_t antialias;
-  cairo_path_t *path;

  if (!context)
    context = gtk_widget_create_pango_context (image);
@@ -59,18 +47,16 @@ update_image (void)
  fopt = cairo_font_options_copy (pango_cairo_context_get_font_options (context));

  hint = gtk_combo_box_get_active_id (GTK_COMBO_BOX (hinting));
-  hintstyle = CAIRO_HINT_STYLE_DEFAULT;
-  if (hint)
-    {
-      if (strcmp (hint, "none") == 0)
-        hintstyle = CAIRO_HINT_STYLE_NONE;
-      else if (strcmp (hint, "slight") == 0)
-        hintstyle = CAIRO_HINT_STYLE_SLIGHT;
-      else if (strcmp (hint, "medium") == 0)
-        hintstyle = CAIRO_HINT_STYLE_MEDIUM;
-      else if (strcmp (hint, "full") == 0)
-        hintstyle = CAIRO_HINT_STYLE_FULL;
-    }
+  if (strcmp (hint, "none") == 0)
+    hintstyle = CAIRO_HINT_STYLE_NONE;
+  else if (strcmp (hint, "slight") == 0)
+    hintstyle = CAIRO_HINT_STYLE_SLIGHT;
+  else if (strcmp (hint, "medium") == 0)
+    hintstyle = CAIRO_HINT_STYLE_MEDIUM;
+  else if (strcmp (hint, "full") == 0)
+    hintstyle = CAIRO_HINT_STYLE_FULL;
+  else
+    hintstyle = CAIRO_HINT_STYLE_DEFAULT;
  cairo_font_options_set_hint_style (fopt, hintstyle);

  if (gtk_check_button_get_active (GTK_CHECK_BUTTON (hint_metrics)))
@@ -79,13 +65,6 @@ update_image (void)
    hintmetrics = CAIRO_HINT_METRICS_OFF;
  cairo_font_options_set_hint_metrics (fopt, hintmetrics);

-  if (gtk_check_button_get_active (GTK_CHECK_BUTTON (anti_alias)))
-    antialias = CAIRO_ANTIALIAS_GRAY;
-  else
-    antialias = CAIRO_ANTIALIAS_NONE;
-  cairo_font_options_set_antialias (fopt, antialias);
-
-  pango_context_set_round_glyph_positions (context, hintmetrics == CAIRO_HINT_METRICS_ON);
  pango_cairo_context_set_font_options (context, fopt);
  cairo_font_options_destroy (fopt);
  pango_context_changed (context);
@@ -96,6 +75,7 @@ update_image (void)
      pango_layout_set_font_description (layout, desc);
      pango_layout_set_text (layout, text, -1);
      pango_layout_get_extents (layout, &ink, &logical);
+      pink = ink;
      baseline = pango_layout_get_baseline (layout);

      pango_extents_to_pixels (&ink, NULL);
@@ -105,14 +85,10 @@ update_image (void)
      cairo_set_source_rgb (cr, 1, 1, 1);
      cairo_paint (cr);

-      cairo_set_source_rgba (cr, 0, 0, 0, pixel_alpha);
-
+      cairo_set_source_rgb (cr, 0, 0, 0);
      cairo_move_to (cr, 10, 10);
      pango_cairo_show_layout (cr, layout);

-      pango_cairo_layout_path (cr, layout);
-      path = cairo_copy_path (cr);
-
      cairo_destroy (cr);
      g_object_unref (layout);

@@ -151,7 +127,7 @@ update_image (void)

      if (gtk_check_button_get_active (GTK_CHECK_BUTTON (show_extents)))
        {
-          cairo_set_source_rgb (cr, 0, 0, 1);
+          cairo_set_source_rgba (cr, 0, 0, 1, 1);

          cairo_rectangle (cr,
                           scale * (10 + pango_units_to_double (logical.x)) - 0.5,
@@ -164,45 +140,17 @@ update_image (void)
          cairo_line_to (cr, scale * (10 + pango_units_to_double (logical.x + logical.width)) + 1,
                             scale * (10 + pango_units_to_double (baseline)) - 0.5);
          cairo_stroke (cr);
-          cairo_set_source_rgb (cr, 1, 0, 0);
+          cairo_set_source_rgba (cr, 1, 0, 0, 1);
          cairo_rectangle (cr,
-                           scale * (10 + ink.x) - 0.5,
-                           scale * (10 + ink.y) - 0.5,
-                           scale * ink.width + 1,
-                           scale * ink.height + 1);
+                           scale * (10 + pango_units_to_double (pink.x)) + 0.5,
+                           scale * (10 + pango_units_to_double (pink.y)) + 0.5,
+                           scale * pango_units_to_double (pink.width) - 1,
+                           scale * pango_units_to_double (pink.height) - 1);
          cairo_stroke (cr);
        }

-      for (int i = 0; i < path->num_data; i += path->data[i].header.length)
-        {
-          cairo_path_data_t *data = &path->data[i];
-          switch (data->header.type)
-            {
-            case CAIRO_PATH_CURVE_TO:
-              data[3].point.x *= scale; data[3].point.y *= scale;
-              data[2].point.x *= scale; data[2].point.y *= scale;
-              data[1].point.x *= scale; data[1].point.y *= scale;
-              break;
-            case CAIRO_PATH_LINE_TO:
-            case CAIRO_PATH_MOVE_TO:
-              data[1].point.x *= scale; data[1].point.y *= scale;
-              break;
-            case CAIRO_PATH_CLOSE_PATH:
-              break;
-            default:
-              g_assert_not_reached ();
-            }
-        }
-
-      cairo_set_source_rgba (cr, 0, 0, 0, outline_alpha);
-      cairo_move_to (cr, scale * 20 - 0.5, scale * 20 - 0.5);
-      cairo_append_path (cr, path);
-      cairo_stroke (cr);
-
      cairo_surface_destroy (surface);
      cairo_destroy (cr);
-
-      cairo_path_destroy (path);
    }
  else
    {
@@ -210,26 +158,10 @@ update_image (void)
      PangoLayoutRun *run;
      PangoGlyphInfo *g;
      int i, j;
-      GString *str;
-      gunichar ch;
-
-      if (*text == '\0')
-        text = " ";
-
-      ch = g_utf8_get_char (text);
-
-      str = g_string_new ("");
-
-      for (i = 0; i < 4; i++)
-        {
-          g_string_append_unichar (str, ch);
-          g_string_append_unichar (str, 0x200c);
-        }

      layout = pango_layout_new (context);
      pango_layout_set_font_description (layout, desc);
-      pango_layout_set_text (layout, str->str, -1);
-      g_string_free (str, TRUE);
+      pango_layout_set_text (layout, "aaaa", -1);
      pango_layout_get_extents (layout, &ink, &logical);
      pango_extents_to_pixels (&logical, NULL);

@@ -244,7 +176,7 @@ update_image (void)
      cairo_set_source_rgb (cr, 0, 0, 0);
      for (i = 0; i < 4; i++)
        {
-          g = &(run->glyphs->glyphs[2*i]);
+          g = &(run->glyphs->glyphs[i]);
          g->geometry.width = PANGO_UNITS_ROUND (g->geometry.width * 3 / 2);
        }

@@ -252,7 +184,7 @@ update_image (void)
        {
          for (i = 0; i < 4; i++)
            {
-              g = &(run->glyphs->glyphs[2*i]);
+              g = &(run->glyphs->glyphs[i]);
              g->geometry.x_offset = i * (PANGO_SCALE / 4);
              g->geometry.y_offset = j * (PANGO_SCALE / 4);
            }
@@ -271,6 +203,7 @@ update_image (void)
      cairo_surface_destroy (surface);
    }

+
  gtk_picture_set_pixbuf (GTK_PICTURE (image), pixbuf2);

  g_object_unref (pixbuf2);
@@ -278,78 +211,6 @@ update_image (void)
  pango_font_description_free (desc);
 }

-static gboolean fading = FALSE;
-static double start_pixel_alpha;
-static double end_pixel_alpha;
-static double start_outline_alpha;
-static double end_outline_alpha;
-static gint64 start_time;
-static gint64 end_time;
-
-static double
-ease_out_cubic (double t)
-{
-  double p = t - 1;
-  return p * p * p + 1;
-}
-
-static gboolean
-change_alpha (GtkWidget     *widget,
-              GdkFrameClock *clock,
-              gpointer       user_data)
-{
-  gint64 now = g_get_monotonic_time ();
-  double t;
-
-  t = ease_out_cubic ((now - start_time) / (double) (end_time - start_time));
-
-  pixel_alpha = start_pixel_alpha + (end_pixel_alpha - start_pixel_alpha) * t;
-  outline_alpha = start_outline_alpha + (end_outline_alpha - start_outline_alpha) * t;
-
-  update_image ();
-
-  if (now >= end_time)
-    {
-      fading = FALSE;
-      return G_SOURCE_REMOVE;
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-start_alpha_fade (void)
-{
-  gboolean pixels;
-  gboolean outlines;
-
-  if (fading)
-    return;
-
-  pixels = gtk_check_button_get_active (GTK_CHECK_BUTTON (show_pixels));
-  outlines = gtk_check_button_get_active (GTK_CHECK_BUTTON (show_outlines));
-
-  start_pixel_alpha = pixel_alpha;
-  if (pixels && outlines)
-    end_pixel_alpha = 0.5;
-  else if (pixels)
-    end_pixel_alpha = 1;
-  else
-    end_pixel_alpha = 0;
-
-  start_outline_alpha = outline_alpha;
-  if (outlines)
-    end_outline_alpha = 1.0;
-  else
-    end_outline_alpha = 0.0;
-
-  start_time = g_get_monotonic_time ();
-  end_time = start_time + G_TIME_SPAN_SECOND / 2;
-
-  fading = TRUE;
-  gtk_widget_add_tick_callback (window, change_alpha, NULL, NULL);
-}
-
 static void
 update_buttons (void)
 {
@@ -357,26 +218,20 @@ update_buttons (void)
  gtk_widget_set_sensitive (down_button, scale > 1);
 }

-static gboolean
-scale_up (GtkWidget *widget,
-          GVariant  *args,
-          gpointer   user_data)
+static void
+scale_up (void)
 {
  scale += 1;
  update_buttons ();
  update_image ();
-  return TRUE;
 }

-static gboolean
-scale_down (GtkWidget *widget,
-            GVariant  *args,
-            gpointer   user_data)
+static void
+scale_down (void)
 {
  scale -= 1;
  update_buttons ();
  update_image ();
-  return TRUE;
 }

 GtkWidget *
@@ -397,26 +252,20 @@ do_fontrendering (GtkWidget *do_widget)
      entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
      image = GTK_WIDGET (gtk_builder_get_object (builder, "image"));
      hinting = GTK_WIDGET (gtk_builder_get_object (builder, "hinting"));
-      anti_alias = GTK_WIDGET (gtk_builder_get_object (builder, "antialias"));
      hint_metrics = GTK_WIDGET (gtk_builder_get_object (builder, "hint_metrics"));
      text_radio = GTK_WIDGET (gtk_builder_get_object (builder, "text_radio"));
      show_grid = GTK_WIDGET (gtk_builder_get_object (builder, "show_grid"));
      show_extents = GTK_WIDGET (gtk_builder_get_object (builder, "show_extents"));
-      show_pixels = GTK_WIDGET (gtk_builder_get_object (builder, "show_pixels"));
-      show_outlines = GTK_WIDGET (gtk_builder_get_object (builder, "show_outlines"));

      g_signal_connect (up_button, "clicked", G_CALLBACK (scale_up), NULL);
      g_signal_connect (down_button, "clicked", G_CALLBACK (scale_down), NULL);
      g_signal_connect (entry, "notify::text", G_CALLBACK (update_image), NULL);
      g_signal_connect (font_button, "notify::font-desc", G_CALLBACK (update_image), NULL);
      g_signal_connect (hinting, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (anti_alias, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (hint_metrics, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (text_radio, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (show_grid, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (show_extents, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (show_pixels, "notify::active", G_CALLBACK (start_alpha_fade), NULL);
-      g_signal_connect (show_outlines, "notify::active", G_CALLBACK (start_alpha_fade), NULL);

      update_image ();

--- a/demos/gtk-demo/fontrendering.ui
+++ b/demos/gtk-demo/fontrendering.ui
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <object class="GtkAdjustment" id="scale_adj">
+    <property name="upper">24</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">4</property>
+  </object>
  <object class="GtkWindow" id="window">
-    <property name="default-width">1024</property>
-    <property name="default-height">768</property>
+    <property name="default-width">1080</property>
+    <property name="default-height">430</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
        <child type="title">
@@ -82,119 +87,69 @@
              </object>
            </child>
            <child>
-              <object class="GtkCheckButton" id="show_pixels">
-                <property name="label">Show _Pixels</property>
-                <property name="use-underline">1</property>
-                <property name="active">1</property>
+              <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>
-                  <property name="row">0</property>
                </layout>
              </object>
            </child>
            <child>
-              <object class="GtkCheckButton" id="show_outlines">
-                <property name="label">Show _Outline</property>
-                <property name="use-underline">1</property>
-                <layout>
-                  <property name="column">3</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">_Hinting</property>
-                    <property name="use-underline">1</property>
-                    <property name="mnemonic-widget">hinting</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </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>
-                  </object>
-                </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>
-                  <property name="column-span">2</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="antialias">
-                <property name="label">_Antialias</property>
-                <property name="use-underline">1</property>
-                <property name="active">1</property>
-                <layout>
-                  <property name="column">4</property>
-                  <property name="row">1</property>
                </layout>
              </object>
            </child>
            <child>
              <object class="GtkCheckButton" id="hint_metrics">
-                <property name="label">Hint _Metrics</property>
-                <property name="use-underline">1</property>
+                <property name="label">Hint Metrics</property>
+                <layout>
+                  <property name="column">4</property>
+                  <property name="row">1</property>
+                </layout>
+              </object>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="show_extents">
+                <property name="label">Show Extents</property>
+                <property name="active">1</property>
+                <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>
+                <property name="label">Show Grid</property>
                <layout>
                  <property name="column">5</property>
                  <property name="row">1</property>
                </layout>
              </object>
            </child>
-            <child>
-              <object class="GtkCheckButton" id="show_extents">
-                <property name="label">Show _Extents</property>
-                <property name="use-underline">1</property>
-                <layout>
-                  <property name="column">6</property>
-                  <property name="row">0</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="show_grid">
-                <property name="label">Show _Grid</property>
-                <property name="use-underline">1</property>
-                <layout>
-                  <property name="column">6</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
            <child>
              <object class="GtkButton" id="up_button">
                <property name="icon-name">list-add-symbolic</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
                <style>
                  <class name="circular"/>
                </style>
-                <child>
-                  <object class="GtkShortcutController">
-                    <property name="scope">managed</property>
-                    <child>
-                      <object class="GtkShortcut">
-                        <property name="trigger">&lt;Control&gt;plus</property>
-                        <property name="action">activate</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                <layout>
-                  <property name="column">7</property>
+                  <property name="column">6</property>
                  <property name="row">0</property>
                </layout>
              </object>
@@ -202,24 +157,11 @@
            <child>
              <object class="GtkButton" id="down_button">
                <property name="icon-name">list-remove-symbolic</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
                <style>
                  <class name="circular"/>
                </style>
-                <child>
-                  <object class="GtkShortcutController">
-                    <property name="scope">managed</property>
-                    <child>
-                      <object class="GtkShortcut">
-                        <property name="trigger">&lt;Control&gt;minus</property>
-                        <property name="action">activate</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                <layout>
-                  <property name="column">7</property>
+                  <property name="column">6</property>
                  <property name="row">1</property>
                </layout>
              </object>
@@ -228,7 +170,7 @@
              <object class="GtkLabel">
                <property name="hexpand">1</property>
                <layout>
-                  <property name="column">8</property>
+                  <property name="column">7</property>
                </layout>
              </object>
            </child>
--- a/demos/gtk-demo/gskshaderpaintable.c
+++ b/demos/gtk-demo/gskshaderpaintable.c
@@ -23,10 +23,13 @@
 #include "gskshaderpaintable.h"

 /**
- * GskShaderPaintable:
+ * SECTION:gskshaderpaintable
+ * @Short_description: Drawing with shaders
+ * @Title: GskShaderPaintable
+ * @see_also: #GdkPaintable
 *
- * `GskShaderPaintable` is an implementation of the `GdkPaintable` interface
- * that uses a `GskGLShader` to create pixels.
+ * GskShaderPaintable is an implementation of the #GdkPaintable interface
+ * that uses a #GskGLShader to create pixels.
 *
 * You can set the uniform data that the shader needs for rendering
 * using gsk_shader_paintable_set_args(). This function can
@@ -35,7 +38,7 @@
 *
 * Commonly, time is passed to shaders as a float uniform containing
 * the elapsed time in seconds. The convenience API
- * gsk_shader_paintable_update_time() can be called from a `GtkTickCallback`
+ * gsk_shader_paintable_update_time() can be called from a #GtkTickCallback
 * to update the time based on the frame time of the frame clock.
 */

@@ -183,7 +186,7 @@ gsk_shader_paintable_init (GskShaderPaintable *self)
 * pixels. The shader must not require input textures.
 * If @data is %NULL, all uniform values are set to zero.
 *
- * Returns: (transfer full): a new `GskShaderPaintable`
+ * Returns: (transfer full): a new #GskShaderPaintable
 */
 GdkPaintable *
 gsk_shader_paintable_new (GskGLShader *shader,
@@ -212,8 +215,8 @@ gsk_shader_paintable_new (GskGLShader *shader,

 /**
 * gsk_shader_paintable_set_shader:
- * @self: a `GskShaderPaintable`
- * @shader: the `GskGLShader` to use
+ * @self: a #GskShaderPaintable
+ * @shader: the #GskGLShader to use
 *
 * Sets the shader that the paintable will use
 * to create pixels. The shader must not require
@@ -238,11 +241,11 @@ gsk_shader_paintable_set_shader (GskShaderPaintable *self,

 /**
 * gsk_shader_paintable_get_shader:
- * @self: a `GskShaderPaintable`
+ * @self: a #GskShaderPaintable
 *
 * Returns the shader that the paintable is using.
 *
- * Returns: (transfer none): the `GskGLShader` that is used
+ * Returns: (transfer none): the #GskGLShader that is used
 */
 GskGLShader *
 gsk_shader_paintable_get_shader (GskShaderPaintable *self)
@@ -254,12 +257,12 @@ gsk_shader_paintable_get_shader (GskShaderPaintable *self)

 /**
 * gsk_shader_paintable_set_args:
- * @self: a `GskShaderPaintable`
+ * @self: a #GskShaderPaintable
 * @data: Data block with uniform data for the shader
 *
 * Sets the uniform data that will be passed to the
 * shader when rendering. The @data will typically
- * be produced by a `GskUniformDataBuilder`.
+ * be produced by a #GskUniformDataBuilder.
 *
 * Note that the @data should be considered immutable
 * after it has been passed to this function.
@@ -281,7 +284,7 @@ gsk_shader_paintable_set_args (GskShaderPaintable *self,

 /**
 * gsk_shader_paintable_get_args:
- * @self: a `GskShaderPaintable`
+ * @self: a #GskShaderPaintable
 *
 * Returns the uniform data set with
 * gsk_shader_paintable_get_args().
@@ -298,9 +301,9 @@ gsk_shader_paintable_get_args (GskShaderPaintable *self)

 /**
 * gsk_shader_paintable_update_time:
- * @self: a `GskShaderPaintable`
+ * @self: a #GskShaderPaintable
 * @time_idx: the index of the uniform for time in seconds as float
- * @frame_time: the current frame time, as returned by `GdkFrameClock`
+ * @frame_time: the current frame time, as returned by #GdkFrameClock
 *
 * This function is a convenience wrapper for
 * gsk_shader_paintable_set_args() that leaves all
@@ -308,7 +311,7 @@ gsk_shader_paintable_get_args (GskShaderPaintable *self)
 * index @time_idx, which will be set to the elapsed time
 * in seconds, since the first call to this function.
 *
- * This function is usually called from a `GtkTickCallback`.
+ * This function is usually called from a #GtkTickCallback.
 */
 void
 gsk_shader_paintable_update_time (GskShaderPaintable *self,
--- a/demos/gtk-demo/gtkfishbowl.c
+++ b/demos/gtk-demo/gtkfishbowl.c
@@ -74,9 +74,9 @@ gtk_fishbowl_init (GtkFishbowl *fishbowl)
 /**
 * gtk_fishbowl_new:
 *
- * Creates a new `GtkFishbowl`.
+ * Creates a new #GtkFishbowl.
 *
- * Returns: a new `GtkFishbowl`.
+ * Returns: a new #GtkFishbowl.
 */
 GtkWidget*
 gtk_fishbowl_new (void)
--- a/demos/gtk-demo/gtkgears.c
+++ b/demos/gtk-demo/gtkgears.c
@@ -874,8 +874,8 @@ gtk_gears_tick (GtkWidget     *widget,
 {
  GtkGears *gears = GTK_GEARS (widget);
  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-  GdkFrameTimings *previous_timings;
-  gint64 previous_frame_time;
+  GdkFrameTimings *timings, *previous_timings;
+  gint64 previous_frame_time = 0;
  gint64 frame_time;
  gint64 history_start, history_len;
  gint64 frame;
@@ -915,6 +915,12 @@ gtk_gears_tick (GtkWidget     *widget,
        }
    }

+  timings = gdk_frame_clock_get_current_timings (frame_clock);
+  previous_timings = gdk_frame_clock_get_timings (frame_clock,
+                                                  gdk_frame_timings_get_frame_counter (timings) - 1);
+  if (previous_timings != NULL)
+    previous_frame_time = gdk_frame_timings_get_frame_time (previous_timings);
+
  return G_SOURCE_CONTINUE;
 }

--- a/demos/gtk-demo/gtkshadertoy.c
+++ b/demos/gtk-demo/gtkshadertoy.c
@@ -163,8 +163,8 @@ drag_update_cb (GtkGestureDrag *drag,

 static void
 drag_end_cb (GtkGestureDrag *drag,
-             double          dx,
-             double          dy,
+             gdouble         dx,
+             gdouble         dy,
             gpointer        user_data)
 {
  GtkShadertoy *shadertoy = GTK_SHADERTOY (user_data);
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -18,6 +18,8 @@ do_headerbar (GtkWidget *do_widget)
  GtkWidget *header;
  GtkWidget *button;
  GtkWidget *box;
+  GtkWidget *image;
+  GIcon *icon;

  if (!window)
    {
@@ -30,14 +32,20 @@ do_headerbar (GtkWidget *do_widget)

      header = gtk_header_bar_new ();

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

      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_widget_add_css_class (box, "linked");
-      button = gtk_button_new_from_icon_name ("go-previous-symbolic");
+      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);
-      button = gtk_button_new_from_icon_name ("go-next-symbolic");
+      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_header_bar_pack_start (GTK_HEADER_BAR (header), box);
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -7,8 +7,7 @@
 * shows.
 *
 * We also demonstrate adding other things to a text view, such as
- * clickable icons and widgets which can also replace a character
- * (try copying the ghost text).
+ * clickable icons.
 */

 #include <gtk/gtk.h>
@@ -62,26 +61,12 @@ show_page (GtkTextView *text_view,
           int          page)
 {
  GtkTextBuffer *buffer;
-  GtkTextIter iter, start;
-  GtkTextMark *mark;
+  GtkTextIter iter;
  GtkWidget *child;
  GtkTextChildAnchor *anchor;
  GtkEventController *controller;
-  GtkTextTag *bold, *mono, *nobreaks;

  buffer = gtk_text_view_get_buffer (text_view);
-
-  bold = gtk_text_buffer_create_tag (buffer, NULL,
-                                     "weight", PANGO_WEIGHT_BOLD,
-                                     "scale", PANGO_SCALE_X_LARGE,
-                                     NULL);
-  mono = gtk_text_buffer_create_tag (buffer, NULL,
-                                     "family", "monospace",
-                                     NULL);
-  nobreaks = gtk_text_buffer_create_tag (buffer, NULL,
-                                         "allow-breaks", FALSE,
-                                         NULL);
-
  gtk_text_buffer_set_text (buffer, "", 0);
  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
  gtk_text_buffer_begin_irreversible_action (buffer);
@@ -95,12 +80,13 @@ show_page (GtkTextView *text_view,
      gtk_text_buffer_insert (buffer, &iter, " can easily be realized with ", -1);
      insert_link (buffer, &iter, "tags", 2);
      gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
-      gtk_text_buffer_insert (buffer, &iter, "Of course you can also embed Emoji 😋, ", -1);
-      gtk_text_buffer_insert (buffer, &iter, "icons ", -1);
+      gtk_text_buffer_insert (buffer, &iter,
+          "Of course you can also embed Emoji 😋, "
+          "icons ", -1);

      theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (text_view)));
      icon = gtk_icon_theme_lookup_icon (theme,
-                                         "view-conceal-symbolic",
+                                         "microphone-sensitivity-high-symbolic",
                                         NULL,
                                         16,
                                         1,
@@ -114,31 +100,21 @@ show_page (GtkTextView *text_view,
      gtk_level_bar_set_value (GTK_LEVEL_BAR (child), 50);
      gtk_widget_set_size_request (child, 100, -1);
      gtk_text_view_add_child_at_anchor (text_view, child, anchor);
-      gtk_text_buffer_insert (buffer, &iter, " and labels with ", -1);
-      anchor = gtk_text_child_anchor_new_with_replacement ("👻");
-      gtk_text_buffer_insert_child_anchor (buffer, &iter, anchor);
-      child = gtk_label_new ("ghost");
-      gtk_text_view_add_child_at_anchor (text_view, child, anchor);
-      gtk_text_buffer_insert (buffer, &iter, " text.", -1);
+      gtk_text_buffer_insert (buffer, &iter, ".", -1);
    }
  else if (page == 2)
    {
-      mark = gtk_text_buffer_create_mark (buffer, "mark", &iter, TRUE);
+      GtkTextTag *tag;

-      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, bold, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
-
-      gtk_text_buffer_move_mark (buffer, mark, &iter);
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, mono, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "weight", PANGO_WEIGHT_BOLD,
+                                        "scale", PANGO_SCALE_X_LARGE,
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, tag, NULL);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "family", "monospace",
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, " / tag / ", -1, tag, NULL);

      anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
      child = gtk_image_new_from_icon_name ("audio-volume-high-symbolic");
@@ -156,26 +132,20 @@ show_page (GtkTextView *text_view,
          "behavior of mouse and key presses, “lock” a range of text so the "
          "user can't edit it, or countless other things.\n", -1);
      insert_link (buffer, &iter, "Go back", 1);
-
-      gtk_text_buffer_delete_mark (buffer, mark);
    }
  else if (page == 3)
    {
-      mark = gtk_text_buffer_create_mark (buffer, "mark", &iter, TRUE);
+      GtkTextTag *tag;

-      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext", -1, bold, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
-
-      gtk_text_buffer_move_mark (buffer, mark, &iter);
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "ˈhaɪ pərˌtɛkst", -1, mono, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "weight", PANGO_WEIGHT_BOLD,
+                                        "scale", PANGO_SCALE_X_LARGE,
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext", -1, tag, NULL);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "family", "monospace",
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, " / ˈhaɪ pərˌtɛkst / ", -1, tag, NULL);

      anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
      child = gtk_image_new_from_icon_name ("audio-volume-high-symbolic");
@@ -189,8 +159,6 @@ show_page (GtkTextView *text_view,
          "Machine-readable text that is not sequential but is organized "
          "so that related items of information are connected.\n", -1);
      insert_link (buffer, &iter, "Go back", 1);
-
-      gtk_text_buffer_delete_mark (buffer, mark);
    }
  gtk_text_buffer_end_irreversible_action (buffer);
 }
@@ -390,7 +358,7 @@ do_hypertext (GtkWidget *do_widget)

      sw = gtk_scrolled_window_new ();
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
      gtk_window_set_child (GTK_WINDOW (window), sw);
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
--- a/demos/gtk-demo/iconscroll.c
+++ b/demos/gtk-demo/iconscroll.c
@@ -116,25 +116,20 @@ populate_emoji_text (void)
  GtkWidget *textview;
  GtkTextBuffer *buffer;
  GString *s;
-  GtkTextIter iter;

-  s = g_string_sized_new (500 * 30 * 4);
+  s = g_string_sized_new (1000 * 30 * 4);

-  for (int i = 0; i < 500; i++)
+  for (int i = 0; i < 1000; i++)
    {
      if (i % 2)
-        g_string_append (s, "<span underline=\"single\" underline_color=\"red\">x</span>");
+        g_string_append (s, "x");
      for (int j = 0; j < 30; j++)
-        {
-          g_string_append (s, "💓");
-          g_string_append (s, "<span underline=\"single\" underline_color=\"red\">x</span>");
-        }
+        g_string_append (s, "💓x");
      g_string_append (s, "\n");
    }

  buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_get_start_iter (buffer, &iter);
-  gtk_text_buffer_insert_markup (buffer, &iter, s->str, s->len);
+  gtk_text_buffer_set_text (buffer, s->str, s->len);

  g_string_free (s, TRUE);

--- a/demos/gtk-demo/iconscroll.ui
+++ b/demos/gtk-demo/iconscroll.ui
@@ -13,13 +13,13 @@
            </style>
            <child>
              <object class="GtkButton">
-                <property name="icon-name">go-previous-symbolic</property>
+                <property name="icon-name">pan-start-symbolic</property>
                <signal name="clicked" handler="iconscroll_prev_clicked_cb"/>
              </object>
            </child>
            <child>
              <object class="GtkButton">
-                <property name="icon-name">go-next-symbolic</property>
+                <property name="icon-name">pan-end-symbolic</property>
                <signal name="clicked" handler="iconscroll_next_clicked_cb"/>
              </object>
            </child>
--- a/demos/gtk-demo/language-names.c
+++ b/demos/gtk-demo/language-names.c
@@ -18,81 +18,15 @@

 #include "language-names.h"

-#ifdef G_OS_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#else
-
 #ifndef ISO_CODES_PREFIX
 #define ISO_CODES_PREFIX "/usr"
 #endif

 #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
 #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
-#endif

 static GHashTable *language_map;

-#ifdef G_OS_WIN32
-/* if we are using native Windows use native Windows API for language names */
-static BOOL CALLBACK
-get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
-{
-  wchar_t *langname_w = NULL;
-  wchar_t locale_abbrev_w[9];
-  gchar *langname, *locale_abbrev, *locale, *p;
-  gint i;
-  const LCTYPE iso639_lctypes[] = { LOCALE_SISO639LANGNAME, LOCALE_SISO639LANGNAME2 };
-  GHashTable *ht_scripts_langs = (GHashTable *) param;
-  PangoLanguage *lang;
-
-  gint langname_size, locale_abbrev_size;
-  langname_size = GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, 0);
-  if (langname_size == 0)
-    return FALSE;
-
-  langname_w = g_new0 (wchar_t, langname_size);
-
-  if (langname_size == 0)
-    return FALSE;
-
-  GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, langname_size);
-  langname = g_utf16_to_utf8 (langname_w, -1, NULL, NULL, NULL);
-  locale = g_utf16_to_utf8 (locale_w, -1, NULL, NULL, NULL);
-  p = strchr (locale, '-');
-  lang = pango_language_from_string (locale);
-  if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
-    g_hash_table_insert (ht_scripts_langs, lang, langname);
-
-  /*
-   * Track 3+-letter ISO639-2/3 language codes as well (these have a max length of 9 including terminating NUL)
-   * ISO639-2: iso639_lctypes[0] = LOCALE_SISO639LANGNAME
-   * ISO639-3: iso639_lctypes[1] = LOCALE_SISO639LANGNAME2
-   */
-  for (i = 0; i < 2; i++)
-    {
-      locale_abbrev_size = GetLocaleInfoEx (locale_w, iso639_lctypes[i], locale_abbrev_w, 0);
-      if (locale_abbrev_size > 0)
-        {
-          GetLocaleInfoEx (locale_w, iso639_lctypes[i], locale_abbrev_w, locale_abbrev_size);
-
-          locale_abbrev = g_utf16_to_utf8 (locale_abbrev_w, -1, NULL, NULL, NULL);
-          lang = pango_language_from_string (locale_abbrev);
-          if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
-            g_hash_table_insert (ht_scripts_langs, lang, langname);
-
-          g_free (locale_abbrev);
-        }
-    }
-
-  g_free (locale);
-  g_free (langname_w);
-
-  return TRUE;
-}
-
-#else /* non-Windows */
-
 static char *
 get_first_item_in_semicolon_list (const char *list)
 {
@@ -276,7 +210,6 @@ languages_variant_init (const char *variant)
  g_free (filename);
  g_free (buf);
 }
-#endif

 static void
 languages_init (void)
@@ -285,13 +218,8 @@ languages_init (void)
    return;

  language_map = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-
-#ifdef G_OS_WIN32
-  g_return_if_fail (EnumSystemLocalesEx (&get_win32_all_locales_scripts, LOCALE_ALL, (LPARAM) language_map, NULL));
-#else
  languages_variant_init ("iso_639");
  languages_variant_init ("iso_639_3");
-#endif
 }

 const char *
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>

-static GdkTexture *avatar_texture_other;
+static GdkPixbuf *avatar_pixbuf_other;
 static GtkWidget *window = NULL;

 #define GTK_TYPE_MESSAGE		  (gtk_message_get_type ())
@@ -196,9 +196,12 @@ gtk_message_row_update (GtkMessageRow *row)
    gtk_button_set_label (GTK_BUTTON (priv->resent_by_button), priv->message->resent_by);

  if (strcmp (priv->message->sender_nick, "@GTKtoolkit") == 0)
-    gtk_image_set_from_icon_name (priv->avatar_image, "org.gtk.Demo4");
+    {
+      gtk_image_set_from_icon_name (priv->avatar_image, "org.gtk.Demo4");
+      gtk_image_set_icon_size (priv->avatar_image, GTK_ICON_SIZE_LARGE);
+    }
  else
-    gtk_image_set_from_paintable (priv->avatar_image, GDK_PAINTABLE (avatar_texture_other));
+    gtk_image_set_from_pixbuf (priv->avatar_image, avatar_pixbuf_other);

 }

@@ -341,7 +344,7 @@ do_listbox (GtkWidget *do_widget)

  if (!window)
    {
-      avatar_texture_other = gdk_texture_new_from_resource ("/listbox/apple-red.png");
+      avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE, NULL);

      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -25,7 +25,6 @@
            <property name="margin-start">8</property>
            <property name="margin-end">8</property>
            <property name="icon-name">image-missing</property>
-            <property name="icon-size">large</property>
            <layout>
              <property name="column">0</property>
              <property name="row">0</property>
--- a/demos/gtk-demo/listview_applauncher.c
+++ b/demos/gtk-demo/listview_applauncher.c
@@ -8,8 +8,8 @@

 #include <gtk/gtk.h>

-/* This is the function that creates the GListModel that we need.
- * GTK list widgets need a GListModel to display, as models support change
+/* This is the function that creates the #GListModel that we need.
+ * GTK list widgets need a #GListModel to display, as models support change
 * notifications.
 * Unfortunately various older APIs do not provide list models, so we create
 * our own.
@@ -20,10 +20,10 @@ create_application_list (void)
  GListStore *store;
  GList *apps, *l;

-  /* We use a GListStore here, which is a simple array-like list implementation
+  /* We use a #GListStore here, which is a simple array-like list implementation
   * for manual management.
   * List models need to know what type of data they provide, so we need to
-   * provide the type here. As we want to do a list of applications, GAppInfo
+   * provide the type here. As we want to do a list of applications, #GAppInfo
   * is the object we provide.
   */
  store = g_list_store_new (G_TYPE_APP_INFO);
@@ -39,7 +39,7 @@ create_application_list (void)
 }

 /* This is the function we use for setting up new listitems to display.
- * We add just an GtkImage and a GtkLabel here to display the application's
+ * We add just an #GtkImage and a #GtkLabel here to display the application's
 * icon and name, as this is just a simple demo.
 */
 static void
@@ -61,8 +61,8 @@ setup_listitem_cb (GtkListItemFactory *factory,

 /* Here we need to prepare the listitem for displaying its item. We get the
 * listitem already set up from the previous function, so we can reuse the
- * GtkImage widget we set up above.
- * We get the item - which we know is a GAppInfo because it comes out of
+ * #GtkImage widget we set up above.
+ * We get the item - which we know is a #GAppInfo because it comes out of
 * the model we set up above, grab its icon and display it.
 */
 static void
@@ -85,7 +85,7 @@ bind_listitem_cb (GtkListItemFactory *factory,
 * the listitem, but this is simple code, so the default implementations are
 * enough. If we had connected signals, this step would have been necessary.
 *
- * The GtkSignalListItemFactory documentation contains more information about
+ * The #GtkSignalListItemFactory documentation contains more information about
 * this step.
 */

@@ -108,8 +108,8 @@ activate_cb (GtkListView  *list,
  app_info = g_list_model_get_item (G_LIST_MODEL (gtk_list_view_get_model (list)), position);

  /* Prepare the context for launching the application and launch it. This
-   * code is explained in detail in the documentation for GdkAppLaunchContext
-   * and GAppInfo.
+   * code is explained in detail in the documentation for #GdkAppLaunchContext
+   * and #GAppInfo.
   */
  context = gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (list)));
  if (!g_app_info_launch (app_info,
@@ -155,13 +155,13 @@ do_listview_applauncher (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Application Launcher");
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);

-      /* The GtkListitemFactory is what is used to create GtkListItems
+      /* The #GtkListitemFactory is what is used to create #GtkListItems
       * to display the data from the model. So it is absolutely necessary
       * to create one.
-       * We will use a GtkSignalListItemFactory because it is the simplest
+       * We will use a #GtkSignalListItemFactory because it is the simplest
       * one to use. Different ones are available for different use cases.
-       * The most powerful one is GtkBuilderListItemFactory which uses
-       * GtkBuilder .ui files, so it requires little code.
+       * The most powerful one is #GtkBuilderListItemFactory which uses
+       * #GtkBuilder .ui files, so it requires little code.
       */
      factory = gtk_signal_list_item_factory_new ();
      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
@@ -184,7 +184,7 @@ do_listview_applauncher (GtkWidget *do_widget)
       */
      g_signal_connect (list, "activate", G_CALLBACK (activate_cb), NULL);

-      /* List widgets should always be contained in a GtkScrolledWindow,
+      /* List widgets should always be contained in a #GtkScrolledWindow,
       * because otherwise they might get too large or they might not
       * be scrollable.
       */
--- a/demos/gtk-demo/listview_filebrowser.c
+++ b/demos/gtk-demo/listview_filebrowser.c
@@ -34,7 +34,6 @@ enum {
 };

 #define FILE_BROWSER_TYPE_VIEW (file_browser_view_get_type ())
-G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE (FileBrowserView, file_browser_view, FILE_BROWSER, VIEW, GObject);

 G_DEFINE_TYPE (FileBrowserView, file_browser_view, G_TYPE_OBJECT);
@@ -160,7 +159,7 @@ static void file_browser_view_init (FileBrowserView *self)
 {
 }

-G_MODULE_EXPORT char *
+char *
 filebrowser_get_display_name (GObject *object,
                              GFileInfo *info)
 {
@@ -170,7 +169,7 @@ filebrowser_get_display_name (GObject *object,
  return g_strdup (g_file_info_get_attribute_string (info, "standard::display-name"));
 }

-G_MODULE_EXPORT char *
+char *
 filebrowser_get_content_type (GObject *object,
                              GFileInfo *info)
 {
@@ -180,7 +179,7 @@ filebrowser_get_content_type (GObject *object,
  return g_strdup (g_file_info_get_attribute_string (info, "standard::content-type"));
 }

-G_MODULE_EXPORT char *
+char *
 filebrowser_get_size (GObject *object,
                      GFileInfo *info)
 {
@@ -190,7 +189,7 @@ filebrowser_get_size (GObject *object,
  return g_format_size (g_file_info_get_attribute_uint64 (info, "standard::size"));
 }

-G_MODULE_EXPORT GIcon *
+GIcon *
 filebrowser_get_icon (GObject *object,
                      GFileInfo *info)
 {
@@ -207,7 +206,7 @@ filebrowser_get_icon (GObject *object,
  return icon;
 }

-G_MODULE_EXPORT void
+void
 filebrowser_up_clicked_cb (GtkButton        *button,
                           GtkDirectoryList *list)
 {
@@ -220,7 +219,7 @@ filebrowser_up_clicked_cb (GtkButton        *button,
  gtk_directory_list_set_file (list, file);
 }

-G_MODULE_EXPORT void
+void
 filebrowser_view_activated_cb (GtkGridView      *view,
                               guint             pos,
                               GtkDirectoryList *list)
--- a/demos/gtk-demo/listview_ucd.c
+++ b/demos/gtk-demo/listview_ucd.c
@@ -9,7 +9,6 @@
 #include <gtk/gtk.h>
 #include "script-names.h"
 #include "unicode-names.h"
-#include "simplelabel.h"


 #define UCD_TYPE_ITEM (ucd_item_get_type ())
@@ -103,9 +102,7 @@ setup_centered_label (GtkSignalListItemFactory *factory,
                      GObject                  *listitem)
 {
  GtkWidget *label;
-  label = simple_label_new ();
-  simple_label_set_min_chars (SIMPLE_LABEL (label), 3);
-  simple_label_set_nat_chars (SIMPLE_LABEL (label), 20);
+  label = gtk_label_new ("");
  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
 }

@@ -114,9 +111,8 @@ setup_label (GtkSignalListItemFactory *factory,
             GObject                  *listitem)
 {
  GtkWidget *label;
-  label = simple_label_new ();
-  simple_label_set_min_chars (SIMPLE_LABEL (label), 3);
-  simple_label_set_nat_chars (SIMPLE_LABEL (label), 20);
+  label = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (label), 0);
  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
 }

@@ -125,9 +121,10 @@ setup_ellipsizing_label (GtkSignalListItemFactory *factory,
                         GObject                  *listitem)
 {
  GtkWidget *label;
-  label = simple_label_new ();
-  simple_label_set_min_chars (SIMPLE_LABEL (label), 3);
-  simple_label_set_nat_chars (SIMPLE_LABEL (label), 20);
+  label = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (label), 0);
+  gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+  gtk_label_set_width_chars (GTK_LABEL (label), 20);
  gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
 }

@@ -145,7 +142,7 @@ bind_codepoint (GtkSignalListItemFactory *factory,
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));

  g_snprintf (buffer, 10, "%#06x", codepoint);
-  simple_label_set_text (SIMPLE_LABEL (label), buffer);
+  gtk_label_set_label (GTK_LABEL (label), buffer);
 }

 static void
@@ -164,7 +161,7 @@ bind_char (GtkSignalListItemFactory *factory,
  if (g_unichar_isprint (codepoint))
    g_unichar_to_utf8 (codepoint, buffer);

-  simple_label_set_text (SIMPLE_LABEL (label), buffer);
+  gtk_label_set_label (GTK_LABEL (label), buffer);
 }

 static void
@@ -179,7 +176,7 @@ bind_name (GtkSignalListItemFactory *factory,
  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
  name = ucd_item_get_name (UCD_ITEM (item));

-  simple_label_set_text (SIMPLE_LABEL (label), name);
+  gtk_label_set_label (GTK_LABEL (label), name);
 }

 static void
@@ -194,7 +191,7 @@ bind_type (GtkSignalListItemFactory *factory,
  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));

-  simple_label_set_text (SIMPLE_LABEL (label), get_unicode_type_name (g_unichar_type (codepoint)));
+  gtk_label_set_label (GTK_LABEL (label), get_unicode_type_name (g_unichar_type (codepoint)));
 }

 static void
@@ -209,7 +206,7 @@ bind_break_type (GtkSignalListItemFactory *factory,
  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));

-  simple_label_set_text (SIMPLE_LABEL (label), get_break_type_name (g_unichar_break_type (codepoint)));
+  gtk_label_set_label (GTK_LABEL (label), get_break_type_name (g_unichar_break_type (codepoint)));
 }

 static void
@@ -224,7 +221,7 @@ bind_combining_class (GtkSignalListItemFactory *factory,
  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));

-  simple_label_set_text (SIMPLE_LABEL (label), get_combining_class_name (g_unichar_combining_class (codepoint)));
+  gtk_label_set_label (GTK_LABEL (label), get_combining_class_name (g_unichar_combining_class (codepoint)));
 }

 static void
@@ -241,7 +238,7 @@ bind_script (GtkSignalListItemFactory *factory,
  codepoint = ucd_item_get_codepoint (UCD_ITEM (item));
  script = g_unichar_get_script (codepoint);

-  simple_label_set_text (SIMPLE_LABEL (label), get_script_name (script));
+  gtk_label_set_label (GTK_LABEL (label), get_script_name (script));
 }

 static void
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -192,7 +192,7 @@ activate_about (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (s, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
@@ -512,7 +512,7 @@ load_file (const char *demoname,

  info_buffer = gtk_text_buffer_new (NULL);
  gtk_text_buffer_create_tag (info_buffer, "title",
-                              "size", 18 * 1024,
+                              "font", "Sans 18",
                              "pixels-below-lines", 10,
                              NULL);

@@ -751,6 +751,7 @@ demo_filter_by_name (gpointer item,
                     gpointer user_data)
 {
  GtkTreeListRow *row = item;
+  GtkFilterListModel *model = user_data;
  GListModel *children;
  GtkDemo *demo;
  guint i, n;
@@ -761,7 +762,7 @@ demo_filter_by_name (gpointer item,
    return TRUE;

  g_assert (GTK_IS_TREE_LIST_ROW (row));
-  g_assert (GTK_IS_FILTER_LIST_MODEL (user_data));
+  g_assert (GTK_IS_FILTER_LIST_MODEL (model));

  /* Show a row if itself of any parent matches */
  for (parent = row; parent; parent = gtk_tree_list_row_get_parent (parent))
@@ -1040,7 +1041,7 @@ out:
      g_signal_connect_swapped (G_OBJECT (demo), "destroy", G_CALLBACK (g_application_quit), app);
    }
  else
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_show (GTK_WIDGET (window));

  if (autoquit)
    g_timeout_add_seconds (1, auto_quit, app);
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -25,7 +25,6 @@
          <object class="GtkButton">
            <property name="valign">center</property>
            <property name="action-name">win.run</property>
-            <property name="focus-on-click">0</property>
            <property name="label" translatable="yes">Run</property>
          </object>
        </child>
@@ -33,7 +32,6 @@
          <object class="GtkToggleButton">
            <property name="icon-name">edit-find-symbolic</property>
            <property name="valign">center</property>
-            <property name="focus-on-click">0</property>
            <property name="active" bind-source="searchbar" bind-property="search-mode-enabled" bind-flags="bidirectional|sync-create"/>
            <accessibility>
              <property name="label" translatable="yes">Search</property>
@@ -43,7 +41,6 @@
        <child type="end">
          <object class="GtkMenuButton" id="gear_menu_button">
            <property name="valign">center</property>
-            <property name="focus-on-click">0</property>
            <property name="menu-model">gear_menu</property>
            <property name="icon-name">open-menu-symbolic</property>
            <accessibility>
--- a/demos/gtk-demo/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -58,7 +58,7 @@ do_markup (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 680);
+      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      stack = gtk_stack_new ();
--- a/demos/gtk-demo/markup.txt
+++ b/demos/gtk-demo/markup.txt
@@ -1,9 +1,5 @@

-Text sizes: <span size="xx-small">tiny </span><span size="x-small">very small </span><span size="small">small </span><span size="medium">normal </span><span size="large">large </span><span size="x-large">very large </span><span size="xx-large">huge</span>
-
-Text styles: <span style="normal">Normal</span> <span style="italic">Italic</span> <span style="oblique">Olique</span>
-
-Text weights: <span weight="thin">thin</span> <span weight="light">light</span> <span weight="normal">normal</span> <span weight="bold">bold</span> <span weight="ultraheavy">ultraheavy</span>
+Text sizes: <span size="xx-small">tiny</span> <span size="x-small">very small</span> <span size="small">small</span> <span size="medium">normal</span> <span size="large">large</span> <span size="x-large">very large</span> <span size="xx-large">huge</span>

 Text <span color="gray">c<span color="green">o</span>l<span color="tomato">o</span>rs</span> and <span background="pink">backgrounds</span>

@@ -19,12 +15,6 @@ OpenType font features: <span font_desc="sans regular" font_features="dlig=0">fe

 Shortcuts: <tt>Monospace</tt> – <b>Bold</b> – <i>Italic</i> – <big>Big</big> – <small>Small</small> – <u>Underlined</u> – <s>Strikethrough</s> – Super<sup>script</sup> – Sub<sub>script</sub>

-hyphenation algorithm is a <span allow_breaks="false" style="italic">set of rules</span>, especially one codified for implementation in a computer program, that decides at which points a word can be broken over two lines with a hyphen. For example, a hyphenation algorithm might decide that impeachment can be broken as impeach‧ment or im‧peachment but not impe‧achment.
+<span allow_breaks="false">A</span> hyphenation algorithm is a set of rules, especially one codified for implementation in a computer program, that decides at which points a word can be broken over two lines with a hyphen. For example, a hyphenation algorithm might decide that impeachment can be broken as <span allow_breaks="false">impeach‧ment</span> or <span allow_breaks="false">im‧peachment</span> but not <span allow_breaks="false">impe‧achment.</span>

 <span insert_hyphens="false">one/two three/four five/six seven/eight nine/ten</span>
-
-<span line_height='1.33'>Line height: This is an example of widely spaced text. It was achieved by setting the line-height factor to 1.33. You can set the line-height factor to any value between 0 and 10.
-Note that the line height affects the spacing between paragraphs as well as between the wrapped lines inside a paragraph.</span>
-
-Transforms: <span text_transform='uppercase'>straße</span> <span text_transform='capitalize'>up, up and away</span>
-
--- a/demos/gtk-demo/menu.c
+++ b/demos/gtk-demo/menu.c
@@ -21,10 +21,8 @@ do_menu (GtkWidget *do_widget)

  if (!window)
    {
-      GtkWidget *box;
      GtkWidget *sw;
      GtkWidget *widget;
-      GtkWidget *scale;

      window = gtk_window_new ();
      gtk_window_set_title (GTK_WINDOW (window), "Menu");
@@ -33,23 +31,11 @@ do_menu (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
      sw = gtk_scrolled_window_new ();
-      gtk_widget_set_vexpand (sw, TRUE);
-      gtk_box_append (GTK_BOX (box), sw);
+      gtk_window_set_child (GTK_WINDOW (window), sw);

      widget = demo3_widget_new ("/transparent/portland-rose.jpg");
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.01, 10.0, 0.1);
-      gtk_range_set_value (GTK_RANGE (scale), 1.0);
-      gtk_box_append (GTK_BOX (box), scale);
-
-      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
-                              widget, "scale",
-                              G_BINDING_BIDIRECTIONAL);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/menus.ui
+++ b/demos/gtk-demo/menus.ui
@@ -21,7 +21,7 @@
        <item>
          <attribute name="label" translatable="yes">Save _As...</attribute>
          <attribute name="action">app.save-as</attribute>
-          <attribute name="accel">&lt;Control&gt;&lt;Shift&gt;s</attribute>
+          <attribute name="accel">&lt;Control&gt;s</attribute>
        </item>
      </section>
      <section>
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -67,7 +67,6 @@ demos = files([
  'paintable_animated.c',
  'paintable_emblem.c',
  'paintable_mediastream.c',
-  'paintable_symbolic.c',
  'panes.c',
  'password_entry.c',
  'peg_solitaire.c',
@@ -98,7 +97,6 @@ demos = files([
  'transparent.c',
  'tree_store.c',
  'video_player.c',
-  'font_features.c',
 ])

 gtkdemo_deps = [ libgtk_dep, ]
@@ -129,15 +127,19 @@ extra_demo_sources = files([
  'script-names.c',
  'unicode-names.c',
  'suggestionentry.c',
-  'language-names.c',
-  'simplelabel.c',
 ])

+if harfbuzz_dep.found() and pangoft_dep.found()
+  demos += files(['font_features.c'])
+  extra_demo_sources += files(['language-names.c'])
+  gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
+endif
+
 if os_unix
  demos += files('pagesetup.c')
 endif

-librsvg_dep = dependency('librsvg-2.0', version: '>= 2.52.0', required: false)
+librsvg_dep = dependency('librsvg-2.0', version: '>= 2.46.0', required: false)

 if librsvg_dep.found()
  demos += files('paintable_svg.c')
@@ -153,85 +155,15 @@ demos_h = custom_target('gtk4 demo header',
  command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ],
 )

-objcopy_supports_add_symbol = false
-objcopy = find_program('objcopy', required : false)
-if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
-endif
-
-ld = find_program('ld', required : false)
-
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
-  glib_compile_resources = find_program('glib-compile-resources')
-
-  # Create the resource blob
-  gtkdemo_gresource = custom_target('gtkdemo.gresource',
-      input : 'demo.gresource.xml',
-      output : 'gtkdemo.gresource',
-      depfile : 'gtkdemo.gresource.d',
-      command : [glib_compile_resources,
-                 '--generate',
-                 '--internal',
-                 '--target=@OUTPUT@',
-                 '--dependency-file=@DEPFILE@',
-                 '--sourcedir=' + meson.current_source_dir(),
-                 '--sourcedir=' + meson.current_build_dir(),
-                 '@INPUT@'])
-
-  # Create resource data file
-  gtkdemo_resources_c = custom_target('gtkdemo_resources.c',
-      input : 'demo.gresource.xml',
-      output : 'gtkdemo_resources.c',
-      depfile : 'gtkdemo_resources.c.d',
-      command : [glib_compile_resources,
-                 '--generate-source',
-                 '--internal',
-                 '--target=@OUTPUT@',
-                 '--dependency-file=@DEPFILE@',
-                 '--sourcedir=' + meson.current_source_dir(),
-                 '--sourcedir=' + meson.current_build_dir(),
-                 '--external-data',
-                 '--c-name', '_g_binary_gtkdemo',
-                 '@INPUT@'])
-
-  # Create object file containing resource data
-  gtkdemo_resources_binary = custom_target('gtkdemo_resources.o',
-      input : gtkdemo_gresource,
-      output : 'gtkdemo_resources.o',
-      command : [ld,
-                 '-z', 'noexecstack',
-                 '-r',
-                 '-b','binary',
-                 '@INPUT@',
-                 '-o','@OUTPUT@'])
-
-  # Rename symbol to match the one in the C file
-  gtkdemo_resources_o = custom_target('gtkdemo_resources2.o',
-    input : gtkdemo_resources_binary,
-    output : 'gtkdemo_resources2.o',
-    command : [objcopy,
-                 '--strip-all',
-                 '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
-                 '@INPUT@',
-                 '@OUTPUT@'])
-
-  gtkdemo_resources = [
-      gtkdemo_resources_c,
-      gtkdemo_resources_o,
-    ]
-else
-  gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
-    'demo.gresource.xml',
-    source_dir: '.',
-  )
-endif
+gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
+  'demo.gresource.xml',
+  source_dir: '.',
+)

 # Use a subset of compiler flags
 demo_cflags = []
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations',
-                  '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
    demo_cflags += flag
  endif
 endforeach
@@ -243,7 +175,7 @@ executable('gtk4-demo',
  c_args: gtkdemo_args + demo_cflags,
  dependencies: gtkdemo_deps,
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -253,7 +185,7 @@ executable('gtk4-demo-application',
  c_args: gtkdemo_args + common_cflags,
  dependencies: gtkdemo_deps,
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -273,9 +205,4 @@ install_data('org.gtk.Demo4.gschema.xml', install_dir: gtk_schemasdir)
 gnome.compile_schemas()

 # appdata
-configure_file(
-  input: 'org.gtk.Demo4.appdata.xml.in',
-  output: 'org.gtk.Demo4.appdata.xml',
-  configuration: appdata_config,
-  install_dir: gtk_appdatadir
-)
+install_data('org.gtk.Demo4.appdata.xml', install_dir: gtk_appdatadir)
--- a/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in
+++ b/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.Demo4</id>
-  <launchable type="desktop-id">org.gtk.Demo4.desktop</launchable>
+  <id>org.gtk.Demo4.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <project_license>LGPL-2.0+</project_license>
  <name>GTK Demo</name>
  <summary>Program to demonstrate GTK functions</summary>
  <description>
@@ -31,11 +30,15 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
  <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="3.99.0" date="2020-07-30">
      <description>
-        <p>A new build of GTK.</p>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
+    <release version="3.94.0" date="2018-06-25">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
      </description>
    </release>
  </releases>
--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -45,27 +45,26 @@ struct _GtkNuclearIconClass
 * so that it can be called from all the other demos, too.
 */
 void
-gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
-                      const GdkRGBA *foreground,
-                      const GdkRGBA *background,
-                      double         width,
-                      double         height,
-                      double         rotation)
+gtk_nuclear_snapshot (GtkSnapshot *snapshot,
+                      double       width,
+                      double       height,
+                      double       rotation,
+                      gboolean     draw_background)
 {
 #define RADIUS 0.3
  cairo_t *cr;
  double size;

-  gtk_snapshot_append_color (snapshot,
-                             background,
-                             &GRAPHENE_RECT_INIT (0, 0, width, height));
+  if (draw_background)
+    gtk_snapshot_append_color (snapshot,
+                               &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 },
+                               &GRAPHENE_RECT_INIT (0, 0, width, height));

  size = MIN (width, height);
  cr = gtk_snapshot_append_cairo (snapshot,
                                  &GRAPHENE_RECT_INIT ((width - size) / 2.0,
                                                       (height - size) / 2.0,
                                                       size, size));
-  gdk_cairo_set_source_rgba (cr, foreground);
  cairo_translate (cr, width / 2.0, height / 2.0);
  cairo_scale (cr, size, size);
  cairo_rotate (cr, rotation);
@@ -95,10 +94,9 @@ gtk_nuclear_icon_snapshot (GdkPaintable *paintable,
   */

  gtk_nuclear_snapshot (snapshot,
-                        &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
-                        &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 }, /* yellow */
                        width, height,
-                        nuclear->rotation);
+                        nuclear->rotation,
+                        TRUE);
 }

 static GdkPaintableFlags
--- a/demos/gtk-demo/paintable.h
+++ b/demos/gtk-demo/paintable.h
@@ -4,11 +4,10 @@
 #include <gtk/gtk.h>

 void            gtk_nuclear_snapshot           (GtkSnapshot     *snapshot,
-                                                const GdkRGBA   *foreground,
-                                                const GdkRGBA   *background,
                                                double           width,
                                                double           height,
-                                                double           rotation);
+                                                double           rotation,
+                                                gboolean         draw_background);

 GdkPaintable *  gtk_nuclear_icon_new            (double          rotation);
 GdkPaintable *  gtk_nuclear_animation_new       (gboolean        draw_background);
--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -65,12 +65,9 @@ gtk_nuclear_animation_snapshot (GdkPaintable *paintable,

  /* We call the function from the previous example here. */
  gtk_nuclear_snapshot (snapshot,
-                        &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
-                        nuclear->draw_background
-                          ? &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 } /* yellow */
-                          : &(GdkRGBA) { 0, 0, 0, 0 }, /* transparent */
                        width, height,
-                        2 * G_PI * nuclear->progress / MAX_PROGRESS);
+                        2 * G_PI * nuclear->progress / MAX_PROGRESS,
+                        nuclear->draw_background);
 }

 static GdkPaintable *
--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -73,10 +73,9 @@ gtk_nuclear_media_stream_snapshot (GdkPaintable *paintable,

  /* We call the function from the previous example here. */
  gtk_nuclear_snapshot (snapshot,
-                        &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
-                        &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 }, /* yellow */
                        width, height,
-                        2 * G_PI * nuclear->progress / DURATION);
+                        2 * G_PI * nuclear->progress / DURATION,
+                        TRUE);
 }

 static GdkPaintable *
@@ -151,7 +150,7 @@ gtk_nuclear_media_stream_step (gpointer data)
   * call our pause function to pause the stream.
   */
  if (nuclear->progress >= DURATION)
-    gtk_media_stream_stream_ended (GTK_MEDIA_STREAM (nuclear));
+    gtk_media_stream_ended (GTK_MEDIA_STREAM (nuclear));

  /* The timeout function is removed by the pause function,
   * so we can just always return this value.
@@ -268,11 +267,11 @@ gtk_nuclear_media_stream_init (GtkNuclearMediaStream *nuclear)
   * However, media streams need to tell GTK once they are initialized,
   * so we do that here.
   */
-  gtk_media_stream_stream_prepared (GTK_MEDIA_STREAM (nuclear),
-                                    FALSE,
-                                    TRUE,
-                                    TRUE,
-                                    DURATION);
+  gtk_media_stream_prepared (GTK_MEDIA_STREAM (nuclear),
+                             FALSE,
+                             TRUE,
+                             TRUE,
+                             DURATION);
 }

 /* And finally, we add the simple constructor we declared in the header. */
--- a/demos/gtk-demo/paintable_symbolic.c
+++ b/demos/gtk-demo/paintable_symbolic.c
@@ -1,208 +0,0 @@
-/* Paintable/Symbolic Paintable
- *
- * GdkPaintables can be made to follow the theme's colors. GTK calls
- * icons that do this symbolic icons, paintables that want to have
- * the same effect can implement the GtkSymbolicPaintable interface.
- *
- * We will adapt the original paintable example by adding the ability
- * to recolor the paintable based on the symbolic colors.
- */
-
-#include <gtk/gtk.h>
-
-#include "paintable.h"
-
-static GtkWidget *window = NULL;
-
-/* First, add the boilerplate for the object itself.
- * This part would normally go in the header.
- */
-#define GTK_TYPE_NUCLEAR_SYMBOLIC (gtk_nuclear_symbolic_get_type ())
-G_DECLARE_FINAL_TYPE (GtkNuclearSymbolic, gtk_nuclear_symbolic, GTK, NUCLEAR_SYMBOLIC, GObject)
-
-/* Declare a few warning levels, so we can pick colors based on them */
-typedef enum
-{
-  WARNING_NONE,
-  WARNING_ALERT,
-  WARNING_EMERGENCY
-} WarningLevel;
-
-/* Declare the struct. */
-struct _GtkNuclearSymbolic
-{
-  GObject parent_instance;
-
-  WarningLevel warning_level;
-};
-
-struct _GtkNuclearSymbolicClass
-{
-  GObjectClass parent_class;
-};
-
-/* Add a function to draw the nuclear icon in the given colors */
-static void
-gtk_nuclear_symbolic_snapshot_symbolic (GtkSymbolicPaintable *paintable,
-                                        GdkSnapshot          *snapshot,
-                                        double                width,
-                                        double                height,
-                                        const GdkRGBA        *colors,
-                                        gsize                 n_colors)
-{
-  GtkNuclearSymbolic *self = GTK_NUCLEAR_SYMBOLIC (paintable);
-  static const GdkRGBA transparent = { 0, };
-  const GdkRGBA *bg_color;
-
-  /* select the right background color from the warning level */
-  switch (self->warning_level)
-  {
-    case WARNING_NONE:
-      bg_color = &transparent;
-      break;
-    case WARNING_ALERT:
-      bg_color = &colors[GTK_SYMBOLIC_COLOR_WARNING];
-      break;
-    case WARNING_EMERGENCY:
-      bg_color = &colors[GTK_SYMBOLIC_COLOR_ERROR];
-      break;
-    default:
-      /* This should never happen, but we better do defensive coding
-       * with this critical icon */
-      g_assert_not_reached ();
-      bg_color = &transparent;
-      break;
-  }
-
-  /* Draw the icon with the selected warning color */
-  gtk_nuclear_snapshot (snapshot,
-                        &colors[GTK_SYMBOLIC_COLOR_FOREGROUND],
-                        bg_color,
-                        width, height,
-                        0);
-}
-
-static void
-gtk_nuclear_symbolic_symbolic_paintable_init (GtkSymbolicPaintableInterface *iface)
-{
-  iface->snapshot_symbolic = gtk_nuclear_symbolic_snapshot_symbolic;
-}
-
-/* We need to implement the functionality required by the GdkPaintable interface */
-static void
-gtk_nuclear_symbolic_snapshot (GdkPaintable *paintable,
-                                GdkSnapshot  *snapshot,
-                                double        width,
-                                double        height)
-{
-  /* Calling this function without passing a color is a neat trick
-   * to make GTK use default colors and otherwise forward the call
-   * to the snapshotting function above.
-   */
-  gtk_symbolic_paintable_snapshot_symbolic (GTK_SYMBOLIC_PAINTABLE (paintable),
-                                            snapshot,
-                                            width, height,
-                                            NULL, 0);
-}
-
-static GdkPaintableFlags
-gtk_nuclear_symbolic_get_flags (GdkPaintable *paintable)
-{
-  /* This image has a static size, but the contents may change:
-   * We draw different things when the warning level changes.
-   */
-  return GDK_PAINTABLE_STATIC_SIZE;
-}
-
-static void
-gtk_nuclear_symbolic_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_nuclear_symbolic_snapshot;
-  iface->get_flags = gtk_nuclear_symbolic_get_flags;
-}
-
-/* When defining the GType, we need to implement bot the GdkPaintable
- * and the GtkSymbolicPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkNuclearSymbolic, gtk_nuclear_symbolic, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_nuclear_symbolic_paintable_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_SYMBOLIC_PAINTABLE,
-                                                gtk_nuclear_symbolic_symbolic_paintable_init))
-
-static void
-gtk_nuclear_symbolic_class_init (GtkNuclearSymbolicClass *klass)
-{
-}
-
-static void
-gtk_nuclear_symbolic_init (GtkNuclearSymbolic *nuclear)
-{
-}
-
-/* And finally, we add the simple constructor we declared in the header. */
-GdkPaintable *
-gtk_nuclear_symbolic_new (void)
-{
-  return g_object_new (GTK_TYPE_NUCLEAR_SYMBOLIC, NULL);
-}
-
-/* Add some fun feature to the button */
-static void
-nuclear_button_clicked (GtkButton          *button,
-                        GtkNuclearSymbolic *nuclear)
-{
-  if (nuclear->warning_level >= WARNING_EMERGENCY)
-    {
-      /* On maximum warning level, reset the warning */
-      nuclear->warning_level = WARNING_NONE;
-      /* And sometimes (but not always to confuse people)
-       * close the window.
-       */
-      if (g_random_boolean ())
-        gtk_window_close (GTK_WINDOW (window));
-    }
-  else
-    {
-      /* Otherwise just increase the warning level */
-      nuclear->warning_level++;
-    }
-
-  /* Don't forget to emit the signal causing the paintable to redraw.
-   * Changing the warning level changes the background color after all.
-   */
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (nuclear));
-}
-
-GtkWidget *
-do_paintable_symbolic (GtkWidget *do_widget)
-{
-  GdkPaintable *nuclear;
-  GtkWidget *image, *button;
-
-  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), "Don't click!");
-      gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      button = gtk_button_new ();
-      gtk_window_set_child (GTK_WINDOW (window), button);
-
-      nuclear = gtk_nuclear_symbolic_new ();
-      image = gtk_image_new_from_paintable (nuclear);
-
-      gtk_button_set_child (GTK_BUTTON (button), image);
-      g_signal_connect (button, "clicked", G_CALLBACK (nuclear_button_clicked), nuclear);
-      g_object_unref (nuclear);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
--- a/demos/gtk-demo/peg_solitaire.c
+++ b/demos/gtk-demo/peg_solitaire.c
@@ -1,7 +1,7 @@
 /* Peg Solitaire
 * #Keywords: GtkGridView, game
 *
- * This demo demonstrates how to use drag-and-drop to implement peg solitaire.
+ * This demo demonstrates how to use drag'n'drop to implement peg solitaire.
 *
 */

@@ -98,7 +98,7 @@ solitaire_peg_init (SolitairePeg *peg)

 /* Add a little setter for the peg's position.
 * We want to track those so that we can check for legal moves
- * during drag-and-drop operations.
+ * during drag'n'drop operations.
 */
 static void
 solitaire_peg_set_position (SolitairePeg *peg,
--- a/demos/gtk-demo/shortcuts.c
+++ b/demos/gtk-demo/shortcuts.c
@@ -25,43 +25,43 @@ show_shortcuts (GtkWidget   *window,
  g_object_unref (builder);
 }

-G_MODULE_EXPORT void
+void
 shortcuts_builder_shortcuts (GtkWidget *window)
 {
  show_shortcuts (window, "shortcuts-builder", NULL);
 }

-G_MODULE_EXPORT void
+void
 shortcuts_gedit_shortcuts (GtkWidget *window)
 {
  show_shortcuts (window, "shortcuts-gedit", NULL);
 }

-G_MODULE_EXPORT void
+void
 shortcuts_clocks_shortcuts (GtkWidget *window)
 {
  show_shortcuts (window, "shortcuts-clocks", NULL);
 }

-G_MODULE_EXPORT void
+void
 shortcuts_clocks_shortcuts_stopwatch (GtkWidget *window)
 {
  show_shortcuts (window, "shortcuts-clocks", "stopwatch");
 }

-G_MODULE_EXPORT void
+void
 shortcuts_boxes_shortcuts (GtkWidget *window)
 {
  show_shortcuts (window, "shortcuts-boxes", NULL);
 }

-G_MODULE_EXPORT void
+void
 shortcuts_boxes_shortcuts_wizard (GtkWidget *window)
 {
  show_shortcuts (window, "shortcuts-boxes", "wizard");
 }

-G_MODULE_EXPORT void
+void
 shortcuts_boxes_shortcuts_display (GtkWidget *window)
 {
  show_shortcuts (window, "shortcuts-boxes", "display");
--- a/demos/gtk-demo/simplelabel.c
+++ b/demos/gtk-demo/simplelabel.c
@@ -1,260 +0,0 @@
-#include "simplelabel.h"
-
-struct _SimpleLabel
-{
-  GtkWidget parent_instance;
-
-  PangoLayout *layout;
-  int min_chars;
-  int nat_chars;
-
-  int min_width;
-  int nat_width;
-  int height;
-};
-
-struct _SimpleLabelClass
-{
-  GtkWidgetClass parent_class;
-};
-
-enum {
-  PROP_TEXT = 1,
-  PROP_MIN_CHARS,
-  PROP_NAT_CHARS,
-  NUM_PROPERTIES
-};
-
-static GParamSpec *properties[NUM_PROPERTIES] = { NULL, };
-
-G_DEFINE_TYPE (SimpleLabel, simple_label, GTK_TYPE_WIDGET)
-
-static void
-simple_label_init (SimpleLabel *self)
-{
-  self->layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "");
-  pango_layout_set_ellipsize (self->layout, PANGO_ELLIPSIZE_NONE);
-  pango_layout_set_wrap (self->layout, PANGO_WRAP_WORD);
-  pango_layout_set_width (self->layout, -1);
-}
-
-static void
-simple_label_dispose (GObject *object)
-{
-  SimpleLabel *self = SIMPLE_LABEL (object);
-
-  g_clear_object (&self->layout);
-
-  G_OBJECT_CLASS (simple_label_parent_class)->dispose (object);
-}
-
-static void
-simple_label_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  SimpleLabel *self = SIMPLE_LABEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_TEXT:
-      simple_label_set_text (self, g_value_get_string (value));
-      break;
-
-    case PROP_MIN_CHARS:
-      simple_label_set_min_chars (self, g_value_get_int (value));
-      break;
-
-    case PROP_NAT_CHARS:
-      simple_label_set_nat_chars (self, g_value_get_int (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-simple_label_get_property (GObject     *object,
-                           guint        prop_id,
-                           GValue      *value,
-                           GParamSpec  *pspec)
-{
-  SimpleLabel *self = SIMPLE_LABEL (object);
-
-  switch (prop_id)
-    {
-    case PROP_TEXT:
-      g_value_set_string (value, pango_layout_get_text (self->layout));
-      break;
-
-    case PROP_MIN_CHARS:
-      g_value_set_int (value, self->min_chars);
-      break;
-
-    case PROP_NAT_CHARS:
-      g_value_set_int (value, self->nat_chars);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-simple_label_measure (GtkWidget      *widget,
-                      GtkOrientation  orientation,
-                      int             for_size,
-                      int            *minimum,
-                      int            *natural,
-                      int            *minimum_baseline,
-                      int            *natural_baseline)
-{
-  SimpleLabel *self = SIMPLE_LABEL (widget);
-
-  if (orientation == GTK_ORIENTATION_VERTICAL)
-    {
-      *minimum = *natural = self->height;
-    }
-  else
-    {
-      *minimum = self->min_width;
-      *natural = self->nat_width;
-    }
-}
-
-static void
-simple_label_size_allocate (GtkWidget *widget,
-                            int        width,
-                            int        height,
-                            int        baseline)
-{
-  SimpleLabel *self = SIMPLE_LABEL (widget);
-
-  pango_layout_set_width (self->layout, width * PANGO_SCALE);
-}
-
-static void
-simple_label_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  SimpleLabel *self = SIMPLE_LABEL (widget);
-  GtkStyleContext *context;
-
-  context = gtk_widget_get_style_context (widget);
-
-  gtk_snapshot_render_layout (snapshot, context, 0, 0, self->layout);
-}
-
-static void
-simple_label_class_init (SimpleLabelClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = simple_label_dispose;
-  object_class->set_property = simple_label_set_property;
-  object_class->get_property = simple_label_get_property;
-
-  widget_class->measure = simple_label_measure;
-  widget_class->size_allocate = simple_label_size_allocate;
-  widget_class->snapshot = simple_label_snapshot;
-
-  properties[PROP_TEXT] =
-    g_param_spec_string ("text", "Text", "Text",
-                         NULL,
-                         G_PARAM_READWRITE);
-
-  properties[PROP_MIN_CHARS] =
-    g_param_spec_int ("min-chars", "Minimum Characters", "Minimum Characters",
-                      0, G_MAXINT, 0,
-                      G_PARAM_READWRITE);
-
-  properties[PROP_NAT_CHARS] =
-    g_param_spec_int ("nat-chars", "Natural Characters", "Natural Characters",
-                      0, G_MAXINT, 0,
-                      G_PARAM_READWRITE);
-
-  g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
-}
-
-GtkWidget *
-simple_label_new (void)
-{
-  return g_object_new (SIMPLE_TYPE_LABEL, NULL);
-}
-
-void
-simple_label_set_text (SimpleLabel *self,
-                       const char  *text)
-{
-  if (strcmp (text, pango_layout_get_text (self->layout)) == 0)
-    return;
-
-  pango_layout_set_text (self->layout, text, -1);
-
-  gtk_widget_queue_draw (GTK_WIDGET (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TEXT]);
-}
-
-static void
-recalculate (SimpleLabel *self)
-{
-  PangoContext *context;
-  PangoFontMetrics *metrics;
-  int char_width;
-  int digit_width;
-  int width;
-  int ascent;
-  int descent;
-
-  context = gtk_widget_get_pango_context (GTK_WIDGET (self));
-  metrics = pango_context_get_metrics (context,
-                                       pango_context_get_font_description (context),
-                                       pango_context_get_language (context));
-  char_width = pango_font_metrics_get_approximate_char_width (metrics);
-  digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
-  ascent = pango_font_metrics_get_ascent (metrics);
-  descent = pango_font_metrics_get_descent (metrics);
-  pango_font_metrics_unref (metrics);
-
-  width = MAX (char_width, digit_width);
-
-  self->min_width = (width * self->min_chars) / PANGO_SCALE;
-  self->nat_width = (width * self->nat_chars) / PANGO_SCALE;
-  self->height = (ascent + descent) / PANGO_SCALE;
-}
-
-void
-simple_label_set_min_chars (SimpleLabel *self,
-                            int          min_chars)
-{
-  if (self->min_chars == min_chars)
-    return;
-
-  self->min_chars = min_chars;
-
-  recalculate (self);
-  gtk_widget_queue_resize (GTK_WIDGET (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MIN_CHARS]);
-}
-
-void
-simple_label_set_nat_chars (SimpleLabel *self,
-                            int          nat_chars)
-{
-  if (self->nat_chars == nat_chars)
-    return;
-
-  self->nat_chars = nat_chars;
-
-  recalculate (self);
-  gtk_widget_queue_resize (GTK_WIDGET (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_NAT_CHARS]);
-}
--- a/demos/gtk-demo/simplelabel.h
+++ b/demos/gtk-demo/simplelabel.h
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define SIMPLE_TYPE_LABEL (simple_label_get_type ())
-G_DECLARE_FINAL_TYPE (SimpleLabel, simple_label, SIMPLE, LABEL, GtkWidget)
-
-GtkWidget * simple_label_new           (void);
-
-void        simple_label_set_text      (SimpleLabel *self,
-                                        const char  *text);
-void        simple_label_set_min_chars (SimpleLabel *self,
-                                        int          min_chars);
-void        simple_label_set_nat_chars (SimpleLabel *self,
-                                        int          nat_chars);
--- a/demos/gtk-demo/singular_value_decomposition.c
+++ b/demos/gtk-demo/singular_value_decomposition.c
@@ -2,7 +2,6 @@
 #include <float.h>
 #include <math.h>
 #include <glib.h>
-#include <assert.h>

 /* See Golub and Reinsch,
 * "Handbook for Automatic Computation vol II - Linear Algebra",
@@ -40,9 +39,6 @@ householder_reduction (double *A,
  double *pu, *pui, *pv, *pvi;
  double half_norm_squared;

-  assert (nrows >= 2);
-  assert (ncols >= 2);
-
  memcpy (U, A, sizeof (double) * nrows * ncols);

  diagonal[0] = 0.0;
@@ -209,9 +205,6 @@ givens_reduction (int nrows,
  int rotation_test;
  int iteration_count;

-  assert (nrows >= 2);
-  assert (ncols >= 2);
-
  for (i = 0, x = 0.0; i < ncols; i++)
    {
      y = fabs (diagonal[i]) + fabs (superdiagonal[i]);
@@ -349,9 +342,6 @@ sort_singular_values (int     nrows,
  double temp;
  double *p1, *p2;

-  assert (nrows >= 2);
-  assert (ncols >= 2);
-
  for (i = 0; i < ncols - 1; i++)
    {
      max_index = i;
@@ -443,12 +433,9 @@ singular_value_decomposition_solve (double *U,
  double d;
  double tolerance;

-  assert (nrows >= 2);
-  assert (ncols >= 2);
-
  tolerance = DBL_EPSILON * S[0] * (double) ncols;

-  for (i = 0, pv = V; i < ncols; i++, pv += ncols)
+  for ( i = 0, pv = V; i < ncols; i++, pv += ncols)
    {
      x[i] = 0.0;
      for (j = 0; j < ncols; j++)
--- a/demos/gtk-demo/spinbutton.c
+++ b/demos/gtk-demo/spinbutton.c
@@ -12,7 +12,7 @@
 #include <math.h>
 #include <stdlib.h>

-G_MODULE_EXPORT int
+int
 spinbutton_hex_spin_input (GtkSpinButton *spin_button,
                           double        *new_val)
 {
@@ -29,7 +29,7 @@ spinbutton_hex_spin_input (GtkSpinButton *spin_button,
    return TRUE;
 }

-G_MODULE_EXPORT int
+int
 spinbutton_hex_spin_output (GtkSpinButton *spin_button)
 {
  GtkAdjustment *adjustment;
@@ -49,7 +49,7 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
  return TRUE;
 }

-G_MODULE_EXPORT int
+int
 spinbutton_time_spin_input (GtkSpinButton *spin_button,
                            double        *new_val)
 {
@@ -88,7 +88,7 @@ spinbutton_time_spin_input (GtkSpinButton *spin_button,
  return TRUE;
 }

-G_MODULE_EXPORT int
+int
 spinbutton_time_spin_output (GtkSpinButton *spin_button)
 {
  GtkAdjustment *adjustment;
@@ -122,7 +122,7 @@ static const char *month[12] = {
  "December"
 };

-G_MODULE_EXPORT int
+int
 spinbutton_month_spin_input (GtkSpinButton *spin_button,
                             double        *new_val)
 {
@@ -151,7 +151,7 @@ spinbutton_month_spin_input (GtkSpinButton *spin_button,
  return TRUE;
 }

-G_MODULE_EXPORT int
+int
 spinbutton_month_spin_output (GtkSpinButton *spin_button)
 {
  GtkAdjustment *adjustment;
--- a/demos/gtk-demo/svgpaintable.c
+++ b/demos/gtk-demo/svgpaintable.c
@@ -47,24 +47,22 @@ static int
 svg_paintable_get_intrinsic_width (GdkPaintable *paintable)
 {
  SvgPaintable *self = SVG_PAINTABLE (paintable);
-  double width;
+  RsvgDimensionData data;

-  if (!rsvg_handle_get_intrinsic_size_in_pixels (self->handle, &width, NULL))
-    return 0;
+  rsvg_handle_get_dimensions (self->handle, &data);

-  return ceil (width);
+  return data.width;
 }

 static int
 svg_paintable_get_intrinsic_height (GdkPaintable *paintable)
 {
  SvgPaintable *self = SVG_PAINTABLE (paintable);
-  double height;
+  RsvgDimensionData data;

-  if (!rsvg_handle_get_intrinsic_size_in_pixels (self->handle, NULL, &height))
-    return 0;
+  rsvg_handle_get_dimensions (self->handle, &data);

-  return ceil (height);
+  return data.height;
 }

 static void
--- a/demos/gtk-demo/tabs.c
+++ b/demos/gtk-demo/tabs.c
@@ -1,11 +1,6 @@
 /* Text View/Tabs
 *
 * GtkTextView can position text at fixed positions, using tabs.
- * Tabs can specify alignment, and also allow aligning numbers
- * on the decimal point.
- *
- * The example here has three tabs, with left, numeric and right
- * alignment.
 */

 #include <gtk/gtk.h>
@@ -27,7 +22,7 @@ do_tabs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Tabs");
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 330, 130);
+      gtk_window_set_default_size (GTK_WINDOW (window), 330, 330);
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

@@ -40,18 +35,17 @@ do_tabs (GtkWidget *do_widget)

      tabs = pango_tab_array_new (3, TRUE);
      pango_tab_array_set_tab (tabs, 0, PANGO_TAB_LEFT, 0);
-      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_DECIMAL, 150);
-      pango_tab_array_set_decimal_point (tabs, 1, '.');
-      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_RIGHT, 290);
+      pango_tab_array_set_tab (tabs, 1, PANGO_TAB_LEFT, 100);
+      pango_tab_array_set_tab (tabs, 2, PANGO_TAB_LEFT, 200);
      gtk_text_view_set_tabs (GTK_TEXT_VIEW (view), tabs);
      pango_tab_array_free (tabs);

      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
-      gtk_text_buffer_set_text (buffer, "one\t2.0\tthree\nfour\t5.555\tsix\nseven\t88.88\tnine", -1);
+      gtk_text_buffer_set_text (buffer, "one\ttwo\tthree\nfour\tfive\tsix\nseven\teight\tnine", -1);

      sw = gtk_scrolled_window_new ();
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
      gtk_window_set_child (GTK_WINDOW (window), sw);
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
--- a/demos/icon-browser/iconbrowserapp.c
+++ b/demos/icon-browser/iconbrowserapp.c
@@ -72,7 +72,7 @@ about_activated (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (s, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
--- a/demos/icon-browser/meson.build
+++ b/demos/icon-browser/meson.build
@@ -16,7 +16,7 @@ executable('gtk4-icon-browser',
  c_args: common_cflags,
  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -32,10 +32,5 @@ endforeach
 install_data('org.gtk.IconBrowser4.desktop', install_dir: gtk_applicationsdir)

 # appdata
-configure_file(
-  input: 'org.gtk.IconBrowser4.appdata.xml.in',
-  output: 'org.gtk.IconBrowser4.appdata.xml',
-  configuration: appdata_config,
-  install_dir: gtk_appdatadir
-)
+install_data('org.gtk.IconBrowser4.appdata.xml', install_dir: gtk_appdatadir)

--- a/demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in
+++ b/demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.IconBrowser4</id>
-  <launchable type="desktop-id">org.gtk.IconBrowser4.desktop</launchable>
+  <id>org.gtk.IconBrowser4.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <project_license>LGPL-2.0+</project_license>
  <name>GTK Icon Browser</name>
  <summary>Program to browse themed icons</summary>
  <description>
@@ -30,11 +29,15 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
  <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="3.99.0" date="2020-07-30">
      <description>
-        <p>A new build of GTK.</p>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
+    <release version="3.94.0" date="2018-06-25">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
      </description>
    </release>
  </releases>
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -25,14 +25,12 @@
            </style>
            <child>
              <object class="GtkToggleButton" id="normal_radio">
-                <property name="focus-on-click">0</property>
                <property name="label" translatable="yes">Normal</property>
                <property name="active">1</property>
              </object>
            </child>
            <child>
              <object class="GtkToggleButton" id="symbolic_radio">
-                <property name="focus-on-click">0</property>
                <property name="label" translatable="yes">Symbolic</property>
                <property name="group">normal_radio</property>
                <signal name="notify::active" handler="symbolic_toggled" swapped="yes" after="yes"/>
@@ -42,7 +40,6 @@
        </child>
        <child type="end">
          <object class="GtkMenuButton" id="gear_menu_button">
-            <property name="focus-on-click">0</property>
            <property name="valign">center</property>
            <property name="menu-model">gear_menu</property>
            <property name="icon-name">open-menu-symbolic</property>
@@ -50,7 +47,6 @@
        </child>
        <child type="end">
          <object class="GtkToggleButton" id="search">
-            <property name="focus-on-click">0</property>
            <style>
              <class name="image-button"/>
            </style>
--- a/demos/meson.build
+++ b/demos/meson.build
@@ -1,21 +1,19 @@
-gen_demo_header = find_program('../build-aux/meson/gen-demo-header.py')
-demo_profile = get_option('profile')
+demo_conf = configuration_data()
+demo_conf.set_quoted('PROFILE', get_option('profile'))
+demo_conf.set_quoted('VCS_TAG', '@VCS_TAG@')

 demo_conf_h = declare_dependency(
-  sources: custom_target('demo-header',
-    command: [gen_demo_header, meson.project_source_root(), demo_profile],
-    capture: true,
-    output: 'demo_conf.h',
-    build_by_default: true,
-    build_always_stale: true,
-  )
+  sources: vcs_tag(
+             command: [ 'git', 'rev-parse', '--short', 'HEAD' ],
+             fallback: get_option('profile') != 'default' ? 'devel' : '',
+             input: configure_file(
+                      output: 'demo_conf.h.in',
+                      configuration: demo_conf
+                    ),
+             output: 'demo_conf.h'
+           )
 )

-# appdata
-
-appdata_config = configuration_data()
-appdata_config.set('BUILD_VERSION', meson.project_version())
-
 subdir('constraint-editor')
 subdir('gtk-demo')
 subdir('icon-browser')
--- a/demos/node-editor/help-window.ui
+++ b/demos/node-editor/help-window.ui
@@ -2,8 +2,8 @@
 <interface>
  <object class="GtkWindow" id="window">
    <property name="title" translatable="yes">Help</property>
-    <property name="default-width">920</property>
-    <property name="default-height">600</property>
+    <property name="default-width">720</property>
+    <property name="default-height">520</property>
    <child>
      <object class="GtkScrolledWindow">
        <child>
--- a/demos/node-editor/meson.build
+++ b/demos/node-editor/meson.build
@@ -17,26 +17,14 @@ executable('gtk4-node-editor',
  c_args: [
    '-DNODE_EDITOR_SOURCE_DIR="@0@/../../testsuite/gsk/compare/"'.format(meson.current_source_dir())
  ] + common_cflags,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
-  install: true,
+  install: false,
 )

-# icons
-icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-
-foreach size: ['scalable', 'symbolic']
-  install_subdir('data/' + size, install_dir: icontheme_dir)
-endforeach
-
-# desktop file
-install_data('org.gtk.gtk4.NodeEditor.desktop', install_dir: gtk_applicationsdir)
-
-# appdata
-configure_file(
-  input: 'org.gtk.gtk4.NodeEditor.appdata.xml.in',
-  output: 'org.gtk.gtk4.NodeEditor.appdata.xml',
-  configuration: appdata_config,
-  install_dir: gtk_appdatadir
-)
+# icons, don't install them until we decide to install gtk4-node-editor
+#icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

+#foreach size: ['scalable', 'symbolic']
+#  install_subdir('data/' + size, install_dir: icontheme_dir)
+#endforeach
--- a/demos/node-editor/node-editor-application.c
+++ b/demos/node-editor/node-editor-application.c
@@ -79,7 +79,7 @@ activate_about (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (s, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
--- a/demos/node-editor/node-editor-window.c
+++ b/demos/node-editor/node-editor-window.c
@@ -25,6 +25,7 @@

 #include "gsk/gskrendernodeparserprivate.h"
 #include "gsk/gl/gskglrenderer.h"
+#include "gsk/ngl/gsknglrenderer.h"
 #ifdef GDK_WINDOWING_BROADWAY
 #include "gsk/broadway/gskbroadwayrenderer.h"
 #endif
@@ -60,7 +61,7 @@ struct _NodeEditorWindow

  GtkWidget *renderer_listbox;
  GListStore *renderers;
-  GskRenderNode *node;
+  GdkPaintable *paintable;

  GFileMonitor *file_monitor;

@@ -167,6 +168,7 @@ static void
 text_changed (GtkTextBuffer    *buffer,
              NodeEditorWindow *self)
 {
+  GskRenderNode *node;
  char *text;
  GBytes *bytes;
  GtkTextIter iter;
@@ -177,12 +179,10 @@ text_changed (GtkTextBuffer    *buffer,
  text_buffer_remove_all_tags (self->text_buffer);
  bytes = g_bytes_new_take (text, strlen (text));

-  g_clear_pointer (&self->node, gsk_render_node_unref);
-
  /* If this is too slow, go fix the parser performance */
-  self->node = gsk_render_node_deserialize (bytes, deserialize_error_func, self);
+  node = gsk_render_node_deserialize (bytes, deserialize_error_func, self);
  g_bytes_unref (bytes);
-  if (self->node)
+  if (node)
    {
      /* XXX: Is this code necessary or can we have API to turn nodes into paintables? */
      GtkSnapshot *snapshot;
@@ -191,9 +191,10 @@ text_changed (GtkTextBuffer    *buffer,
      guint i;

      snapshot = gtk_snapshot_new ();
-      gsk_render_node_get_bounds (self->node, &bounds);
+      gsk_render_node_get_bounds (node, &bounds);
      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
-      gtk_snapshot_append_node (snapshot, self->node);
+      gtk_snapshot_append_node (snapshot, node);
+      gsk_render_node_unref (node);
      paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
      for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i++)
@@ -337,38 +338,17 @@ text_view_query_tooltip_cb (GtkWidget        *widget,
 }

 static gboolean
-load_bytes (NodeEditorWindow *self,
-            GBytes           *bytes);
-
-static void
-load_error (NodeEditorWindow *self,
-            const char        *error_message)
+load_file_contents (NodeEditorWindow *self,
+                    GFile            *file)
 {
-  PangoLayout *layout;
-  GtkSnapshot *snapshot;
-  GskRenderNode *node;
  GBytes *bytes;

-  layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), error_message);
-  pango_layout_set_width (layout, 300 * PANGO_SCALE);
-  snapshot = gtk_snapshot_new ();
-  gtk_snapshot_append_layout (snapshot, layout, &(GdkRGBA) { 0.7, 0.13, 0.13, 1.0 });
-  node = gtk_snapshot_free_to_node (snapshot);
-  bytes = gsk_render_node_serialize (node);
+  bytes = g_file_load_bytes (file, NULL, NULL, NULL);
+  if (bytes == NULL)
+    return FALSE;

-  load_bytes (self, bytes);
-
-  gsk_render_node_unref (node);
-  g_object_unref (layout);
-}
-
-static gboolean
-load_bytes (NodeEditorWindow *self,
-            GBytes           *bytes)
-{
  if (!g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
    {
-      load_error (self, "Invalid UTF-8");
      g_bytes_unref (bytes);
      return FALSE;
    }
@@ -382,110 +362,6 @@ load_bytes (NodeEditorWindow *self,
  return TRUE;
 }

-static gboolean
-load_file_contents (NodeEditorWindow *self,
-                    GFile            *file)
-{
-  GError *error = NULL;
-  GBytes *bytes;
-
-  bytes = g_file_load_bytes (file, NULL, NULL, &error);
-  if (bytes == NULL)
-    {
-      load_error (self, error->message);
-      g_clear_error (&error);
-      return FALSE;
-    }
-
-  return load_bytes (self, bytes);
-}
-
-static GdkContentProvider *
-on_picture_drag_prepare_cb (GtkDragSource    *source,
-                            double            x,
-                            double            y,
-                            NodeEditorWindow *self)
-{
-  if (self->node == NULL)
-    return NULL;
-
-  return gdk_content_provider_new_typed (GSK_TYPE_RENDER_NODE, self->node);
-}
-
-static void
-on_picture_drop_read_done_cb (GObject      *source,
-                              GAsyncResult *res,
-                              gpointer      data)
-{
-  NodeEditorWindow *self = data;
-  GOutputStream *stream = G_OUTPUT_STREAM (source);
-  GdkDrop *drop = g_object_get_data (source, "drop");
-  GdkDragAction action = 0;
-  GBytes *bytes;
-
-  if (g_output_stream_splice_finish (stream, res, NULL) >= 0)
-    {
-      bytes = g_memory_output_stream_steal_as_bytes (G_MEMORY_OUTPUT_STREAM (stream));
-      if (load_bytes (self, bytes))
-        action = GDK_ACTION_COPY;
-    }
-
-  g_object_unref (self);
-  gdk_drop_finish (drop, action);
-  g_object_unref (drop);
-  return;
-}
-
-static void
-on_picture_drop_read_cb (GObject      *source,
-                         GAsyncResult *res,
-                         gpointer      data)
-{
-  NodeEditorWindow *self = data;
-  GdkDrop *drop = GDK_DROP (source);
-  GInputStream *input;
-  GOutputStream *output;
-
-  input = gdk_drop_read_finish (drop, res, NULL, NULL);
-  if (input == NULL)
-    {
-      g_object_unref (self);
-      gdk_drop_finish (drop, 0);
-      return;
-    }
-
-  output = g_memory_output_stream_new_resizable ();
-  g_object_set_data (G_OBJECT (output), "drop", drop);
-  g_object_ref (drop);
-
-  g_output_stream_splice_async (output,
-                                input,
-                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-                                G_PRIORITY_DEFAULT,
-                                NULL,
-                                on_picture_drop_read_done_cb,
-                                self);
-  g_object_unref (output);
-  g_object_unref (input);
-}
-
-static gboolean
-on_picture_drop_cb (GtkDropTargetAsync *dest,
-                    GdkDrop            *drop,
-                    double              x,
-                    double              y,
-                    NodeEditorWindow   *self)
-{
-  gdk_drop_read_async (drop,
-                       (const char *[2]) { "application/x-gtk-render-node", NULL },
-                       G_PRIORITY_DEFAULT,
-                       NULL,
-                       on_picture_drop_read_cb,
-                       g_object_ref (self));
-
-  return TRUE;
-}
-
 static void
 file_changed_cb (GFileMonitor      *monitor,
                 GFile             *file,
@@ -505,18 +381,17 @@ node_editor_window_load (NodeEditorWindow *self,
 {
  GError *error = NULL;

-  g_clear_object (&self->file_monitor);
-
  if (!load_file_contents (self, file))
    return FALSE;

+  g_clear_object (&self->file_monitor);
  self->file_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);

+
  if (error)
    {
      g_warning ("couldn't monitor file: %s", error->message);
      g_error_free (error);
-      g_clear_object (&self->file_monitor);
    }
  else
    {
@@ -679,6 +554,7 @@ create_cairo_texture (NodeEditorWindow *self)
  GskRenderer *renderer;
  GskRenderNode *node;
  GdkTexture *texture;
+  GdkSurface *surface;

  paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture));
  if (paintable == NULL ||
@@ -691,8 +567,9 @@ create_cairo_texture (NodeEditorWindow *self)
  if (node == NULL)
    return NULL;

+  surface = gtk_native_get_surface (gtk_widget_get_native (GTK_WIDGET (self)));
  renderer = gsk_cairo_renderer_new ();
-  gsk_renderer_realize (renderer, NULL, NULL);
+  gsk_renderer_realize (renderer, surface, NULL);

  texture = gsk_renderer_render_texture (renderer, node, NULL);
  gsk_render_node_unref (node);
@@ -758,24 +635,6 @@ export_image_cb (GtkWidget        *button,
  gtk_widget_show (dialog);
 }

-static void
-clip_image_cb (GtkWidget        *button,
-               NodeEditorWindow *self)
-{
-  GdkTexture *texture;
-  GdkClipboard *clipboard;
-
-  texture = create_texture (self);
-  if (texture == NULL)
-    return;
-
-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (self));
-
-  gdk_clipboard_set_texture (clipboard, texture);
-
-  g_object_unref (texture);
-}
-
 static void
 testcase_name_entry_changed_cb (GtkWidget        *button,
                                GParamSpec       *pspec,
@@ -859,7 +718,6 @@ node_editor_window_finalize (GObject *object)

  g_array_free (self->errors, TRUE);

-  g_clear_pointer (&self->node, gsk_render_node_unref);
  g_clear_object (&self->renderers);

  G_OBJECT_CLASS (node_editor_window_parent_class)->finalize (object);
@@ -870,18 +728,16 @@ node_editor_window_add_renderer (NodeEditorWindow *self,
                                 GskRenderer      *renderer,
                                 const char       *description)
 {
+  GdkSurface *surface;
  GdkPaintable *paintable;

-  if (!gsk_renderer_realize (renderer, NULL, NULL))
-    {
-      GdkSurface *surface = gtk_native_get_surface (GTK_NATIVE (self));
-      g_assert (surface != NULL);
+  surface = gtk_native_get_surface (GTK_NATIVE (self));
+  g_assert (surface != NULL);

-      if (!gsk_renderer_realize (renderer, surface, NULL))
-        {
-          g_object_unref (renderer);
-          return;
-        }
+  if (renderer != NULL && !gsk_renderer_realize (renderer, surface, NULL))
+    {
+      g_object_unref (renderer);
+      return;
    }

  paintable = gtk_renderer_paintable_new (renderer, gtk_picture_get_paintable (GTK_PICTURE (self->picture)));
@@ -907,6 +763,9 @@ node_editor_window_realize (GtkWidget *widget)
  node_editor_window_add_renderer (self,
                                   gsk_gl_renderer_new (),
                                   "OpenGL");
+  node_editor_window_add_renderer (self,
+                                   gsk_ngl_renderer_new (),
+                                   "NGL");
 #ifdef GDK_RENDERING_VULKAN
  node_editor_window_add_renderer (self,
                                   gsk_vulkan_renderer_new (),
@@ -967,12 +826,9 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  gtk_widget_class_bind_template_callback (widget_class, open_cb);
  gtk_widget_class_bind_template_callback (widget_class, save_cb);
  gtk_widget_class_bind_template_callback (widget_class, export_image_cb);
-  gtk_widget_class_bind_template_callback (widget_class, clip_image_cb);
  gtk_widget_class_bind_template_callback (widget_class, testcase_save_clicked_cb);
  gtk_widget_class_bind_template_callback (widget_class, testcase_name_entry_changed_cb);
  gtk_widget_class_bind_template_callback (widget_class, dark_mode_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_picture_drag_prepare_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_picture_drop_cb);
 }

 static GtkWidget *
--- a/demos/node-editor/node-editor-window.ui
+++ b/demos/node-editor/node-editor-window.ui
@@ -102,7 +102,6 @@
      <object class="GtkHeaderBar" id="header">
        <child type="start">
          <object class="GtkButton">
-            <property name="focus-on-click">0</property>
            <property name="icon-name">document-open-symbolic</property>
            <property name="tooltip-text">Open node file</property>
            <signal name="clicked" handler="open_cb"/>
@@ -110,7 +109,6 @@
        </child>
        <child type="start">
          <object class="GtkButton">
-            <property name="focus-on-click">0</property>
            <property name="icon-name">document-save-symbolic</property>
            <property name="tooltip-text">Save to node file</property>
            <signal name="clicked" handler="save_cb"/>
@@ -118,30 +116,24 @@
        </child>
        <child type="start">
          <object class="GtkButton">
-            <property name="focus-on-click">0</property>
            <property name="icon-name">insert-image-symbolic</property>
            <property name="tooltip-text">Export to image</property>
            <signal name="clicked" handler="export_image_cb"/>
          </object>
        </child>
        <child type="start">
-          <object class="GtkButton">
-            <property name="focus-on-click">0</property>
-            <property name="icon-name">edit-copy-symbolic</property>
-            <property name="tooltip-text">Copy image to clipboard</property>
-            <signal name="clicked" handler="clip_image_cb"/>
+          <object class="GtkSeparator">
+            <property name="orientation">vertical</property>
          </object>
        </child>
        <child type="start">
          <object class="GtkMenuButton">
-            <property name="focus-on-click">0</property>
            <property name="label">Save Testcase</property>
            <property name="popover">testcase_popover</property>
          </object>
        </child>
        <child type="end">
          <object class="GtkMenuButton" id="gear_menu_button">
-            <property name="focus-on-click">0</property>
            <property name="valign">center</property>
            <property name="menu-model">gear_menu</property>
            <property name="icon-name">open-menu-symbolic</property>
@@ -149,7 +141,6 @@
        </child>
        <child type="end">
          <object class="GtkToggleButton" id="dark_bg_button">
-            <property name="focus-on-click">0</property>
            <property name="valign">center</property>
            <property name="has-frame">0</property>
            <property name="icon-name">display-brightness-symbolic</property>
@@ -161,10 +152,9 @@
    </child>
    <child>
      <object class="GtkPaned">
-        <property name="shrink-start-child">false</property>
        <property name="shrink-end-child">false</property>
        <property name="position">400</property>
-        <property name="start-child">
+        <child>
          <object class="GtkScrolledWindow">
            <property name="hscrollbar-policy">never</property>
            <property name="hexpand">1</property>
@@ -185,8 +175,8 @@
              </object>
            </child>
          </object>
-        </property>
-        <property name="end-child">
+        </child>
+        <child>
          <object class="GtkBox">
            <child>
              <object class="GtkScrolledWindow">
@@ -199,22 +189,8 @@
                    <child>
                      <object class="GtkPicture" id="picture">
                        <property name="can-shrink">0</property>
-                        <property name="keep-aspect-ratio">1</property>
                        <property name="halign">center</property>
                        <property name="valign">center</property>
-                        <child>
-                          <object class="GtkDragSource">
-                            <property name="actions">copy</property>
-                            <signal name="prepare" handler="on_picture_drag_prepare_cb" swapped="no"/>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkDropTargetAsync">
-                        <property name="actions">copy</property>
-                        <property name="formats">application/x-gtk-render-node</property>
-                        <signal name="drop" handler="on_picture_drop_cb" swapped="no"/>
                      </object>
                    </child>
                  </object>
@@ -232,7 +208,7 @@
              </object>
            </child>
          </object>
-        </property>
+        </child>
      </object>
    </child>
  </template>
--- a/demos/node-editor/org.gtk.gtk4.NodeEditor.appdata.xml.in
+++ b/demos/node-editor/org.gtk.gtk4.NodeEditor.appdata.xml.in
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>org.gtk.gtk4.NodeEditor</id>
-  <launchable type="desktop-id">org.gtk.gtk4.NodeEditor.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
-  <name>GTK Node Editor</name>
-  <summary>Program to edit render node files</summary>
-  <description>
-    <p>
-      GTK Node Editor is a simple application to show and edit
-      render node files.
-    </p>
-    <p>
-      Render node files can e.g. be created by the GTK inspector.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-node-editor/gtk4-node-editor.png</image>
-      <caption>Node Editor</caption>
-    </screenshot>
-  </screenshots>
-  <kudos>
-    <kudo>HiDpiIcon</kudo>
-    <kudo>ModernToolkit</kudo>
-  </kudos>
-  <url type="homepage">https://www.gtk.org</url>
-  <translation type="gettext">gtk-4.0</translation>
-  <update_contact>matthias.clasen_at_gmail.com</update_contact>
-  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
-  <releases>
-    <release version="@BUILD_VERSION@">
-      <description>
-        <p>A new build of GTK.</p>
-      </description>
-    </release>
-  </releases>
-</component>
--- a/demos/node-editor/org.gtk.gtk4.NodeEditor.desktop
+++ b/demos/node-editor/org.gtk.gtk4.NodeEditor.desktop
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Node Editor
-Comment=An application that edits render nodes
-Exec=gtk4-node-editor
-Icon=org.gtk.gtk4.NodeEditor
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
--- a/demos/print-editor/meson.build
+++ b/demos/print-editor/meson.build
@@ -3,7 +3,7 @@ executable('gtk4-print-editor',
  c_args: common_cflags,
  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
--- a/demos/print-editor/org.gtk.PrintEditor4.appdata.xml
+++ b/demos/print-editor/org.gtk.PrintEditor4.appdata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.PrintEditor4</id>
-  <launchable type="desktop-id">org.gtk.PrintEditor4.desktop</launchable>
+  <id>org.gtk.PrintEditor4.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <project_license>LGPL-2.0+</project_license>
  <name>GTK Print Editor</name>
  <summary>Program to demonstrate GTK printing</summary>
  <description>
@@ -25,7 +24,6 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
  <releases>
    <release version="3.99.0" date="2020-07-30">
      <description>
--- a/demos/print-editor/print-editor.c
+++ b/demos/print-editor/print-editor.c
@@ -42,7 +42,7 @@ update_statusbar (void)
  const char *print_str;

  gtk_statusbar_pop (GTK_STATUSBAR (statusbar), 0);
-
+  
  gtk_text_buffer_get_iter_at_mark (buffer,
                                    &iter,
                                    gtk_text_buffer_get_insert (buffer));
@@ -56,7 +56,7 @@ update_statusbar (void)
      GtkPrintOperation *op = active_prints->data;
      print_str = gtk_print_operation_get_status_string (op);
    }
-
+  
  msg = g_strdup_printf ("%d, %d%s %s",
                         row, col,
 			 file_changed?" - Modified":"",
@@ -159,7 +159,7 @@ save_file (GFile *save_filename)

  error = NULL;
  g_file_replace_contents (save_filename,
-                           text, strlen (text),
+                           text, -1,
                           NULL, FALSE,
                           G_FILE_CREATE_NONE,
                           NULL,
@@ -188,10 +188,10 @@ save_file (GFile *save_filename)
 					     "Error saving to file %s:\n%s",
 					     display_name,
 					     error->message);
-
+      
      g_signal_connect (error_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
      gtk_widget_show (error_dialog);
-
+      
      g_error_free (error);
      g_object_unref (info);
    }
@@ -229,7 +229,7 @@ begin_print (GtkPrintOperation *operation,
  pango_font_description_free (desc);

  pango_layout_set_width (print_data->layout, width * PANGO_SCALE);
-
+  
  pango_layout_set_text (print_data->layout, print_data->text, -1);

  num_lines = pango_layout_get_line_count (print_data->layout);
@@ -241,7 +241,7 @@ begin_print (GtkPrintOperation *operation,
    {
      PangoRectangle ink_rect, logical_rect;
      double line_height;
-
+      
      layout_line = pango_layout_get_line (print_data->layout, line);
      pango_layout_line_get_extents (layout_line, &ink_rect, &logical_rect);

@@ -258,7 +258,7 @@ begin_print (GtkPrintOperation *operation,

  page_breaks = g_list_reverse (page_breaks);
  gtk_print_operation_set_n_pages (operation, g_list_length (page_breaks) + 1);
-
+  
  print_data->page_breaks = page_breaks;
 }

@@ -287,11 +287,11 @@ draw_page (GtkPrintOperation *operation,
    end = pango_layout_get_line_count (print_data->layout);
  else
    end = GPOINTER_TO_INT (pagebreak->data);
-
+    
  cr = gtk_print_context_get_cairo_context (context);

  cairo_set_source_rgb (cr, 0, 0, 0);
-
+  
  i = 0;
  start_pos = 0;
  iter = pango_layout_get_iter (print_data->layout);
@@ -307,12 +307,12 @@ draw_page (GtkPrintOperation *operation,

 	  pango_layout_iter_get_line_extents (iter, NULL, &logical_rect);
 	  baseline = pango_layout_iter_get_baseline (iter);
-
+	  
 	  if (i == start)
 	    start_pos = logical_rect.y / 1024.0;
-
+	  
 	  cairo_move_to (cr, logical_rect.x / 1024.0, baseline / 1024.0 - start_pos);
-
+	  
 	  pango_cairo_show_layout_line  (cr, line);
 	}
      i++;
@@ -383,9 +383,9 @@ print_done (GtkPrintOperation *op,
    {

      GtkWidget *error_dialog;
-
+      
      gtk_print_operation_get_error (op, &error);
-
+      
      error_dialog = gtk_message_dialog_new (GTK_WINDOW (main_window),
 					     GTK_DIALOG_DESTROY_WITH_PARENT,
 					     GTK_MESSAGE_ERROR,
@@ -405,13 +405,13 @@ print_done (GtkPrintOperation *op,
  g_free (print_data->text);
  g_free (print_data->font);
  g_free (print_data);
-
+  
  if (!gtk_print_operation_is_finished (op))
    {
      g_object_ref (op);
      active_prints = g_list_append (active_prints, op);
      update_statusbar ();
-
+      
      /* This ref is unref:ed when we get the final state change */
      g_signal_connect (op, "status_changed",
 			G_CALLBACK (status_changed_cb), NULL);
@@ -628,7 +628,7 @@ activate_about (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (sysinfo, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (sysinfo, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (sysinfo, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
@@ -721,6 +721,7 @@ static const char ui_info[] =
  "        <item>"
  "          <attribute name='label'>_New</attribute>"
  "          <attribute name='action'>app.new</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;n</attribute>"
  "        </item>"
  "        <item>"
  "          <attribute name='label'>_Open</attribute>"
@@ -729,10 +730,12 @@ static const char ui_info[] =
  "        <item>"
  "          <attribute name='label'>_Save</attribute>"
  "          <attribute name='action'>app.save</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;s</attribute>"
  "        </item>"
  "        <item>"
  "          <attribute name='label'>Save _As...</attribute>"
  "          <attribute name='action'>app.save-as</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;s</attribute>"
  "        </item>"
  "      </section>"
  "      <section>"
@@ -753,6 +756,7 @@ static const char ui_info[] =
  "        <item>"
  "          <attribute name='label'>_Quit</attribute>"
  "          <attribute name='action'>app.quit</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;q</attribute>"
  "        </item>"
  "      </section>"
  "    </submenu>"
@@ -762,6 +766,7 @@ static const char ui_info[] =
  "        <item>"
  "          <attribute name='label'>_About Print Editor</attribute>"
  "          <attribute name='action'>app.about</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;a</attribute>"
  "        </item>"
  "      </section>"
  "    </submenu>"
@@ -789,15 +794,6 @@ startup (GApplication *app)
 {
  GtkBuilder *builder;
  GMenuModel *menubar;
-  struct {
-    const char *action_and_target;
-    const char *accelerators[2];
-  } accels[] = {
-    { "app.new", { "<Control>n", NULL } },
-    { "app.quit", { "<Control>q", NULL } },
-    { "app.save", { "<Control>s", NULL } },
-    { "app.about", { "<Control>a", NULL } },
-  };

  builder = gtk_builder_new ();
  gtk_builder_add_from_string (builder, ui_info, -1, NULL);
@@ -806,9 +802,6 @@ startup (GApplication *app)

  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);

-  for (int i = 0; i < G_N_ELEMENTS (accels); i++)
-    gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
-
  g_object_unref (builder);
 }

@@ -871,7 +864,7 @@ activate (GApplication *app)

  update_ui ();

-  gtk_window_present (GTK_WINDOW (main_window));
+  gtk_widget_show (main_window);
 }

 static void
--- a/demos/widget-factory/beach.jpg
+++ b/demos/widget-factory/beach.jpg
--- a/demos/widget-factory/gtk-logo.webm
+++ b/demos/widget-factory/gtk-logo.webm
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -1,84 +1,16 @@
 # demos/widget-factory

-objcopy_supports_add_symbol = false
-objcopy = find_program('objcopy', required : false)
-if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
-endif
-
-ld = find_program('ld', required : false)
-
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
-  glib_compile_resources = find_program('glib-compile-resources')
-
-  # Create the resource blob
-  widgetfactory_gresource = custom_target('widgetfactory.gresource',
-      input : 'widget-factory.gresource.xml',
-      output : 'widgetfactory.gresource',
-      depfile: 'widgetfactory.gresource.d',
-      command : [glib_compile_resources,
-                 '--generate',
-                 '--internal',
-                 '--target=@OUTPUT@',
-                 '--dependency-file=@DEPFILE@',
-                 '--sourcedir=' + meson.current_source_dir(),
-                 '--sourcedir=' + meson.current_build_dir(),
-                 '@INPUT@'])
-
-  # Create resource data file
-  widgetfactory_resources_c = custom_target('widgetfactory_resources.c',
-      input : 'widget-factory.gresource.xml',
-      output : 'widgetfactory_resources.c',
-      depfile: 'widgetfactory_resources.c.d',
-      command : [glib_compile_resources,
-                 '--generate-source',
-                 '--internal',
-                 '--target=@OUTPUT@',
-                 '--dependency-file=@DEPFILE@',
-                 '--sourcedir=' + meson.current_source_dir(),
-                 '--sourcedir=' + meson.current_build_dir(),
-                 '--external-data',
-                 '--c-name', '_g_binary_widgetfactory',
-                 '@INPUT@'])
-
-  # Create object file containing resource data
-  widgetfactory_resources_binary = custom_target('widgetfactory_resources.o',
-      input : widgetfactory_gresource,
-      output : 'widgetfactory_resources.o',
-      command : [ld,
-                 '-z', 'noexecstack',
-                 '-r',
-                 '-b','binary',
-                 '@INPUT@',
-                 '-o','@OUTPUT@'])
-
-  # Rename symbol to match the one in the C file
-  widgetfactory_resources_o = custom_target('widgetfactory_resources2.o',
-    input : widgetfactory_resources_binary,
-    output : 'widgetfactory_resources2.o',
-    command : [objcopy,
-                 '--strip-all',
-                 '--add-symbol','_g_binary_widgetfactory_resource_data=.data:0',
-                 '@INPUT@',
-                 '@OUTPUT@'])
-
-  widgetfactory_resources = [
-      widgetfactory_resources_c,
-      widgetfactory_resources_o,
-    ]
-else
-  widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
-    'widget-factory.gresource.xml',
-    source_dir: '.',
-  )
-endif
+widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
+  'widget-factory.gresource.xml',
+  source_dir: '.',
+)

 executable('gtk4-widget-factory',
  sources: ['widget-factory.c', widgetfactory_resources],
  c_args: common_cflags,
  dependencies: [ libgtk_dep, demo_conf_h ],
  include_directories: confinc,
-  win_subsystem: 'windows',
+  gui_app: true,
  link_args: extra_demo_ldflags,
  install: true,
 )
@@ -94,9 +26,4 @@ foreach size: ['scalable', 'symbolic']
 endforeach

 # appdata
-configure_file(
-  input: 'org.gtk.WidgetFactory4.appdata.xml.in',
-  output: 'org.gtk.WidgetFactory4.appdata.xml',
-  configuration: appdata_config,
-  install_dir: gtk_appdatadir
-)
+install_data('org.gtk.WidgetFactory4.appdata.xml', install_dir: gtk_appdatadir)
--- a/demos/widget-factory/nyc.jpg
+++ b/demos/widget-factory/nyc.jpg
--- a/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in
+++ b/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.WidgetFactory4</id>
-  <launchable type="desktop-id">org.gtk.WidgetFactory4.desktop</launchable>
+  <id>org.gtk.WidgetFactory4.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <project_license>LGPL-2.0+</project_license>
  <name>GTK Widget Factory</name>
  <summary>Program to demonstrate GTK functions</summary>
  <description>
@@ -32,11 +31,15 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
  <releases>
-    <release version="@BUILD_VERSION@">
+    <release version="3.99.0" date="2020-07-30">
      <description>
-        <p>A new build of GTK.</p>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
+    <release version="3.94.0" date="2018-06-25">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
      </description>
    </release>
  </releases>
--- a/demos/widget-factory/snowy.jpg
+++ b/demos/widget-factory/snowy.jpg
--- a/demos/widget-factory/sunset.jpg
+++ b/demos/widget-factory/sunset.jpg
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -50,19 +50,32 @@ change_theme_state (GSimpleAction *action,
  GtkSettings *settings = gtk_settings_get_default ();
  const char *s;
  const char *theme;
+  gboolean prefer_dark = FALSE;

  g_simple_action_set_state (action, state);

  s = g_variant_get_string (state, NULL);

-  if (strcmp (s, "default") == 0)
-    theme = "Default";
-  else if (strcmp (s, "dark") == 0)
-    theme = "Default-dark";
-  else if (strcmp (s, "hc") == 0)
-    theme = "Default-hc";
-  else if (strcmp (s, "hc-dark") == 0)
-    theme = "Default-hc-dark";
+  if (strcmp (s, "adwaita") == 0)
+    {
+      theme = "Adwaita";
+      prefer_dark = FALSE;
+    }
+  else if (strcmp (s, "adwaita-dark") == 0)
+    {
+      theme = "Adwaita";
+      prefer_dark = TRUE;
+    }
+  else if (strcmp (s, "highcontrast") == 0)
+    {
+      theme = "HighContrast";
+      prefer_dark = FALSE;
+    }
+  else if (strcmp (s, "highcontrast-inverse") == 0)
+    {
+      theme = "HighContrastInverse";
+      prefer_dark = FALSE;
+    }
  else if (strcmp (s, "current") == 0)
    {
      gtk_settings_reset_property (settings, "gtk-theme-name");
@@ -74,25 +87,10 @@ change_theme_state (GSimpleAction *action,

  g_object_set (G_OBJECT (settings),
                "gtk-theme-name", theme,
-                "gtk-application-prefer-dark-theme", FALSE,
+                "gtk-application-prefer-dark-theme", prefer_dark,
                NULL);
 }

-static void
-change_fullscreen (GSimpleAction *action,
-                   GVariant      *state,
-                   gpointer       user_data)
-{
-  GtkWindow *window = user_data;
-
-  if (g_variant_get_boolean (state))
-    gtk_window_fullscreen (window);
-  else
-    gtk_window_unfullscreen (window);
-
-  g_simple_action_set_state (action, state);
-}
-
 static GtkWidget *page_stack;

 static void
@@ -298,7 +296,7 @@ activate_about (GSimpleAction *action,
                          glib_micro_version);
  g_string_append_printf (s, "\tPango\t%s\n",
                          pango_version_string ());
-  g_string_append_printf (s, "\tGTK \t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
@@ -399,7 +397,7 @@ print_operation_done (GtkPrintOperation       *op,
      g_clear_error (&error);
      break;
    case GTK_PRINT_OPERATION_RESULT_APPLY:
-      break;
+      break; 
    case GTK_PRINT_OPERATION_RESULT_CANCEL:
      g_print ("Printing was canceled\n");
      break;
@@ -711,37 +709,6 @@ on_range_to_changed (GtkSpinButton *to)
    gtk_spin_button_set_value (from, v2);
 }

-static GdkContentProvider *
-on_picture_drag_prepare (GtkDragSource *source,
-                         double         x,
-                         double         y,
-                         gpointer       unused)
-{
-  GtkWidget *picture;
-
-  picture = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-
-  return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, gtk_picture_get_paintable (GTK_PICTURE (picture)));
-}
-
-static gboolean
-on_picture_drop (GtkDropTarget *dest,
-                 const GValue  *value,
-                 double         x,
-                 double         y,
-                 gpointer       unused)
-{
-  GtkWidget *picture;
-  GdkPaintable *paintable;
-
-  picture = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
-  paintable = g_value_get_object (value);
-
-  gtk_picture_set_paintable (GTK_PICTURE (picture), paintable);
-
-  return TRUE;
-}
-
 static void
 info_bar_response (GtkWidget *infobar, int response_id)
 {
@@ -1228,7 +1195,7 @@ populate_flowbox (GtkWidget *flowbox)
  GtkWidget *child;
  int i;
  const char *resources[] = {
-    "sunset.jpg", "portland-rose.jpg", "beach.jpg", "nyc.jpg"
+    "sunset.jpg", "snowy.jpg", "portland-rose.jpg"
  };

  if (GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (flowbox), "populated")))
@@ -1919,7 +1886,6 @@ set_up_context_popover (GtkWidget *widget,
  gtk_widget_set_parent (popover, widget);
  gtk_popover_set_has_arrow (GTK_POPOVER (popover), FALSE);
  gesture = gtk_gesture_click_new ();
-  gtk_event_controller_set_name (GTK_EVENT_CONTROLLER (gesture), "widget-factory-context-click");
  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
  g_signal_connect (gesture, "pressed", G_CALLBACK (clicked_cb), popover);
  gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (gesture));
@@ -2027,12 +1993,11 @@ activate (GApplication *app)
  GMenuModel *model;
  static GActionEntry win_entries[] = {
    { "dark", NULL, NULL, "false", change_dark_state },
-    { "theme", NULL, "s", "'current'", change_theme_state },
+    { "theme", NULL, "s", "'current'", change_theme_state }, 
    { "transition", NULL, NULL, "true", change_transition_state },
    { "search", activate_search, NULL, NULL, NULL },
    { "delete", activate_delete, NULL, NULL, NULL },
    { "busy", get_busy, NULL, NULL, NULL },
-    { "fullscreen", NULL, NULL, "false", change_fullscreen },
    { "background", activate_background, NULL, NULL, NULL },
    { "open", activate_open, NULL, NULL, NULL },
    { "record", activate_record, NULL, NULL, NULL },
@@ -2044,7 +2009,6 @@ activate (GApplication *app)
    const char *accelerators[2];
  } accels[] = {
    { "app.about", { "F1", NULL } },
-    { "app.shortcuts", { "<Control>question", NULL } },
    { "app.quit", { "<Control>q", NULL } },
    { "app.open-in", { "<Control>n", NULL } },
    { "win.dark", { "<Control>d", NULL } },
@@ -2053,7 +2017,6 @@ activate (GApplication *app)
    { "win.open", { "<Control>o", NULL } },
    { "win.record", { "<Control>r", NULL } },
    { "win.lock", { "<Control>l", NULL } },
-    { "win.fullscreen", { "F11", NULL } },
  };
  struct {
    const char *action_and_target;
@@ -2088,8 +2051,6 @@ activate (GApplication *app)
          "on_page_combo_changed", (GCallback)on_page_combo_changed,
          "on_range_from_changed", (GCallback)on_range_from_changed,
          "on_range_to_changed", (GCallback)on_range_to_changed,
-          "on_picture_drag_prepare", (GCallback)on_picture_drag_prepare,
-          "on_picture_drop", (GCallback)on_picture_drop,
          "tab_close_cb", (GCallback)tab_close_cb,
          "increase_icon_size", (GCallback)increase_icon_size,
          "decrease_icon_size", (GCallback)decrease_icon_size,
@@ -2199,7 +2160,7 @@ activate (GApplication *app)
  g_object_set_data (G_OBJECT (window), "searchbar", widget);

  widget = (GtkWidget *)gtk_builder_get_object (builder, "infobar");
-  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL);
+  g_signal_connect (widget, "response", G_CALLBACK (info_bar_response), NULL); 
  g_object_set_data (G_OBJECT (window), "infobar", widget);

  dialog = (GtkWidget *)gtk_builder_get_object (builder, "info_dialog");
@@ -2360,7 +2321,7 @@ activate (GApplication *app)
  model = (GMenuModel *)gtk_builder_get_object (builder, "new_style_context_menu_model");
  set_up_context_popover (widget, model);

-  gtk_window_present (window);
+  gtk_widget_show (GTK_WIDGET (window));

  g_object_unref (builder);
 }
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -115,8 +115,7 @@
  <gresource prefix="/org/gtk/WidgetFactory4">
    <file>gtk-logo.webm</file>
    <file>sunset.jpg</file>
+    <file>snowy.jpg</file>
    <file>portland-rose.jpg</file>
-    <file>nyc.jpg</file>
-    <file>beach.jpg</file>
  </gresource>
 </gresources>
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	e74e7766d1	Implement dashed and dotted underlines This is implementing new support in Pango for rendering dashed and dotted lines. This is currently using a linear gradient for dashes and a repeat node for dots.	2021-03-31 18:57:03 -04:00
Matthias Clasen	3973a14c07	cellrenderertext: Quiet compiler warnings Handle new values of the PangoUnderline enumeration.	2021-03-31 18:57:03 -04:00
Matthias Clasen	68ab1576ce	atspipango: Quiet compiler warnings Handle new values of the PangoUnderline enum.	2021-03-31 18:57:03 -04:00
Matthias Clasen	8713aa911b	Add missing overline color support This was overlooked when overlines were added. Without this, overlines will come out in the the wrong color.	2021-03-31 17:51:16 -04:00