Flip gl textures when used in the gl renderer

2018-01-17 13:42:19 -05:00
1271 changed files with 104754 additions and 107591 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,63 +0,0 @@
-stages:
-  - build
-  - flatpak
-
-.cache-paths: &cache-paths
-  paths:
-    - _ccache/
-    - subprojects/gdk-pixbuf/
-    - subprojects/glib/
-    - subprojects/graphene/
-    - subprojects/libepoxy/
-    - subprojects/pango/
-
-fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v1
-  stage: build
-  script:
-    - bash -x ./.gitlab-ci/test-docker.sh
-  artifacts:
-    when: on_failure
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-  cache:
-    key: "$CI_JOB_NAME"
-    <<: *cache-paths
-
-.mingw-defaults: &mingw-defaults
-  stage: build
-  tags:
-    - win32
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
-  cache:
-    key: "%CI_JOB_NAME%"
-    <<: *cache-paths
-
-msys2-mingw32:
-  variables:
-    MSYSTEM: "MINGW32"
-    CHERE_INVOKING: "yes"
-  <<: *mingw-defaults
-
-.flatpak-defaults: &flatpak-defaults
-  image: registry.gitlab.com/alatiera/gnome-nightly-oci/gnome-master:latest
-  stage: flatpak
-  artifacts:
-    paths:
-      - "${APPID}-dev.flatpak"
-    expire_in: 1 day
-  script:
-    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
-
-flatpak:demo:
-  variables:
-    APPID: org.gtk.Demo
-  <<: *flatpak-defaults
-
-flatpak:widget-factory:
-  variables:
-    APPID: org.gtk.WidgetFactory
-  <<: *flatpak-defaults
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,79 +0,0 @@
-FROM fedora:28
-
-RUN dnf -y install \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    colord-devel \
-    cups-devel \
-    desktop-file-utils \
-    elfutils-libelf-devel \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    git \
-    glib2-devel \
-    glibc-devel \
-    glibc-headers \
-    gobject-introspection-devel \
-    graphene-devel \
-    gstreamer1-devel \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-base-devel \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    libattr-devel \
-    libepoxy-devel \
-    libffi-devel \
-    libmount-devel \
-    librsvg2 \
-    libselinux-devel \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    libxslt \
-    mesa-dri-drivers \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    ninja-build \
-    pango-devel \
-    pcre-devel \
-    python3 \
-    python3-pip \
-    python3-wheel \
-    redhat-rpm-config \
-    sassc \
-    systemtap-sdt-devel \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    which \
-    xorg-x11-server-Xvfb \
- && dnf clean all
-
-RUN pip3 install meson
-
-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/flatpak-build.sh
+++ b/.gitlab-ci/flatpak-build.sh
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -e
-
-appid=$1
-
-builddir=app
-repodir=repo
-
-flatpak-builder \
-        --stop-at=gtk \
-        ${builddir} \
-        build-aux/flatpak/${appid}.json
-
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        meson \
-                --prefix /app \
-                --libdir /app/lib \
-                --buildtype debug \
-                -Dx11-backend=true \
-                -Dwayland-backend=true \
-                -Dprint-backends=file \
-                -Dbuild-tests=false \
-                -Dbuild-examples=false \
-                -Dintrospection=false \
-                -Ddemos=true \
-                _build .
-
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        ninja -C _build install
-
-flatpak-builder \
-        --finish-only \
-        --repo=${repodir} \
-        ${builddir} \
-        build-aux/flatpak/${appid}.json
-
-flatpak build-bundle \
-        ${repodir} \
-        ${appid}-dev.flatpak \
-        --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \
-        ${appid}
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v1"
-
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
-    --file "Dockerfile" .
-sudo docker run --rm --security-opt label=disable \
-    --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "${TAG}" bash
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-
-srcdir=$(pwd)
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-ccache --zero-stats
-ccache --show-stats
-export CCACHE_DISABLE=true
-meson \
-        -Dx11-backend=true \
-        -Dwayland-backend=true \
-        -Dbroadway-backend=true \
-        -Dvulkan=yes \
-        _build $srcdir
-unset CCACHE_DISABLE
-
-cd _build
-
-ninja
-ccache --show-stats
-
-xvfb-run -a -s "-screen 0 1024x768x24" \
-    meson test \
-        --print-errorlogs \
-        --suite=gtk+ \
-        --no-suite=gtk+:gsk \
-        --no-suite=gtk+:a11y
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ "$MSYSTEM" == "MINGW32" ]]; then
-    export MSYS2_ARCH="i686"
-else
-    export MSYS2_ARCH="x86_64"
-fi
-
-# Update everything
-pacman --noconfirm -Suy
-
-# Install the required packages
-pacman --noconfirm -S --needed \
-    base-devel \
-    git \
-    mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-pkg-config \
-    mingw-w64-$MSYS2_ARCH-gobject-introspection \
-    mingw-w64-$MSYS2_ARCH-meson \
-    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
-    mingw-w64-$MSYS2_ARCH-atk \
-    mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-gdk-pixbuf2 \
-    mingw-w64-$MSYS2_ARCH-glib2 \
-    mingw-w64-$MSYS2_ARCH-graphene \
-    mingw-w64-$MSYS2_ARCH-json-glib \
-    mingw-w64-$MSYS2_ARCH-libepoxy \
-    mingw-w64-$MSYS2_ARCH-pango \
-    mingw-w64-$MSYS2_ARCH-fribidi \
-    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-# Build
-ccache --zero-stats
-ccache --show-stats
-export CCACHE_DISABLE=true
-meson \
-    -Denable-x11-backend=false \
-    -Denable-wayland-backend=false \
-    -Denable-win32-backend=true \
-    _build
-unset CCACHE_DISABLE
-
-ninja -C _build
-ccache --show-stats
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,36 +0,0 @@
-## Steps to reproduce
-
- 1. ...
- 2. ...
- 3. ...
-
-<!--
-  You should try and reproduce with the demos applications available
-  under the `demos` directory, or the test programs in the `tests` directory.
-  Alternatively, please attach a *small and self-contained* example that
-  exhibits the issue.
-->
-
-## Current behavior
-<!--
-  Please describe the current behaviour
-->
-
-## Expected outcome
-<!--
-  Please describe the expected outcome
-->
-
-## Version information
-<!--
- - Which version of GTK+ you are using
- - What operating system and version
-  - For Linux, which distribution
- - If you built GTK+ yourself, the list of options used to configure the build
-->
-
-## Additional information
-<!--
- - Screenshots or screen recordings are useful for visual errors
- - Please report any warning or message printed on the terminal
-->
--- a/.gitlab/issue_templates/Crash.md
+++ b/.gitlab/issue_templates/Crash.md
@@ -1,34 +0,0 @@
-## Steps to reproduce
-
- 1. ...
- 2. ...
- 3. ...
-
-<!--
-  You should try and reproduce with the demos applications available
-  under the `demos` directory, or the test programs in the `tests` directory.
-  Alternatively, please attach a *small and self-contained* example that
-  exhibits the issue.
-->
-
-## Version information
-<!--
- - Which version of GTK+ you are using
- - What operating system and version
-  - for Linux, which distribution
- - If you built GTK+ yourself, the list of options used to configure the build
-->
-
-## Warnings
-<!--
- - If the application generates warning messages before crashing please
-   report them here
-->
-
-## Backtrace
-<!--
- - Attaching a stack trace obtained using GDB is appreciated; follow the
-   instructions on the wiki:
-
-   https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces
-->
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,41 +1,30 @@
 If you want to hack on the GTK+ project, you'll need to have the development
 tools appropriate for your operating system, including:

- - Python 3.x
- - Meson
- - Ninja
- - Gettext (19.7 or newer)
- - a C99 compatible compiler
+	- Python (2.7 or 3.x)
+	- Meson
+	- Ninja
+	- Gettext (19.7 or newer)
+	- a C99 compatible compiler

 Up-to-date instructions about developing GNOME applications and libraries
 can be found here:

- * https://developer.gnome.org
+        https://developer.gnome.org

-Information about using GitLab with GNOME can be found here:
+Information about using git with GNOME can be found here:

- * https://wiki.gnome.org/GitLab
+        https://wiki.gnome.org/Git

 In order to get Git GTK+ installed on your system, you need to have the
 required versions of all the GTK+ dependencies; typically, this means a
-recent version of GLib, Cairo, Pango, and ATK, as well as the platform
-specific dependencies for the windowing system you are using (Wayland, X11,
-Windows, or macOS).
+recent version of GLib, Cairo, Pango, and ATK.

-You should start by forking the GTK repository from the GitLab web UI, and
-cloning from your fork:
-
-```ssh
-$ git clone https://gitlab.gnome.org/yourusername/gtk.git
-$ cd gtk
-```
-
-**Note**: if you plan to push changes to back to the main repository and
-have a GNOME account, you can skip the fork, and use the following instead:
+**Note**: if you plan to push changes to back to the master repository and
+have a GNOME account, you want to use the following instead:

 ```sh
-$ git clone git@gitlab.gnome.org:GNOME/gtk.git
-$ cd gtk
+$ git clone ssh://<username>@git.gnome.org/git/gtk+
 ```

 To compile the Git version of GTK+ on your system, you will need to
@@ -43,23 +32,9 @@ configure your build using Meson:

 ```sh
 $ meson _builddir .
-$ cd _builddir
-$ ninja
 ```

-**Note**: For information about submitting patches and pushing changes
-to Git, see the `README.md` and `README.commits` files. In particular,
-don't, under any circumstances, push anything to Git before reading and
-understanding `README.commmits`.
-
-Typically, you should work on your own branch:
-
-```sh
-$ git checkout -b your-branch
-```
-
-Once you've finished working on the bug fix or feature, push the branch
-to the Git repository and open a new merge request, to let the GTK
-maintainers review your contribution. The [CODE-OWNERS](./docs-CODE-OWNERS)
-document contains the list of core contributors to GTK and the areas for
-which they are responsible.
+For information about submitting patches and pushing changes to Git, see the
+`README.md` and `README.commits` files. In particular, don't, under any
+circumstances, push anything to Git before reading and understanding
+`README.commmits`.
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 GTK+ — The GTK toolkit
 ======================

-[![Build Status](https://gitlab.gnome.org/GNOME/gtk/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/gtk/pipelines)
-
 General information
 -------------------

@@ -36,8 +34,8 @@ Building and installing

 In order to build GTK+ you will need:

-  - [a C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
-  - [Python 3](https://www.python.org/)
+  - a C99 compatible compiler
+  - Python 3
  - [Meson](http://mesonbuild.com)
  - [Ninja](https://ninja-build.org)

@@ -61,10 +59,10 @@ If you are building the X11 backend, you will also need:
    - xrender
    - xi
    - xext
-    - xfixes
-    - xcursor
-    - xdamage
-    - xcomposite
+    - xfixes (optional)
+    - xcursor (optional)
+    - xdamage (optional)
+    - xcomposite (optional)
  - [atk-bridge-2.0](https://download.gnome.org/sources/at-spi2-atk)

 If you are building the Wayland backend, you will also need:
@@ -107,7 +105,8 @@ Or [online](https://developer.gnome.org/gtk4/stable/gtk-building.html)
 How to report bugs
 ------------------

-Bugs should be reported on the [issues page](https://gitlab.gnome.org/GNOME/gtk/issues/new).
+Bugs should be reported to the GNOME [bug tracking system](https://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2b).
+You will need an account for yourself.

 In the bug report please include:

@@ -122,12 +121,11 @@ In the bug report please include:

 * How to reproduce the bug.

-  If you can reproduce it with one of the demo applications that are
-  built in the demos/ subdirectory, on one of the test programs that
-  are built in the tests/ subdirectory, that will be most convenient.
-  Otherwise, please include a short test program that exhibits the
-  behavior. As a last resort, you can also provide a pointer to a
-  larger piece of software that can be downloaded.
+  If you can reproduce it with one of the test programs that are built
+  in the tests/ subdirectory, that will be most convenient.  Otherwise,
+  please include a short test program that exhibits the behavior.
+  As a last resort, you can also provide a pointer to a larger piece
+  of software that can be downloaded.

 * If the bug was a crash, the exact text that was printed out
  when the crash occurred.
@@ -135,6 +133,24 @@ In the bug report please include:
 * Further information such as stack traces may be useful, but
  is not necessary.

+
+Contributing
+------------
+
+Patches should also be submitted to the bug tracking system. If the patch
+fixes an existing bug, add the patch as an attachment to that bug report;
+otherwise, enter a new bug report that describes the patch, and attach the
+patch to that bug report.
+
+Patches should be in Git-formatted form. You should use `git format-patch`
+to generate them. We recommend using [git-bz](http://git.fishsoup.net/man/git-bz.html).
+
+For more information on the recommended workflow, please read
+[this wiki page](https://wiki.gnome.org/Git/WorkingWithPatches).
+
+Please, follow the `CODING_STYLE` document in order to conform to GTK+'s
+coding style when submitting a code contribution.
+
 Release notes
 -------------

--- a/build-aux/flatpak/org.gtk.Demo.json
+++ b/build-aux/flatpak/org.gtk.Demo.json
@@ -1,73 +0,0 @@
-{
-    "app-id": "org.gtk.Demo",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-demo",
-    "tags": ["devel", "development", "nightly"],
-    "rename-desktop-file": "gtk4-demo.desktop",
-    "rename-icon": "gtk4-demo",
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name": "graphene",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name": "gtk",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}
--- a/build-aux/flatpak/org.gtk.WidgetFactory.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory.json
@@ -1,73 +0,0 @@
-{
-    "app-id": "org.gtk.WidgetFactory",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-widget-factory",
-    "tags": ["devel", "development", "nightly"],
-    "rename-desktop-file": "gtk4-widget-factory.desktop",
-    "rename-icon": "gtk4-widget-factory",
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name": "graphene",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name": "gtk",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}
--- a/build-aux/meson/post-install.sh
+++ b/build-aux/meson/post-install.sh
@@ -16,11 +16,6 @@ if [ -z "$DESTDIR" ]; then
  echo Updating icon cache...
  gtk-update-icon-cache -q -t -f ${gtk_datadir}/icons/hicolor

-  echo Updating module cache for print backends...
-  mkdir -p ${gtk_libdir}/gtk-4.0/4.0.0/printbackends
-  gio-querymodules ${gtk_libdir}/gtk-4.0/4.0.0/printbackends
-
-  echo Updating module cache for input methods...
-  mkdir -p ${gtk_libdir}/gtk-4.0/4.0.0/immodules
-  gio-querymodules ${gtk_libdir}/gtk-4.0/4.0.0/immodules
+  echo Updating input method modules cache...
+  gtk4-query-immodules > ${gtk_libdir}/gtk-${gtk_api_version}/${gtk_abi_version}/immodules.cache
 fi
--- a/config.h.meson
+++ b/config.h.meson
@@ -41,9 +41,6 @@
 /* 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

@@ -56,9 +53,6 @@
 /* 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 `httpGetAuthString' function. */
 #mesondefine HAVE_HTTPGETAUTHSTRING

--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -457,26 +457,27 @@ demo_application_window_constructed (GObject *object)
 static void
 demo_application_window_size_allocate (GtkWidget           *widget,
                                       const GtkAllocation *allocation,
-                                       int                  baseline)
+                                       int                  baseline,
+                                       GtkAllocation       *out_clip)
 {
  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;

  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget, allocation,
-                                                                          baseline);
+                                                                          baseline, out_clip);

  if (!window->maximized && !window->fullscreen)
    gtk_window_get_size (GTK_WINDOW (window), &window->width, &window->height);
 }

 static void
-surface_state_changed (GtkWidget *widget)
+window_state_changed (GtkWidget *widget)
 {
  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-  GdkSurfaceState new_state;
+  GdkWindowState new_state;

-  new_state = gdk_surface_get_state (gtk_widget_get_surface (widget));
-  window->maximized = (new_state & GDK_SURFACE_STATE_MAXIMIZED) != 0;
-  window->fullscreen = (new_state & GDK_SURFACE_STATE_FULLSCREEN) != 0;
+  new_state = gdk_window_get_state (gtk_widget_get_window (widget));
+  window->maximized = (new_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+  window->fullscreen = (new_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
 }

 static void
@@ -484,15 +485,15 @@ demo_application_window_realize (GtkWidget *widget)
 {
  GTK_WIDGET_CLASS (demo_application_window_parent_class)->realize (widget);

-  g_signal_connect_swapped (gtk_widget_get_surface (widget), "notify::state",
-                            G_CALLBACK (surface_state_changed), widget);
+  g_signal_connect_swapped (gtk_widget_get_window (widget), "notify::state",
+                            G_CALLBACK (window_state_changed), widget);
 }

 static void
 demo_application_window_unrealize (GtkWidget *widget)
 {
-  g_signal_handlers_disconnect_by_func (gtk_widget_get_surface (widget),
-                                        surface_state_changed, widget);
+  g_signal_handlers_disconnect_by_func (gtk_widget_get_window (widget),
+                                        window_state_changed, widget);

  GTK_WIDGET_CLASS (demo_application_window_parent_class)->unrealize (widget);
 }
--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -7,29 +7,35 @@
    <property name="icon-name">document-open</property>
    <child>
      <object class="GtkGrid">
+        <property name="visible">1</property>
        <child>
          <object class="GtkToolbar">
+            <property name="visible">1</property>
            <property name="hexpand">1</property>
            <style>
              <class name="primary-toolbar"/>
            </style>
            <child>
              <object class="GtkMenuToolButton" id="menutool">
+                <property name="visible">1</property>
                <property name="icon-name">document-open</property>
              </object>
            </child>
            <child>
              <object class="GtkToolButton">
+                <property name="visible">1</property>
                <property name="icon-name">application-exit</property>
                <property name="action-name">app.quit</property>
              </object>
            </child>
            <child>
              <object class="GtkSeparatorToolItem">
+                <property name="visible">1</property>
              </object>
            </child>
            <child>
              <object class="GtkToolButton">
+                <property name="visible">1</property>
                <property name="icon-name">applications-other</property>
                <property name="action-name">win.logo</property>
              </object>
@@ -48,6 +54,7 @@
              <object class="GtkBox" id="content_area">
                <child>
                  <object class="GtkLabel" id="message">
+                    <property name="visible">1</property>
                    <property name="hexpand">1</property>
                  </object>
                </child>
@@ -57,9 +64,10 @@
              <object class="GtkBox">
                <child>
                  <object class="GtkButton">
+                    <property name="visible">1</property>
                    <property name="valign">center</property>
                    <property name="label" translatable="yes">_OK</property>
-                    <property name="use-underline">1</property>
+                    <property name="use_underline">1</property>
                    <signal name="clicked" handler="clicked_cb"/>
                  </object>
                </child>
@@ -73,9 +81,11 @@
        </child>
        <child>
          <object class="GtkScrolledWindow">
+            <property name="visible">1</property>
            <property name="shadow-type">in</property>
            <child>
              <object class="GtkTextView">
+                <property name="visible">1</property>
                <property name="hexpand">1</property>
                <property name="vexpand">1</property>
                <property name="buffer">buffer</property>
@@ -90,6 +100,7 @@
        <child>
          <object class="GtkStatusbar" id="status">
            <property name="hexpand">1</property>
+            <property name="visible">1</property>
          </object>
          <packing>
            <property name="left-attach">0</property>
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -2,16 +2,21 @@
 <interface>
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkWindow" id="window">
-    <property name="resizable">0</property>
+    <property name="can_focus">False</property>
+    <property name="resizable">False</property>
    <property name="title">CSS Blend Modes</property>
-    <property name="default-width">400</property>
-    <property name="default-height">300</property>
+    <property name="default_width">400</property>
+    <property name="default_height">300</property>
    <child>
      <object class="GtkGrid">
-        <property name="row-spacing">12</property>
-        <property name="column-spacing">12</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="row_spacing">12</property>
+        <property name="column_spacing">12</property>
        <child>
          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
            <property name="label" translatable="yes">Blend mode:</property>
            <property name="xalign">0</property>
            <style>
@@ -19,108 +24,128 @@
            </style>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="can-focus">1</property>
-            <property name="vexpand">1</property>
-            <property name="shadow-type">in</property>
-            <property name="min-content-width">150</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="vexpand">True</property>
+            <property name="shadow_type">in</property>
+            <property name="min_content_width">150</property>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkStackSwitcher">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
            <property name="halign">center</property>
-            <property name="hexpand">1</property>
+            <property name="hexpand">True</property>
            <property name="stack">stack</property>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkStack" id="stack">
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="hhomogeneous">0</property>
-            <property name="vhomogeneous">0</property>
-            <property name="transition-type">crossfade</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="hhomogeneous">False</property>
+            <property name="vhomogeneous">False</property>
+            <property name="transition_type">crossfade</property>
            <child>
              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                <property name="halign">center</property>
                <property name="valign">center</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">12</property>
-                <property name="column-spacing">12</property>
+                <property name="hexpand">False</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">12</property>
+                <property name="column_spacing">12</property>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">Duck</property>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">Background</property>
                  </object>
                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <style>
                      <class name="duck"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <style>
                      <class name="gradient"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">
 Blended picture</property>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
                    <property name="width">2</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="halign">center</property>
                    <style>
                      <class name="blend0"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
                    <property name="width">2</property>
                  </packing>
                </child>
@@ -132,72 +157,87 @@ Blended picture</property>
            </child>
            <child>
              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                <property name="halign">center</property>
                <property name="valign">center</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">12</property>
-                <property name="column-spacing">12</property>
+                <property name="hexpand">False</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">12</property>
+                <property name="column_spacing">12</property>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">Red</property>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">Blue</property>
                  </object>
                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <style>
                      <class name="red"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <style>
                      <class name="blue"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">
 Blended picture</property>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
                    <property name="width">2</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="halign">center</property>
                    <style>
                      <class name="blend1"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
                    <property name="width">2</property>
                  </packing>
                </child>
@@ -209,59 +249,71 @@ Blended picture</property>
            </child>
            <child>
              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                <property name="halign">center</property>
                <property name="valign">center</property>
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <property name="row-spacing">6</property>
-                <property name="column-spacing">12</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <style>
                      <class name="cyan"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <style>
                      <class name="magenta"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">1</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <style>
                      <class name="yellow"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="halign">center</property>
                    <style>
                      <class name="blend2"/>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">3</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">Cyan</property>
                    <property name="xalign">0</property>
                    <style>
@@ -269,12 +321,14 @@ Blended picture</property>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">Magenta</property>
                    <property name="xalign">0</property>
                    <style>
@@ -282,12 +336,14 @@ Blended picture</property>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">0</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">Yellow</property>
                    <property name="xalign">0</property>
                    <style>
@@ -295,12 +351,14 @@ Blended picture</property>
                    </style>
                  </object>
                  <packing>
-                    <property name="left-attach">0</property>
-                    <property name="top-attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes">Blended picture</property>
                    <property name="xalign">0</property>
                    <attributes>
@@ -308,8 +366,8 @@ Blended picture</property>
                    </attributes>
                  </object>
                  <packing>
-                    <property name="left-attach">1</property>
-                    <property name="top-attach">2</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
                  </packing>
                </child>
              </object>
@@ -320,13 +378,14 @@ Blended picture</property>
            </child>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
      </object>
    </child>
    <child type="titlebar">
+      <placeholder/>
    </child>
  </object>
 </interface>
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -68,19 +68,19 @@ enum
 static GtkWidget *
 find_toplevel_at_pointer (GdkDisplay *display)
 {
-  GdkSurface *pointer_window;
+  GdkWindow *pointer_window;
  GtkWidget *widget = NULL;

-  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (),
+  pointer_window = gdk_device_get_window_at_position (gtk_get_current_event_device (),
                                                      NULL, NULL);

-  /* The user data field of a GdkSurface is used to store a pointer
+  /* The user data field of a GdkWindow is used to store a pointer
   * to the widget that created it.
   */
  if (pointer_window)
    {
      gpointer widget_ptr;
-      gdk_surface_get_user_data (pointer_window, &widget_ptr);
+      gdk_window_get_user_data (pointer_window, &widget_ptr);
      widget = widget_ptr;
    }

@@ -128,7 +128,7 @@ query_for_toplevel (GdkDisplay *display,
  device = gtk_get_current_event_device ();

  if (gdk_seat_grab (gdk_device_get_seat (device),
-                     gtk_widget_get_surface (popup),
+                     gtk_widget_get_window (popup),
                     GDK_SEAT_CAPABILITY_ALL_POINTING,
                     FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
    {
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -93,8 +93,8 @@ paste_button_clicked (GtkWidget *button,
  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
 }

-static GdkPaintable *
-get_image_paintable (GtkImage *image)
+static GdkTexture *
+get_image_texture (GtkImage *image)
 {
  const gchar *icon_name;
  GtkIconTheme *icon_theme;
@@ -102,15 +102,15 @@ get_image_paintable (GtkImage *image)

  switch (gtk_image_get_storage_type (image))
    {
-    case GTK_IMAGE_PAINTABLE:
-      return g_object_ref (gtk_image_get_paintable (image));
+    case GTK_IMAGE_TEXTURE:
+      return g_object_ref (gtk_image_get_texture (image));
    case GTK_IMAGE_ICON_NAME:
      icon_name = gtk_image_get_icon_name (image);
      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
      icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, 48, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
      if (icon_info == NULL)
        return NULL;
-      return GDK_PAINTABLE (gtk_icon_info_load_texture (icon_info));
+      return gtk_icon_info_load_texture (icon_info);
    default:
      g_warning ("Image storage type %d not handled",
                 gtk_image_get_storage_type (image));
@@ -123,14 +123,11 @@ drag_begin (GtkWidget      *widget,
            GdkDragContext *context,
            gpointer        data)
 {
-  GdkPaintable *paintable;
+  GdkTexture *texture;

-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (paintable)
-    {
-      gtk_drag_set_icon_paintable (context, paintable, -2, -2);
-      g_object_unref (paintable);
-    }
+  texture = get_image_texture (GTK_IMAGE (widget));
+  if (texture)
+    gtk_drag_set_icon_texture (context, texture, -2, -2);
 }

 void
@@ -141,11 +138,11 @@ drag_data_get (GtkWidget        *widget,
               guint             time,
               gpointer          data)
 {
-  GdkPaintable *paintable;
+  GdkTexture *texture;

-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (GDK_IS_TEXTURE (paintable))
-    gtk_selection_data_set_texture (selection_data, GDK_TEXTURE (paintable));
+  texture = get_image_texture (GTK_IMAGE (widget));
+  if (texture)
+    gtk_selection_data_set_texture (selection_data, texture);
 }

 static void
@@ -160,7 +157,7 @@ drag_data_received (GtkWidget        *widget,
      GdkTexture *texture;

      texture = gtk_selection_data_get_texture (selection_data);
-      gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
+      gtk_image_set_from_texture (GTK_IMAGE (data), texture);
      g_object_unref (texture);
    }
 }
@@ -170,16 +167,16 @@ copy_image (GtkMenuItem *item,
            gpointer     data)
 {
  GdkClipboard *clipboard;
-  GdkPaintable *paintable;
+  GdkTexture *texture;

  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  paintable = get_image_paintable (GTK_IMAGE (data));
+  texture = get_image_texture (GTK_IMAGE (data));

-  if (GDK_IS_TEXTURE (paintable))
-    gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
-
-  if (paintable)
-    g_object_unref (paintable);
+  if (texture)
+    {
+      gdk_clipboard_set_texture (clipboard, texture);
+      g_object_unref (texture);
+    }
 }

 static void
@@ -193,7 +190,7 @@ paste_image_received (GObject      *source,
  if (texture == NULL)
    return;
    
-  gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
+  gtk_image_set_from_texture (GTK_IMAGE (data), texture);
  g_object_unref (texture);
 }

--- a/demos/gtk-demo/cursors.ui
+++ b/demos/gtk-demo/cursors.ui
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -121,7 +121,6 @@
  <gresource prefix="/images">
    <file>alphatest.png</file>
    <file>floppybuddy.gif</file>
-    <file>gtk-logo.webm</file>
  </gresource>
  <gresource prefix="/pixbufs">
    <file>apple-red.png</file>
@@ -181,11 +180,7 @@
    <file>modelbutton.c</file>
    <file>overlay.c</file>
    <file>overlay2.c</file>
-    <file>paint.c</file>
    <file>pagesetup.c</file>
-    <file>paintable.c</file>
-    <file>paintable_animated.c</file>
-    <file>paintable_mediastream.c</file>
    <file>panes.c</file>
    <file>pickers.c</file>
    <file>pixbufs.c</file>
@@ -206,10 +201,10 @@
    <file>textview.c</file>
    <file>textscroll.c</file>
    <file>theming_style_classes.c</file>
+    <file>toolpalette.c</file>
    <file>transparent.c</file>
    <file>tree_store.c</file>
    <file>textmask.c</file>
-    <file>video_player.c</file>
  </gresource>
  <gresource prefix="/textview">
    <file>floppybuddy.gif</file>
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -31,14 +31,16 @@
    </accessibility>
  </object>
  <object class="GtkWindow" id="window1">
-    <property name="default-height">250</property>
-    <property name="default-width">440</property>
+    <property name="default_height">250</property>
+    <property name="default_width">440</property>
    <property name="title" translatable="yes">Builder</property>
    <child>
      <object class="GtkBox" id="vbox1">
+        <property name="visible">1</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkMenuBar" id="menubar1">
+            <property name="visible">1</property>
            <child internal-child="accessible">
              <object class="AtkObject" id="a11y-menubar">
                <property name="AtkObject::accessible-name">The menubar</property>
@@ -46,30 +48,35 @@
            </child>
            <child>
              <object class="GtkMenuItem">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">_File</property>
                <property name="use-underline">1</property>
                <child type="submenu">
                  <object class="GtkMenu">
                    <child>
                      <object class="GtkMenuItem" id="new_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_New</property>
                        <property name="use-underline">1</property>
                      </object>
                    </child>
                    <child>
                      <object class="GtkMenuItem" id="open_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_Open</property>
                        <property name="use-underline">1</property>
                      </object>
                    </child>
                    <child>
                      <object class="GtkMenuItem" id="save_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_Save</property>
                        <property name="use-underline">1</property>
                      </object>
                    </child>
                    <child>
                      <object class="GtkMenuItem" id="save_as_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">Save _As</property>
                        <property name="use-underline">1</property>
                        <accelerator key="s" modifiers="primary | shift-mask" signal="activate"/>
@@ -77,10 +84,12 @@
                    </child>
                    <child>
                      <object class="GtkSeparatorMenuItem">
+                        <property name="visible">1</property>
                      </object>
                    </child>
                    <child>
                      <object class="GtkMenuItem" id="quit_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_Quit</property>
                        <property name="use-underline">1</property>
                        <property name="action-name">win.quit</property>
@@ -92,24 +101,28 @@
            </child>
            <child>
              <object class="GtkMenuItem">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">_Edit</property>
                <property name="use-underline">1</property>
                <child type="submenu">
                  <object class="GtkMenu">
                    <child>
                      <object class="GtkMenuItem" id="copy_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_Copy</property>
                        <property name="use-underline">1</property>
                      </object>
                    </child>
                    <child>
                      <object class="GtkMenuItem" id="cut_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_Cut</property>
                        <property name="use-underline">1</property>
                      </object>
                    </child>
                    <child>
                      <object class="GtkMenuItem" id="paste_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_Paste</property>
                        <property name="use-underline">1</property>
                      </object>
@@ -120,12 +133,14 @@
            </child>
            <child>
              <object class="GtkMenuItem">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">_Help</property>
                <property name="use-underline">1</property>
                <child type="submenu">
                  <object class="GtkMenu">
                    <child>
                      <object class="GtkMenuItem" id="help_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_Help</property>
                        <property name="use-underline">1</property>
                        <property name="action-name">win.help</property>
@@ -133,6 +148,7 @@
                    </child>
                    <child>
                      <object class="GtkMenuItem" id="about_item">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">_About</property>
                        <property name="use-underline">1</property>
                        <property name="action-name">win.about</property>
@@ -146,6 +162,7 @@
        </child>
        <child>
          <object class="GtkToolbar" id="toolbar1">
+            <property name="visible">1</property>
            <child internal-child="accessible">
              <object class="AtkObject" id="a11y-toolbar">
                <property name="AtkObject::accessible-name">The toolbar</property>
@@ -153,6 +170,7 @@
            </child>
            <child>
              <object class="GtkToolButton">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">New</property>
                <property name="tooltip-text" translatable="yes">Create a new file</property>
                <property name="icon-name">document-new</property>
@@ -160,6 +178,7 @@
            </child>
            <child>
              <object class="GtkToolButton">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">Open</property>
                <property name="tooltip-text" translatable="yes">Open a file</property>
                <property name="icon-name">document-open</property>
@@ -167,6 +186,7 @@
            </child>
            <child>
              <object class="GtkToolButton">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">Save</property>
                <property name="tooltip-text" translatable="yes">Save a file</property>
                <property name="icon-name">document-save</property>
@@ -175,10 +195,12 @@
            </child>
            <child>
              <object class="GtkSeparatorToolItem">
+                <property name="visible">1</property>
              </object>
            </child>
            <child>
              <object class="GtkToolButton">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">Copy</property>
                <property name="tooltip-text" translatable="yes">Copy selected object into the clipboard</property>
                <property name="icon-name">edit-copy</property>
@@ -186,6 +208,7 @@
            </child>
            <child>
              <object class="GtkToolButton">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">Cut</property>
                <property name="tooltip-text" translatable="yes">Cut selected object into the clipboard</property>
                <property name="icon-name">edit-cut</property>
@@ -193,6 +216,7 @@
            </child>
            <child>
              <object class="GtkToolButton">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">Paste</property>
                <property name="tooltip-text" translatable="yes">Paste object from the clipboard</property>
                <property name="icon-name">edit-paste</property>
@@ -205,10 +229,12 @@
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="shadow-type">in</property>
+            <property name="shadow_type">in</property>
+            <property name="visible">1</property>
            <property name="expand">1</property>
            <child>
              <object class="GtkTreeView" id="treeview1">
+                <property name="visible">1</property>
                <property name="model">liststore1</property>
                <property name="tooltip-column">3</property>
                <child internal-child="accessible">
@@ -261,6 +287,7 @@
        </child>
        <child>
          <object class="GtkStatusbar" id="statusbar1">
+            <property name="visible">1</property>
          </object>
          <packing>
            <property name="position">3</property>
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -299,7 +299,7 @@ pressed_cb (GtkGesture *gesture,
      rect.height = 0;

      gtk_menu_popup_at_rect (GTK_MENU (menu),
-                              gtk_widget_get_surface (widget),
+                              gtk_widget_get_window (widget),
                              &rect,
                              GDK_GRAVITY_NORTH_WEST,
                              GDK_GRAVITY_NORTH_WEST,
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -4,8 +4,8 @@
 * of various kinds.
 *
 * This demo has two drawing areas. The checkerboard area shows
- * how you can just draw something; all you have to do is set a function
- * via gtk_drawing_area_set_draw_func(), as shown here.
+ * how you can just draw something; all you have to do is write
+ * a signal handler for expose_event, as shown here.
 *
 * The "scribble" area is a bit more advanced, and shows how to handle
 * events such as button presses and mouse motion. Click the mouse
@@ -86,7 +86,7 @@ draw_brush (GtkWidget *widget,

  cairo_destroy (cr);

-  gtk_widget_queue_draw (widget);
+  gtk_widget_queue_draw_area (widget, update_rect.x, update_rect.y, update_rect.width, update_rect.height);
 }

 static double start_x;
@@ -137,7 +137,7 @@ checkerboard_draw (GtkDrawingArea *da,
  /* At the start of a draw handler, a clip region has been set on
   * the Cairo context, and the contents have been cleared to the
   * widget's background color. The docs for
-   * gdk_surface_begin_paint_region() give more details on how this
+   * gdk_window_begin_paint_region() give more details on how this
   * works.
   */

--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -34,31 +34,31 @@
    <property name="title" translatable="yes">Filter Model</property>
    <child>
      <object class="GtkGrid" id="grid1">
+        <property name="visible">1</property>
        <property name="margin">10</property>
-        <property name="row-spacing">10</property>
-        <property name="column-spacing">10</property>
-        <property name="column-homogeneous">1</property>
+        <property name="row_spacing">10</property>
+        <property name="column_spacing">10</property>
+        <property name="column_homogeneous">1</property>
        <child>
          <object class="GtkLabel" id="label1">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Original</property>
            <property name="xalign">0</property>
            <attributes>
              <attribute name="weight" value="bold"/>
            </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview1"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview1">
-            <property name="can-focus">1</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
            <property name="model">liststore1</property>
-            <property name="headers-clickable">0</property>
+            <property name="headers_clickable">0</property>
            <child internal-child="selection">
              <object class="GtkTreeSelection" id="treeview-selection1"/>
            </child>
@@ -84,20 +84,18 @@
                </child>
              </object>
            </child>
-            <accessibility>
-              <relation type="labelled-by" target="label1"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview2">
-            <property name="can-focus">1</property>
-            <property name="headers-clickable">0</property>
-            <property name="search-column">0</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="headers_clickable">0</property>
+            <property name="search_column">0</property>
            <child internal-child="selection">
              <object class="GtkTreeSelection" id="treeview-selection3"/>
            </child>
@@ -135,52 +133,46 @@
                </child>
              </object>
            </child>
-            <accessibility>
-              <relation type="labelled-by" target="label2"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="label2">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Computed Columns</property>
            <property name="xalign">0</property>
            <attributes>
              <attribute name="weight" value="bold"/>
            </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview2"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="label3">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Filtered</property>
            <property name="xalign">0</property>
            <attributes>
              <attribute name="weight" value="bold"/>
            </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview3"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview3">
-            <property name="can-focus">1</property>
-            <property name="headers-clickable">0</property>
-            <property name="search-column">0</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="headers_clickable">0</property>
+            <property name="search_column">0</property>
            <child internal-child="selection">
              <object class="GtkTreeSelection" id="treeview-selection5"/>
            </child>
@@ -200,13 +192,10 @@
                </child>
              </object>
            </child>
-            <accessibility>
-              <relation type="labelled-by" target="label3"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
          </packing>
        </child>
      </object>
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -9,7 +9,6 @@

 #include "gtkfishbowl.h"

-GtkWidget *info_label;
 GtkWidget *allow_changes;

 #define N_STATS 5
@@ -18,7 +17,14 @@ GtkWidget *allow_changes;

 typedef struct _Stats Stats;
 struct _Stats {
+  gint64 last_stats;
+  gint64 last_frame;
  gint last_suggestion;
+  guint frame_counter_max;
+
+  guint stats_index;
+  guint frame_counter[N_STATS];
+  guint item_counter[N_STATS];
 };

 static Stats *
@@ -35,132 +41,102 @@ get_stats (GtkWidget *widget)
    {
      stats = g_new0 (Stats, 1);
      g_object_set_qdata_full (G_OBJECT (widget), stats_quark, stats, g_free);
+      stats->last_frame = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+      stats->last_stats = stats->last_frame;
    }

  return stats;
 }

-static gint64
-guess_refresh_interval (GdkFrameClock *frame_clock)
+static void
+do_stats (GtkWidget *widget,
+          GtkWidget *info_label,
+          gint      *suggested_change)
 {
-  gint64 interval;
-  gint64 i;
+  Stats *stats;
+  gint64 frame_time;

-  interval = G_MAXINT64;
+  stats = get_stats (widget);
+  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));

-  for (i = gdk_frame_clock_get_history_start (frame_clock);
-       i < gdk_frame_clock_get_frame_counter (frame_clock);
-       i++)
+  if (stats->last_stats + STATS_UPDATE_TIME < frame_time)
    {
-      GdkFrameTimings *t, *before;
-      gint64 ts, before_ts;
+      char *new_label;
+      guint i, n_frames;

-      t = gdk_frame_clock_get_timings (frame_clock, i);
-      before = gdk_frame_clock_get_timings (frame_clock, i - 1);
-      if (t == NULL || before == NULL)
-        continue;
+      n_frames = 0;
+      for (i = 0; i < N_STATS; i++)
+        {
+          n_frames += stats->frame_counter[i];
+        }
+      
+      new_label = g_strdup_printf ("icons - %.1f fps",
+                                   (double) G_USEC_PER_SEC * n_frames
+                                       / (N_STATS * STATS_UPDATE_TIME));
+      gtk_label_set_label (GTK_LABEL (info_label), new_label);
+      g_free (new_label);

-      ts = gdk_frame_timings_get_frame_time (t);
-      before_ts = gdk_frame_timings_get_frame_time (before);
-      if (ts == 0 || before_ts == 0)
-        continue;
+      if (stats->frame_counter[stats->stats_index] >= 19 * stats->frame_counter_max / 20)
+        {
+          if (stats->last_suggestion > 0)
+            stats->last_suggestion *= 2;
+          else
+            stats->last_suggestion = 1;
+        }
+      else
+        {
+          if (stats->last_suggestion < 0)
+            stats->last_suggestion--;
+          else
+            stats->last_suggestion = -1;
+          stats->last_suggestion = MAX (stats->last_suggestion, 1 - (int) stats->item_counter[stats->stats_index]);
+        }

-      interval = MIN (interval, ts - before_ts);
+      stats->stats_index = (stats->stats_index + 1) % N_STATS;
+      stats->frame_counter[stats->stats_index] = 0;
+      stats->item_counter[stats->stats_index] = stats->item_counter[(stats->stats_index + N_STATS - 1) % N_STATS];
+      stats->last_stats = frame_time;
+      
+      if (suggested_change)
+        *suggested_change = stats->last_suggestion;
+      else
+        stats->last_suggestion = 0;
+    }
+  else
+    {
+      if (suggested_change)
+        *suggested_change = 0;
    }

-  if (interval == G_MAXINT64)
-    return 0;
-
-  return interval;
+  stats->last_frame = frame_time;
+  stats->frame_counter[stats->stats_index]++;
+  stats->frame_counter_max = MAX (stats->frame_counter_max, stats->frame_counter[stats->stats_index]);
 }

 static void
-do_stats (GtkWidget *widget,
-          gint      *suggested_change)
+stats_update (GtkWidget *widget)
 {
-  GdkFrameClock *frame_clock;
  Stats *stats;
-  GdkFrameTimings *start, *end;
-  gint64 start_counter, end_counter;
-  gint64 n_frames, expected_frames;
-  gint64 start_timestamp, end_timestamp;
-  gint64 interval;
-  char *new_label;

  stats = get_stats (widget);
-  frame_clock = gtk_widget_get_frame_clock (widget);
-  if (frame_clock == NULL)
-    return;

-  start_counter = gdk_frame_clock_get_history_start (frame_clock);
-  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
-  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
-  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
-       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
-       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
-    end_counter--;
-  if (end_counter - start_counter < 4)
-    return;
-
-  start_timestamp = gdk_frame_timings_get_presentation_time (start);
-  end_timestamp = gdk_frame_timings_get_presentation_time (end);
-  if (start_timestamp == 0 || end_timestamp == 0)
-    {
-      start_timestamp = gdk_frame_timings_get_frame_time (start);
-      end_timestamp = gdk_frame_timings_get_frame_time (end);
-    }
-
-  interval = gdk_frame_timings_get_refresh_interval (end);
-  if (interval == 0)
-    {
-      interval = guess_refresh_interval (frame_clock);
-      if (interval == 0)
-        return;
-    }
-  n_frames = end_counter - start_counter;
-  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
-
-  new_label = g_strdup_printf ("icons - %.1f fps",
-                               ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp));
-  gtk_label_set_label (GTK_LABEL (info_label), new_label);
-  g_free (new_label);
-
-  if (n_frames >= expected_frames)
-    {
-      if (stats->last_suggestion > 0)
-        stats->last_suggestion *= 2;
-      else
-        stats->last_suggestion = 1;
-    }
-  else if (n_frames + 1 < expected_frames)
-    {
-      if (stats->last_suggestion < 0)
-        stats->last_suggestion--;
-      else
-        stats->last_suggestion = -1;
-    }
-  else
-    {
-      stats->last_suggestion = 0;
-    }
-
-  if (suggested_change)
-    *suggested_change = stats->last_suggestion;
-  else
-    stats->last_suggestion = 0;
+  stats->item_counter[stats->stats_index] = gtk_fishbowl_get_count (GTK_FISHBOWL (widget));
 }

 static gboolean
-move_fish (gpointer bowl)
+move_fish (GtkWidget     *bowl,
+           GdkFrameClock *frame_clock,
+           gpointer       info_label)
 {
-  gint suggested_change = 0, new_count;
+  gint suggested_change = 0;
  
  do_stats (bowl,
+            info_label,
            !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);

-  new_count = gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change;
-  new_count = MAX (1, new_count);
-  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl), new_count);
+  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl),
+                          gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change);
+  stats_update (bowl);

  return G_SOURCE_CONTINUE;
 }
@@ -173,7 +149,7 @@ do_fishbowl (GtkWidget *do_widget)
  if (!window)
    {
      GtkBuilder *builder;
-      GtkWidget *bowl;
+      GtkWidget *bowl, *info_label;

      g_type_ensure (GTK_TYPE_FISHBOWL);

@@ -190,11 +166,7 @@ do_fishbowl (GtkWidget *do_widget)
                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_widget_realize (window);
-      g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE,
-                                  1,
-                                  move_fish,
-                                  bowl,
-                                  NULL);
+      gtk_widget_add_tick_callback (bowl, move_fish, info_label, NULL);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -5,30 +5,34 @@
    <property name="title" translatable="yes">Fishbowl</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
+        <property name="visible">True</property>
+        <property name="show-title-buttons">True</property>
        <child>
          <object class="GtkLabel" id="info_label">
+            <property name="visible">True</property>
          </object>
          <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel">
-            <property name="label" bind-source="bowl" bind-property="count"/>
+            <property name="visible">True</property>
+            <property name="label" bind-source="bowl" bind-property="count">0</property>
          </object>
          <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
          </packing>
        </child>
        <child>
          <object class="GtkToggleButton" id="changes_allow">
-            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
+            <property name="active">False</property>
+            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
            <property name="icon-name">changes-allow</property>
            <property name="relief">none</property>
          </object>
          <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
          </packing>
        </child>
        <child>
@@ -39,7 +43,7 @@
            <property name="relief">none</property>
          </object>
          <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
          </packing>
        </child>
      </object>
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -7,16 +7,19 @@
    <property name="default-height">500</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
+        <property name="visible">1</property>
        <property name="show-title-buttons">1</property>
        <property name="title">Font Explorer</property>
        <child>
          <object class="GtkButton" id="reset">
+            <property name="visible">1</property>
            <property name="can-focus">1</property>
            <property name="receives-default">1</property>
            <property name="tooltip-text">Reset</property>
            <signal name="clicked" handler="reset" swapped="no"/>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">view-refresh-symbolic</property>
              </object>
            </child>
@@ -26,23 +29,27 @@
    </child>
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <child>
          <object class="GtkScrolledWindow">
+            <property name="visible">1</property>
            <property name="can-focus">1</property>
            <property name="hscrollbar-policy">never</property>
            <child>
              <object class="GtkViewport">
+                <property name="visible">1</property>
                <child>
                  <object class="GtkBox">
+                    <property name="visible">1</property>
                    <property name="margin">10</property>
                    <property name="orientation">vertical</property>
                    <property name="spacing">6</property>
                    <child>
                      <object class="GtkFontButton" id="font">
+                        <property name="visible">1</property>
                        <property name="can-focus">1</property>
                        <property name="receives-default">1</property>
                        <property name="font">Sans 12</property>
-                        <property name="level">family|style|size|variations|features</property>
                        <signal name="font-set" handler="font_changed" swapped="no"/>
                      </object>
                    </child>
@@ -50,6 +57,7 @@
                      <object class="GtkExpander">
                        <child type="label">
                          <object class="GtkLabel">
+                            <property name="visible">1</property>
                            <property name="xalign">0</property>
                            <property name="label" translatable="yes">Font Features</property>
                            <attributes>
@@ -79,8 +87,10 @@
                    </child>
                    <child>
                      <object class="GtkExpander">
+                        <property name="visible">1</property>
                        <child type="label">
                          <object class="GtkLabel" id="variations_heading">
+                            <property name="visible">1</property>
                            <property name="label" translatable="yes">Font Variations</property>
                            <property name="xalign">0</property>
                            <attributes>
@@ -90,6 +100,7 @@
                        </child>
                        <child>
                          <object class="GtkGrid" id="variations_grid">
+                            <property name="visible">1</property>
                            <property name="column-spacing">10</property>
                            <property name="row-spacing">10</property>
                          </object>
@@ -107,6 +118,7 @@
        </child>
        <child>
          <object class="GtkBox">
+            <property name="visible">1</property>
            <property name="orientation">vertical</property>
            <property name="hexpand">1</property>
            <property name="vexpand">1</property>
@@ -114,8 +126,10 @@
            <property name="spacing">20</property>
            <child>
              <object class="GtkStack" id="stack">
+                <property name="visible">1</property>
                <child>
                  <object class="GtkLabel" id="label">
+                    <property name="visible">1</property>
                    <property name="wrap">1</property>
                    <property name="xalign">0</property>
                    <property name="yalign">0</property>
@@ -128,11 +142,13 @@
                </child>
                <child>
                  <object class="GtkEntry" id="entry">
+                    <property name="visible">1</property>
                    <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.

 Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!

 Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
+                    <signal name="key-press-event" handler="entry_key_press"/>
                    <signal name="activate" handler="stop_edit"/>
                    <property name="valign">start</property>
                    <property name="width-chars">50</property>
@@ -145,6 +161,7 @@
            </child>
            <child>
              <object class="GtkLabel" id="settings">
+                <property name="visible">1</property>
                <property name="wrap">1</property>
                <property name="xalign">0</property>
                <property name="valign">end</property>
@@ -159,20 +176,22 @@
            </child>
            <child>
              <object class="GtkBox">
+                <property name="orientation">horizontal</property>
                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkLabel" id="description">
-                    <property name="wrap">1</property>
-                    <property name="xalign">0</property>
-                    <property name="valign">end</property>
-                    <property name="width-chars">50</property>
-                    <property name="max-width-chars">50</property>
-                    <property name="hexpand">1</property>
-                    <style>
-                      <class name="monospace"/>
-                    </style>
-                  </object>
-                </child>
+            <child>
+              <object class="GtkLabel" id="description">
+                <property name="visible">1</property>
+                <property name="wrap">1</property>
+                <property name="xalign">0</property>
+                <property name="valign">end</property>
+                <property name="width-chars">50</property>
+                <property name="max-width-chars">50</property>
+                <property name="hexpand">1</property>
+                <style>
+                  <class name="monospace"/>
+                </style>
+              </object>
+            </child>
                <child>
                  <object class="GtkToggleButton" id="edit_toggle">
                    <property name="icon-name">document-edit-symbolic</property>
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -1669,12 +1669,12 @@ stop_edit (void)
 }

 static gboolean
-entry_key_press (GtkEventController *controller,
-                 guint               keyval,
-                 guint               keycode,
-                 GdkModifierType     modifiers,
-                 GtkEntry           *entry)
+entry_key_press (GtkEntry *entry, GdkEventKey *event)
 {
+  guint keyval;
+
+  gdk_event_get_keyval ((GdkEvent *)event, &keyval);
+
  if (keyval == GDK_KEY_Escape)
    {
      gtk_entry_set_text (GTK_ENTRY (entry), text);
@@ -1694,7 +1694,6 @@ do_font_features (GtkWidget *do_widget)
    {
      GtkBuilder *builder;
      GtkWidget *feature_list;
-      GtkEventController *controller;

      builder = gtk_builder_new_from_resource ("/font_features/font-features.ui");

@@ -1704,6 +1703,7 @@ do_font_features (GtkWidget *do_widget)
      gtk_builder_add_callback_symbol (builder, "reset", reset_features);
      gtk_builder_add_callback_symbol (builder, "stop_edit", G_CALLBACK (stop_edit));
      gtk_builder_add_callback_symbol (builder, "toggle_edit", G_CALLBACK (toggle_edit));
+      gtk_builder_add_callback_symbol (builder, "entry_key_press", G_CALLBACK (entry_key_press));
      gtk_builder_connect_signals (builder, NULL);

      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
@@ -1718,10 +1718,6 @@ do_font_features (GtkWidget *do_widget)
      entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
      edit_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "edit_toggle"));

-      controller = gtk_event_controller_key_new (entry);
-      g_object_set_data_full (G_OBJECT (entry), "controller", controller, g_object_unref);
-      g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), entry);
-
      add_check_group (feature_list, _("Kerning"), (const char *[]){ "kern", NULL });
      add_check_group (feature_list, _("Ligatures"), (const char *[]){ "liga",
                                                                       "dlig",
--- a/demos/gtk-demo/fontplane.c
+++ b/demos/gtk-demo/fontplane.c
@@ -208,7 +208,7 @@ plane_drag_gesture_end (GtkGestureDrag *gesture,
 static void
 gtk_font_plane_init (GtkFontPlane *plane)
 {
-  gtk_widget_set_has_surface (GTK_WIDGET (plane), FALSE);
+  gtk_widget_set_has_window (GTK_WIDGET (plane), FALSE);
  gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);

  plane->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (plane));
--- a/demos/gtk-demo/geninclude.py
+++ b/demos/gtk-demo/geninclude.py
@@ -33,7 +33,7 @@ demos = []
 for demo_file in in_files:
    filename =  demo_file[demo_file.rfind('/')+1:]
    demo_name = filename.replace(".c", "")
-    with open(demo_file, 'r', encoding='utf-8') as f:
+    with open(demo_file, 'r') as f:
        title = f.readline().replace("/*", "").strip()


--- a/demos/gtk-demo/gtk-logo.webm
+++ b/demos/gtk-demo/gtk-logo.webm
--- a/demos/gtk-demo/gtkfishbowl.c
+++ b/demos/gtk-demo/gtkfishbowl.c
@@ -56,7 +56,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_CONTAINER)
 static void
 gtk_fishbowl_init (GtkFishbowl *fishbowl)
 {
-  gtk_widget_set_has_surface (GTK_WIDGET (fishbowl), FALSE);
+  gtk_widget_set_has_window (GTK_WIDGET (fishbowl), FALSE);
 }

 /**
@@ -127,7 +127,8 @@ gtk_fishbowl_measure (GtkWidget      *widget,
 static void
 gtk_fishbowl_size_allocate (GtkWidget           *widget,
                            const GtkAllocation *allocation,
-                            int                  baseline)
+                            int                  baseline,
+                            GtkAllocation       *out_clip)
 {
  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
@@ -138,6 +139,8 @@ gtk_fishbowl_size_allocate (GtkWidget           *widget,

  for (children = priv->children; children; children = children->next)
    {
+      GtkAllocation child_clip;
+
      child = children->data;

      if (!gtk_widget_get_visible (child->widget))
@@ -149,7 +152,7 @@ gtk_fishbowl_size_allocate (GtkWidget           *widget,
      child_allocation.width = child_requisition.width;
      child_allocation.height = child_requisition.height;

-      gtk_widget_size_allocate (child->widget, &child_allocation, -1);
+      gtk_widget_size_allocate (child->widget, &child_allocation, -1, &child_clip);
    }
 }

--- a/demos/gtk-demo/gtkgears.c
+++ b/demos/gtk-demo/gtkgears.c
@@ -1,960 +0,0 @@
-/* The rendering code in here is taken from es2gears, which has the
- * following copyright notice:
- *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Ported to GLES2.
- * Kristian Høgsberg <krh@bitplanet.net>
- * May 3, 2010
- *
- * Improve GLES2 port:
- *   * Refactor gear drawing.
- *   * Use correct normals for surfaces.
- *   * Improve shader.
- *   * Use perspective projection transformation.
- *   * Add FPS count.
- *   * Add comments.
- * Alexandros Frantzis <alexandros.frantzis@linaro.org>
- * Jul 13, 2010
- */
-
-#include "config.h"
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <epoxy/gl.h>
-
-#include "gtkgears.h"
-
-#define STRIPS_PER_TOOTH 7
-#define VERTICES_PER_TOOTH 34
-#define GEAR_VERTEX_STRIDE 6
-
-#ifndef HAVE_SINCOS
-static void
-sincos (double x, double *_sin, double *_cos)
-{
-  *_sin = sin (x);
-  *_cos = cos (x);
-}
-#endif
-
-/**
- * Struct describing the vertices in triangle strip
- */
-struct vertex_strip {
-   /** The first vertex in the strip */
-   GLint first;
-   /** The number of consecutive vertices in the strip after the first */
-   GLint count;
-};
-
-/* Each vertex consist of GEAR_VERTEX_STRIDE GLfloat attributes */
-typedef GLfloat GearVertex[GEAR_VERTEX_STRIDE];
-
-/**
- * Struct representing a gear.
- */
-struct gear {
-   /** The array of vertices comprising the gear */
-   GearVertex *vertices;
-   /** The number of vertices comprising the gear */
-   int nvertices;
-   /** The array of triangle strips comprising the gear */
-   struct vertex_strip *strips;
-   /** The number of triangle strips comprising the gear */
-   int nstrips;
-};
-
-typedef struct {
-  /* The view rotation [x, y, z] */
-  GLfloat view_rot[GTK_GEARS_N_AXIS];
-
-  /* The Vertex Array Object */
-  GLuint vao;
-
-  /* The shader program */
-  GLuint program;
-
-  /* The gears */
-  struct gear *gear1;
-  struct gear *gear2;
-  struct gear *gear3;
-
-  /** The Vertex Buffer Object holding the vertices in the graphics card */
-  GLuint gear_vbo[3];
-
-  /** The location of the shader uniforms */
-  GLuint ModelViewProjectionMatrix_location;
-  GLuint NormalMatrix_location;
-  GLuint LightSourcePosition_location;
-  GLuint MaterialColor_location;
-
-  /* The current gear rotation angle */
-  GLfloat angle;
-
-  /* The projection matrix */
-  GLfloat ProjectionMatrix[16];
-
-  /* The direction of the directional light for the scene */
-  GLfloat LightSourcePosition[4];
-
-  gint64 first_frame_time;
-  guint tick;
-  GtkLabel *fps_label;
-} GtkGearsPrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE (GtkGears, gtk_gears, GTK_TYPE_GL_AREA)
-
-static gboolean gtk_gears_render        (GtkGLArea     *area,
-                                         GdkGLContext  *context);
-static void     gtk_gears_reshape       (GtkGLArea     *area,
-                                         int            width,
-                                         int            height);
-static void     gtk_gears_realize       (GtkWidget     *widget);
-static void     gtk_gears_unrealize     (GtkWidget     *widget);
-static gboolean gtk_gears_tick          (GtkWidget     *widget,
-                                         GdkFrameClock *frame_clock,
-                                         gpointer       user_data);
-
-static void destroy_gear (struct gear *g);
-
-GtkWidget *
-gtk_gears_new (void)
-{
-  return g_object_new (gtk_gears_get_type (),
-                       "has-depth-buffer", TRUE,
-                       NULL);
-}
-
-static void
-gtk_gears_init (GtkGears *gears)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  priv->view_rot[GTK_GEARS_X_AXIS] = 20.0;
-  priv->view_rot[GTK_GEARS_Y_AXIS] = 30.0;
-  priv->view_rot[GTK_GEARS_Z_AXIS] = 20.0;
-
-  priv->LightSourcePosition[0] = 5.0;
-  priv->LightSourcePosition[1] = 5.0;
-  priv->LightSourcePosition[2] = 10.0;
-  priv->LightSourcePosition[3] = 1.0;
-
-  priv->tick = gtk_widget_add_tick_callback (GTK_WIDGET (gears), gtk_gears_tick, gears, NULL);
-}
-
-static void
-gtk_gears_finalize (GObject *obj)
-{
-  GtkGears *gears = GTK_GEARS (obj);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  gtk_widget_remove_tick_callback (GTK_WIDGET (gears), priv->tick);
-
-  g_clear_object (&priv->fps_label);
-
-  g_clear_pointer (&priv->gear1, destroy_gear);
-  g_clear_pointer (&priv->gear2, destroy_gear);
-  g_clear_pointer (&priv->gear3, destroy_gear);
-
-  G_OBJECT_CLASS (gtk_gears_parent_class)->finalize (obj);
-}
-
-static void
-gtk_gears_class_init (GtkGearsClass *klass)
-{
-  GTK_GL_AREA_CLASS (klass)->render = gtk_gears_render;
-  GTK_GL_AREA_CLASS (klass)->resize = gtk_gears_reshape;
-
-  GTK_WIDGET_CLASS (klass)->realize = gtk_gears_realize;
-  GTK_WIDGET_CLASS (klass)->unrealize = gtk_gears_unrealize;
-
-  G_OBJECT_CLASS (klass)->finalize = gtk_gears_finalize;
-}
-
-/*
- * Fills a gear vertex.
- *
- * @param v the vertex to fill
- * @param x the x coordinate
- * @param y the y coordinate
- * @param z the z coortinate
- * @param n pointer to the normal table
- *
- * @return the operation error code
- */
-static GearVertex *
-vert (GearVertex *v,
-      GLfloat x,
-      GLfloat y,
-      GLfloat z,
-      GLfloat n[3])
-{
-  v[0][0] = x;
-  v[0][1] = y;
-  v[0][2] = z;
-  v[0][3] = n[0];
-  v[0][4] = n[1];
-  v[0][5] = n[2];
-
-  return v + 1;
-}
-
-static void
-destroy_gear (struct gear *g)
-{
-  g_free (g->strips);
-  g_free (g);
-}
-
-/**
- *  Create a gear wheel.
- *
- *  @param inner_radius radius of hole at center
- *  @param outer_radius radius at center of teeth
- *  @param width width of gear
- *  @param teeth number of teeth
- *  @param tooth_depth depth of tooth
- *
- *  @return pointer to the constructed struct gear
- */
-static struct gear *
-create_gear (GLfloat inner_radius,
-             GLfloat outer_radius,
-             GLfloat width,
-             GLint teeth,
-             GLfloat tooth_depth)
-{
-  GLfloat r0, r1, r2;
-  GLfloat da;
-  GearVertex *v;
-  struct gear *gear;
-  double s[5], c[5];
-  GLfloat normal[3];
-  int cur_strip = 0;
-  int i;
-
-  /* Allocate memory for the gear */
-  gear = g_malloc (sizeof *gear);
-
-  /* Calculate the radii used in the gear */
-  r0 = inner_radius;
-  r1 = outer_radius - tooth_depth / 2.0;
-  r2 = outer_radius + tooth_depth / 2.0;
-
-  da = 2.0 * M_PI / teeth / 4.0;
-
-  /* Allocate memory for the triangle strip information */
-  gear->nstrips = STRIPS_PER_TOOTH * teeth;
-  gear->strips = g_malloc0_n (gear->nstrips, sizeof (*gear->strips));
-
-  /* Allocate memory for the vertices */
-  gear->vertices = g_malloc0_n (VERTICES_PER_TOOTH * teeth, sizeof(*gear->vertices));
-  v = gear->vertices;
-
-  for (i = 0; i < teeth; i++) {
-    /* A set of macros for making the creation of the gears easier */
-#define  GEAR_POINT(p, r, da) do { p.x = (r) * c[(da)]; p.y = (r) * s[(da)]; } while(0)
-#define  SET_NORMAL(x, y, z) do { \
-   normal[0] = (x); normal[1] = (y); normal[2] = (z); \
-} while(0)
-
-#define  GEAR_VERT(v, point, sign) vert((v), p[(point)].x, p[(point)].y, (sign) * width * 0.5, normal)
-
-#define START_STRIP do { \
-   gear->strips[cur_strip].first = v - gear->vertices; \
-} while(0);
-
-#define END_STRIP do { \
-   int _tmp = (v - gear->vertices); \
-   gear->strips[cur_strip].count = _tmp - gear->strips[cur_strip].first; \
-   cur_strip++; \
-} while (0)
-
-#define QUAD_WITH_NORMAL(p1, p2) do { \
-   SET_NORMAL((p[(p1)].y - p[(p2)].y), -(p[(p1)].x - p[(p2)].x), 0); \
-   v = GEAR_VERT(v, (p1), -1); \
-   v = GEAR_VERT(v, (p1), 1); \
-   v = GEAR_VERT(v, (p2), -1); \
-   v = GEAR_VERT(v, (p2), 1); \
-} while(0)
-    struct point {
-      GLfloat x;
-      GLfloat y;
-    };
-
-    /* Create the 7 points (only x,y coords) used to draw a tooth */
-    struct point p[7];
-
-    /* Calculate needed sin/cos for varius angles */
-    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
-    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
-    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
-    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
-    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
-
-    GEAR_POINT(p[0], r2, 1);
-    GEAR_POINT(p[1], r2, 2);
-    GEAR_POINT(p[2], r1, 0);
-    GEAR_POINT(p[3], r1, 3);
-    GEAR_POINT(p[4], r0, 0);
-    GEAR_POINT(p[5], r1, 4);
-    GEAR_POINT(p[6], r0, 4);
-
-    /* Front face */
-    START_STRIP;
-    SET_NORMAL(0, 0, 1.0);
-    v = GEAR_VERT(v, 0, +1);
-    v = GEAR_VERT(v, 1, +1);
-    v = GEAR_VERT(v, 2, +1);
-    v = GEAR_VERT(v, 3, +1);
-    v = GEAR_VERT(v, 4, +1);
-    v = GEAR_VERT(v, 5, +1);
-    v = GEAR_VERT(v, 6, +1);
-    END_STRIP;
-
-    /* Inner face */
-    START_STRIP;
-    QUAD_WITH_NORMAL(4, 6);
-    END_STRIP;
-
-    /* Back face */
-    START_STRIP;
-    SET_NORMAL(0, 0, -1.0);
-    v = GEAR_VERT(v, 6, -1);
-    v = GEAR_VERT(v, 5, -1);
-    v = GEAR_VERT(v, 4, -1);
-    v = GEAR_VERT(v, 3, -1);
-    v = GEAR_VERT(v, 2, -1);
-    v = GEAR_VERT(v, 1, -1);
-    v = GEAR_VERT(v, 0, -1);
-    END_STRIP;
-
-    /* Outer face */
-    START_STRIP;
-    QUAD_WITH_NORMAL(0, 2);
-    END_STRIP;
-
-    START_STRIP;
-    QUAD_WITH_NORMAL(1, 0);
-    END_STRIP;
-
-    START_STRIP;
-    QUAD_WITH_NORMAL(3, 1);
-    END_STRIP;
-
-    START_STRIP;
-    QUAD_WITH_NORMAL(5, 3);
-    END_STRIP;
-  }
-
-  gear->nvertices = (v - gear->vertices);
-
-  return gear;
-}
-
-/** 
- * Multiplies two 4x4 matrices.
- *
- * The result is stored in matrix m.
- *
- * @param m the first matrix to multiply
- * @param n the second matrix to multiply
- */
-static void
-multiply (GLfloat *m, const GLfloat *n)
-{
-   GLfloat tmp[16];
-   const GLfloat *row, *column;
-   div_t d;
-   int i, j;
-
-   for (i = 0; i < 16; i++) {
-      tmp[i] = 0;
-      d = div(i, 4);
-      row = n + d.quot * 4;
-      column = m + d.rem;
-      for (j = 0; j < 4; j++)
-         tmp[i] += row[j] * column[j * 4];
-   }
-   memcpy(m, &tmp, sizeof tmp);
-}
-
-/** 
- * Rotates a 4x4 matrix.
- *
- * @param[in,out] m the matrix to rotate
- * @param angle the angle to rotate
- * @param x the x component of the direction to rotate to
- * @param y the y component of the direction to rotate to
- * @param z the z component of the direction to rotate to
- */
-static void
-rotate(GLfloat *m, GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
-{
-   double s = sin (angle);
-   double c = cos (angle);
-
-   GLfloat r[16] = {
-      x * x * (1 - c) + c,     y * x * (1 - c) + z * s, x * z * (1 - c) - y * s, 0,
-      x * y * (1 - c) - z * s, y * y * (1 - c) + c,     y * z * (1 - c) + x * s, 0,
-      x * z * (1 - c) + y * s, y * z * (1 - c) - x * s, z * z * (1 - c) + c,     0,
-      0, 0, 0, 1
-   };
-
-   multiply(m, r);
-}
-
-/** 
- * Translates a 4x4 matrix.
- * 
- * @param[in,out] m the matrix to translate
- * @param x the x component of the direction to translate to
- * @param y the y component of the direction to translate to
- * @param z the z component of the direction to translate to
- */
-static void
-translate(GLfloat *m, GLfloat x, GLfloat y, GLfloat z)
-{
-   GLfloat t[16] = { 1, 0, 0, 0,  0, 1, 0, 0,  0, 0, 1, 0,  x, y, z, 1 };
-
-   multiply(m, t);
-}
-
-/** 
- * Creates an identity 4x4 matrix.
- * 
- * @param m the matrix make an identity matrix
- */
-static void
-identity(GLfloat *m)
-{
-   GLfloat t[16] = {
-      1.0, 0.0, 0.0, 0.0,
-      0.0, 1.0, 0.0, 0.0,
-      0.0, 0.0, 1.0, 0.0,
-      0.0, 0.0, 0.0, 1.0,
-   };
-
-   memcpy(m, t, sizeof(t));
-}
-
-/** 
- * Transposes a 4x4 matrix.
- *
- * @param m the matrix to transpose
- */
-static void
-transpose(GLfloat *m)
-{
-   GLfloat t[16] = {
-      m[0], m[4], m[8],  m[12],
-      m[1], m[5], m[9],  m[13],
-      m[2], m[6], m[10], m[14],
-      m[3], m[7], m[11], m[15]};
-
-   memcpy(m, t, sizeof(t));
-}
-
-/**
- * Inverts a 4x4 matrix.
- *
- * This function can currently handle only pure translation-rotation matrices.
- * Read http://www.gamedev.net/community/forums/topic.asp?topic_id=425118
- * for an explanation.
- */
-static void
-invert(GLfloat *m)
-{
-   GLfloat t[16];
-   identity(t);
-
-   // Extract and invert the translation part 't'. The inverse of a
-   // translation matrix can be calculated by negating the translation
-   // coordinates.
-   t[12] = -m[12]; t[13] = -m[13]; t[14] = -m[14];
-
-   // Invert the rotation part 'r'. The inverse of a rotation matrix is
-   // equal to its transpose.
-   m[12] = m[13] = m[14] = 0;
-   transpose(m);
-
-   // inv(m) = inv(r) * inv(t)
-   multiply(m, t);
-}
-
-/** 
- * Calculate a perspective projection transformation.
- * 
- * @param m the matrix to save the transformation in
- * @param fovy the field of view in the y direction
- * @param aspect the view aspect ratio
- * @param zNear the near clipping plane
- * @param zFar the far clipping plane
- */
-void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar)
-{
-   GLfloat tmp[16];
-   double sine, cosine, cotangent, deltaZ;
-   GLfloat radians = fovy / 2 * M_PI / 180;
-   identity(tmp);
-
-   deltaZ = zFar - zNear;
-   sincos(radians, &sine, &cosine);
-
-   if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
-      return;
-
-   cotangent = cosine / sine;
-
-   tmp[0] = cotangent / aspect;
-   tmp[5] = cotangent;
-   tmp[10] = -(zFar + zNear) / deltaZ;
-   tmp[11] = -1;
-   tmp[14] = -2 * zNear * zFar / deltaZ;
-   tmp[15] = 0;
-
-   memcpy(m, tmp, sizeof(tmp));
-}
-
-/**
- * Draws a gear.
- *
- * @param gear the gear to draw
- * @param transform the current transformation matrix
- * @param x the x position to draw the gear at
- * @param y the y position to draw the gear at
- * @param angle the rotation angle of the gear
- * @param color the color of the gear
- */
-static void
-draw_gear(GtkGears *self,
-          struct gear *gear,
-          GLuint gear_vbo,
-          GLfloat *transform,
-          GLfloat x,
-          GLfloat y,
-          GLfloat angle,
-          const GLfloat color[4])
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (self);
-  GLfloat model_view[16];
-  GLfloat normal_matrix[16];
-  GLfloat model_view_projection[16];
-  int n;
-
-  /* Translate and rotate the gear */
-  memcpy(model_view, transform, sizeof (model_view));
-  translate(model_view, x, y, 0);
-  rotate(model_view, 2 * G_PI * angle / 360.0, 0, 0, 1);
-
-  /* Create and set the ModelViewProjectionMatrix */
-  memcpy(model_view_projection, priv->ProjectionMatrix, sizeof(model_view_projection));
-  multiply(model_view_projection, model_view);
-
-  glUniformMatrix4fv(priv->ModelViewProjectionMatrix_location, 1, GL_FALSE,
-                     model_view_projection);
-
-  /* 
-   * Create and set the NormalMatrix. It's the inverse transpose of the
-   * ModelView matrix.
-   */
-  memcpy(normal_matrix, model_view, sizeof (normal_matrix));
-  invert(normal_matrix);
-  transpose(normal_matrix);
-  glUniformMatrix4fv(priv->NormalMatrix_location, 1, GL_FALSE, normal_matrix);
-
-  /* Set the gear color */
-  glUniform4fv(priv->MaterialColor_location, 1, color);
-
-  /* Set the vertex buffer object to use */
-  glBindBuffer(GL_ARRAY_BUFFER, gear_vbo);
-
-  /* Set up the position of the attributes in the vertex buffer object */
-  glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), NULL);
-  glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6 * sizeof(GLfloat), (GLfloat *) 0 + 3);
-
-  /* Enable the attributes */
-  glEnableVertexAttribArray(0);
-  glEnableVertexAttribArray(1);
-
-  /* Draw the triangle strips that comprise the gear */
-  for (n = 0; n < gear->nstrips; n++) {
-    glDrawArrays(GL_TRIANGLE_STRIP, gear->strips[n].first, gear->strips[n].count);
-  }
-
-  /* Disable the attributes */
-  glDisableVertexAttribArray(1);
-  glDisableVertexAttribArray(0);
-}
-
-/* new window size or exposure */
-static void
-gtk_gears_reshape (GtkGLArea *area, int width, int height)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private ((GtkGears *) area);
-
-  /* Update the projection matrix */
-  perspective (priv->ProjectionMatrix, 60.0, width / (float)height, 1.0, 1024.0);
-
-  /* Set the viewport */
-  glViewport (0, 0, (GLint) width, (GLint) height);
-}
-
-static gboolean
-gtk_gears_render (GtkGLArea    *area,
-                  GdkGLContext *context)
-{
-  static const GLfloat red[4]   = { 0.8, 0.1, 0.0, 1.0 };
-  static const GLfloat green[4] = { 0.0, 0.8, 0.2, 1.0 };
-  static const GLfloat blue[4]  = { 0.2, 0.2, 1.0, 1.0 };
-
-  GtkGears *self = GTK_GEARS (area);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (self);
-  GLfloat transform[16];
-
-  identity (transform);
-
-  glClearColor (0.0, 0.0, 0.0, 0.0);
-  glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-  /* Translate and rotate the view */
-  translate (transform, 0, 0, -20);
-  rotate (transform, 2 * G_PI * priv->view_rot[0] / 360.0, 1, 0, 0);
-  rotate (transform, 2 * G_PI * priv->view_rot[1] / 360.0, 0, 1, 0);
-  rotate (transform, 2 * G_PI * priv->view_rot[2] / 360.0, 0, 0, 1);
-
-  /* Draw the gears */
-  draw_gear (self, priv->gear1, priv->gear_vbo[0], transform, -3.0, -2.0,      priv->angle,        red);
-  draw_gear (self, priv->gear2, priv->gear_vbo[1], transform,  3.1, -2.0, -2 * priv->angle - 9.0,  green);
-  draw_gear (self, priv->gear3, priv->gear_vbo[2], transform, -3.1,  4.2, -2 * priv->angle - 25.0, blue);
-
-  return TRUE;
-}
-
-static const char vertex_shader_gl[] =
-"#version 150\n"
-"\n"
-"in vec3 position;\n"
-"in vec3 normal;\n"
-"\n"
-"uniform mat4 ModelViewProjectionMatrix;\n"
-"uniform mat4 NormalMatrix;\n"
-"uniform vec4 LightSourcePosition;\n"
-"uniform vec4 MaterialColor;\n"
-"\n"
-"smooth out vec4 Color;\n"
-"\n"
-"void main(void)\n"
-"{\n"
-"    // Transform the normal to eye coordinates\n"
-"    vec3 N = normalize(vec3(NormalMatrix * vec4(normal, 1.0)));\n"
-"\n"
-"    // The LightSourcePosition is actually its direction for directional light\n"
-"    vec3 L = normalize(LightSourcePosition.xyz);\n"
-"\n"
-"    // Multiply the diffuse value by the vertex color (which is fixed in this case)\n"
-"    // to get the actual color that we will use to draw this vertex with\n"
-"    float diffuse = max(dot(N, L), 0.0);\n"
-"    Color = diffuse * MaterialColor;\n"
-"\n"
-"    // Transform the position to clip coordinates\n"
-"    gl_Position = ModelViewProjectionMatrix * vec4(position, 1.0);\n"
-"}";
-
-static const char fragment_shader_gl[] =
-"#version 150\n"
-"\n"
-"smooth in vec4 Color;\n"
-"\n"
-"void main(void)\n"
-"{\n"
-"    gl_FragColor = Color;\n"
-"}";
-
-static const char vertex_shader_gles[] =
-"attribute vec3 position;\n"
-"attribute vec3 normal;\n"
-"\n"
-"uniform mat4 ModelViewProjectionMatrix;\n"
-"uniform mat4 NormalMatrix;\n"
-"uniform vec4 LightSourcePosition;\n"
-"uniform vec4 MaterialColor;\n"
-"\n"
-"varying vec4 Color;\n"
-"\n"
-"void main(void)\n"
-"{\n"
-"    // Transform the normal to eye coordinates\n"
-"    vec3 N = normalize(vec3(NormalMatrix * vec4(normal, 1.0)));\n"
-"\n"
-"    // The LightSourcePosition is actually its direction for directional light\n"
-"    vec3 L = normalize(LightSourcePosition.xyz);\n"
-"\n"
-"    // Multiply the diffuse value by the vertex color (which is fixed in this case)\n"
-"    // to get the actual color that we will use to draw this vertex with\n"
-"    float diffuse = max(dot(N, L), 0.0);\n"
-"    Color = diffuse * MaterialColor;\n"
-"\n"
-"    // Transform the position to clip coordinates\n"
-"    gl_Position = ModelViewProjectionMatrix * vec4(position, 1.0);\n"
-"}";
-
-static const char fragment_shader_gles[] =
-"precision mediump float;\n"
-"varying vec4 Color;\n"
-"\n"
-"void main(void)\n"
-"{\n"
-"    gl_FragColor = Color;\n"
-"}";
-
-static void
-gtk_gears_realize (GtkWidget *widget)
-{
-  GtkGLArea *glarea = GTK_GL_AREA (widget);
-  GtkGears *gears = GTK_GEARS (widget);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-  GdkGLContext *context;
-  GLuint vao, v, f, program;
-  const char *p;
-  char msg[512];
-
-  GTK_WIDGET_CLASS (gtk_gears_parent_class)->realize (widget);
-
-  gtk_gl_area_make_current (glarea);
-  if (gtk_gl_area_get_error (glarea) != NULL)
-    return;
-
-  context = gtk_gl_area_get_context (glarea);
-
-  glEnable (GL_CULL_FACE);
-  glEnable (GL_DEPTH_TEST);
-
-  /* Create the VAO */
-  glGenVertexArrays (1, &vao);
-  glBindVertexArray (vao);
-  priv->vao = vao;
-
-  /* Compile the vertex shader */
-  if (gdk_gl_context_get_use_es (context))
-    p = vertex_shader_gles;
-  else
-    p = vertex_shader_gl;
-  v = glCreateShader(GL_VERTEX_SHADER);
-  glShaderSource(v, 1, &p, NULL);
-  glCompileShader(v);
-  glGetShaderInfoLog(v, sizeof msg, NULL, msg);
-  g_print ("vertex shader info: %s\n", msg);
-
-  /* Compile the fragment shader */
-  if (gdk_gl_context_get_use_es (context))
-    p = fragment_shader_gles;
-  else
-    p = fragment_shader_gl;
-  f = glCreateShader(GL_FRAGMENT_SHADER);
-  glShaderSource(f, 1, &p, NULL);
-  glCompileShader(f);
-  glGetShaderInfoLog(f, sizeof msg, NULL, msg);
-  g_print ("fragment shader info: %s\n", msg);
-
-  /* Create and link the shader program */
-  program = glCreateProgram();
-  glAttachShader(program, v);
-  glAttachShader(program, f);
-  glBindAttribLocation(program, 0, "position");
-  glBindAttribLocation(program, 1, "normal");
-
-  glLinkProgram(program);
-  glGetProgramInfoLog(program, sizeof msg, NULL, msg);
-  g_print ("program info: %s\n", msg);
-  glDeleteShader (v);
-  glDeleteShader (f);
-
-  /* Enable the shaders */
-  glUseProgram(program);
-  priv->program = program;
-
-  /* Get the locations of the uniforms so we can access them */
-  priv->ModelViewProjectionMatrix_location = glGetUniformLocation(program, "ModelViewProjectionMatrix");
-  priv->NormalMatrix_location = glGetUniformLocation(program, "NormalMatrix");
-  priv->LightSourcePosition_location = glGetUniformLocation(program, "LightSourcePosition");
-  priv->MaterialColor_location = glGetUniformLocation(program, "MaterialColor");
-
-  /* Set the LightSourcePosition uniform which is constant throught the program */
-  glUniform4fv(priv->LightSourcePosition_location, 1, priv->LightSourcePosition);
-
-  /* make the gears */
-  priv->gear1 = create_gear(1.0, 4.0, 1.0, 20, 0.7);
-
-  /* Store the vertices in a vertex buffer object (VBO) */
-  glGenBuffers (1, &(priv->gear_vbo[0]));
-  glBindBuffer (GL_ARRAY_BUFFER, priv->gear_vbo[0]);
-  glBufferData (GL_ARRAY_BUFFER,
-                priv->gear1->nvertices * sizeof(GearVertex),
-                priv->gear1->vertices,
-                GL_STATIC_DRAW);
-
-  priv->gear2 = create_gear(0.5, 2.0, 2.0, 10, 0.7);
-  glGenBuffers (1, &(priv->gear_vbo[1]));
-  glBindBuffer (GL_ARRAY_BUFFER, priv->gear_vbo[1]);
-  glBufferData (GL_ARRAY_BUFFER,
-                priv->gear2->nvertices * sizeof(GearVertex),
-                priv->gear2->vertices,
-                GL_STATIC_DRAW);
-
-  priv->gear3 = create_gear(1.3, 2.0, 0.5, 10, 0.7);
-  glGenBuffers (1, &(priv->gear_vbo[2]));
-  glBindBuffer (GL_ARRAY_BUFFER, priv->gear_vbo[2]);
-  glBufferData (GL_ARRAY_BUFFER,
-                priv->gear3->nvertices * sizeof(GearVertex),
-                priv->gear3->vertices,
-                GL_STATIC_DRAW);
-}
-
-static void
-gtk_gears_unrealize (GtkWidget *widget)
-{
-  GtkGLArea *glarea = GTK_GL_AREA (widget);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private ((GtkGears *) widget);
-
-  gtk_gl_area_make_current (glarea);
-  if (gtk_gl_area_get_error (glarea) != NULL)
-    return;
-
-  /* Release the resources associated with OpenGL */
-  if (priv->gear_vbo[0] != 0)
-    glDeleteBuffers (1, &(priv->gear_vbo[0]));
-
-  if (priv->gear_vbo[1] != 0)
-    glDeleteBuffers (1, &(priv->gear_vbo[1]));
-
-  if (priv->gear_vbo[2] != 0)
-    glDeleteBuffers (1, &(priv->gear_vbo[2]));
-
-  if (priv->vao != 0)
-    glDeleteVertexArrays (1, &priv->vao);
-
-  if (priv->program != 0)
-    glDeleteProgram (priv->program);
-
-  priv->ModelViewProjectionMatrix_location = 0;
-  priv->NormalMatrix_location = 0;
-  priv->LightSourcePosition_location = 0;
-  priv->MaterialColor_location = 0;
-
-  GTK_WIDGET_CLASS (gtk_gears_parent_class)->unrealize (widget);
-}
-
-static gboolean
-gtk_gears_tick (GtkWidget     *widget,
-                GdkFrameClock *frame_clock,
-                gpointer       user_data)
-{
-  GtkGears *gears = GTK_GEARS (widget);
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-  GdkFrameTimings *timings, *previous_timings;
-  gint64 previous_frame_time = 0;
-  gint64 frame_time;
-  gint64 history_start, history_len;
-  gint64 frame;
-  char *s;
-
-  frame = gdk_frame_clock_get_frame_counter (frame_clock);
-  frame_time = gdk_frame_clock_get_frame_time (frame_clock);
-
-  if (priv->first_frame_time == 0)
-    {
-      /* No need for changes on first frame */
-      priv->first_frame_time = frame_time;
-      if (priv->fps_label)
-        gtk_label_set_label (priv->fps_label, "FPS: ---");
-      return G_SOURCE_CONTINUE;
-    }
-
-  /* glxgears advances 70 degrees per second, so do the same */
-
-  priv->angle = fmod ((frame_time - priv->first_frame_time) / (double)G_USEC_PER_SEC * 70.0, 360.0);
-
-  gtk_widget_queue_draw (widget);
-
-  history_start = gdk_frame_clock_get_history_start (frame_clock);
-
-  if (priv->fps_label && frame % 60 == 0)
-    {
-      history_len = frame - history_start;
-      if (history_len > 0)
-        {
-          previous_timings = gdk_frame_clock_get_timings (frame_clock, frame - history_len);
-          previous_frame_time = gdk_frame_timings_get_frame_time (previous_timings);
-
-          s = g_strdup_printf ("FPS: %-4.1f", (G_USEC_PER_SEC * history_len) / (double)(frame_time - previous_frame_time));
-          gtk_label_set_label (priv->fps_label, s);
-          g_free (s);
-        }
-    }
-
-  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;
-}
-
-void
-gtk_gears_set_axis (GtkGears *gears, int axis, double value)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  if (axis < 0 || axis >= GTK_GEARS_N_AXIS)
-    return;
-
-  priv->view_rot[axis] = value;
-
-  gtk_widget_queue_draw (GTK_WIDGET (gears));
-}
-
-double
-gtk_gears_get_axis (GtkGears *gears, int axis)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  if (axis < 0 || axis >= GTK_GEARS_N_AXIS)
-    return 0.0;
-
-  return priv->view_rot[axis];
-}
-
-void
-gtk_gears_set_fps_label (GtkGears *gears, GtkLabel *label)
-{
-  GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
-
-  if (label)
-    g_object_ref (label);
-
-  g_clear_object (&priv->fps_label);
-
-  priv->fps_label = label;
-}
--- a/demos/gtk-demo/gtkgears.h
+++ b/demos/gtk-demo/gtkgears.h
@@ -1,48 +0,0 @@
-#ifndef __GTK_GEARS_H__
-#define __GTK_GEARS_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-enum {
-  GTK_GEARS_X_AXIS,
-  GTK_GEARS_Y_AXIS,
-  GTK_GEARS_Z_AXIS,
-
-  GTK_GEARS_N_AXIS
-};
-
-#define GTK_TYPE_GEARS      (gtk_gears_get_type ())
-#define GTK_GEARS(inst)     (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
-                             GTK_TYPE_GEARS,             \
-                             GtkGears))
-#define GTK_IS_GEARS(inst)  (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \
-                             GTK_TYPE_GEARS))
-
-typedef struct _GtkGears GtkGears;
-typedef struct _GtkGearsClass GtkGearsClass;
-
-struct _GtkGears {
-  GtkGLArea parent;
-};
-
-struct _GtkGearsClass {
-  GtkGLAreaClass parent_class;
-};
-
-GType      gtk_gears_get_type      (void) G_GNUC_CONST;
-
-GtkWidget *gtk_gears_new           (void);
-void       gtk_gears_set_axis      (GtkGears *gears,
-                                    int       axis,
-                                    double    value);
-double     gtk_gears_get_axis      (GtkGears *gears,
-                                    int       axis);
-void       gtk_gears_set_fps_label (GtkGears *gears,
-                                    GtkLabel *label);
-
-
-G_END_DECLS
-
-#endif /* __GTK_GEARS_H__ */
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -105,14 +105,14 @@ follow_if_link (GtkWidget   *text_view,
 /* Links can be activated by pressing Enter.
 */
 static gboolean
-key_pressed (GtkEventController *controller,
-             guint               keyval,
-             guint               keycode,
-             GdkModifierType     modifiers,
-             GtkWidget          *text_view)
+key_press_event (GtkWidget *text_view,
+                 GdkEventKey *event)
 {
  GtkTextIter iter;
  GtkTextBuffer *buffer;
+  guint keyval;
+
+  gdk_event_get_keyval ((GdkEvent *)event, &keyval);

  switch (keyval)
    {
@@ -128,7 +128,7 @@ key_pressed (GtkEventController *controller,
        break;
    }

-  return GDK_EVENT_PROPAGATE;
+  return FALSE;
 }

 static void set_cursor_if_appropriate (GtkTextView *text_view,
@@ -241,7 +241,6 @@ do_hypertext (GtkWidget *do_widget)
      GtkWidget *view;
      GtkWidget *sw;
      GtkTextBuffer *buffer;
-      GtkEventController *controller;

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
@@ -256,9 +255,8 @@ do_hypertext (GtkWidget *do_widget)
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
      gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);
      gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 20);
-      controller = gtk_event_controller_key_new (view);
-      g_object_set_data_full (G_OBJECT (view), "controller", controller, g_object_unref);
-      g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), view);
+      g_signal_connect (view, "key-press-event",
+                        G_CALLBACK (key_press_event), NULL);
      g_signal_connect (view, "event",
                        G_CALLBACK (event_cb), NULL);

--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -261,7 +261,9 @@ start_progressive_loading (GtkWidget *image)
   * The timeout simply simulates a slow data source by inserting
   * pauses in the reading process.
   */
-  load_timeout = g_timeout_add (150, progressive_timeout, image);
+  load_timeout = gdk_threads_add_timeout (150,
+                                progressive_timeout,
+                                image);
  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
 }

@@ -317,16 +319,12 @@ toggle_sensitivity_callback (GtkWidget *togglebutton,
 GtkWidget *
 do_images (GtkWidget *do_widget)
 {
-  GtkWidget *video;
  GtkWidget *frame;
  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *base_vbox;
  GtkWidget *image;
  GtkWidget *label;
  GtkWidget *button;
-  GdkPaintable *paintable;
-  GIcon *gicon;
+  GIcon     *gicon;

  if (!window)
    {
@@ -340,15 +338,9 @@ do_images (GtkWidget *do_widget)
      g_signal_connect (window, "destroy",
                        G_CALLBACK (cleanup_callback), NULL);

-      base_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (base_vbox, "margin", 16, NULL);
-      gtk_container_add (GTK_CONTAINER (window), base_vbox);
-
-      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
-      gtk_container_add (GTK_CONTAINER (base_vbox), hbox);
-
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      g_object_set (vbox, "margin", 16, NULL);
+      gtk_container_add (GTK_CONTAINER (window), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
@@ -405,8 +397,6 @@ do_images (GtkWidget *do_widget)


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

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
@@ -427,48 +417,13 @@ do_images (GtkWidget *do_widget)

      start_progressive_loading (image);

-      /* Video */
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Displaying video</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame);
-
-      video = gtk_video_new_for_resource ("/images/gtk-logo.webm");
-      gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE);
-      gtk_container_add (GTK_CONTAINER (frame), video);
-
-      /* Widget paintables */
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>GtkWidgetPaintable</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label);
-
-      paintable = gtk_widget_paintable_new (do_widget);
-      image = gtk_image_new_from_paintable (paintable);
-      gtk_image_set_can_shrink (GTK_IMAGE (image), TRUE);
-      gtk_widget_set_size_request (image, 100, 100);
-      gtk_widget_set_valign (image, GTK_ALIGN_START);
-      gtk_container_add (GTK_CONTAINER (vbox), image);
-
      /* Sensitivity control */
      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_pack_start (GTK_BOX (base_vbox), button);
+      gtk_box_pack_start (GTK_BOX (vbox), button);

      g_signal_connect (button, "toggled",
                        G_CALLBACK (toggle_sensitivity_callback),
-                        base_vbox);
+                        vbox);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/language-names.c
+++ b/demos/gtk-demo/language-names.c
@@ -2,13 +2,12 @@

 #include <stdlib.h>
 #include <stdio.h>
-
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #include <string.h>
 #include <errno.h>
+#include <dirent.h>
 #include <locale.h>
+#include <langinfo.h>
 #include <sys/stat.h>

 #include <glib.h>
@@ -174,9 +173,9 @@ languages_variant_init (const char *variant)
 {
  gboolean res;
  gsize    buf_len;
-  char *buf = NULL;
-  char *filename = NULL;
-  GError *error = NULL;
+  g_autofree char *buf = NULL;
+  g_autofree char *filename = NULL;
+  g_autoptr (GError) error = NULL;

  bindtextdomain (variant, ISO_CODES_LOCALESDIR);
  bind_textdomain_codeset (variant, "UTF-8");
@@ -186,25 +185,19 @@ languages_variant_init (const char *variant)
  res = g_file_get_contents (filename, &buf, &buf_len, &error);
  if (res)
    {
-      GMarkupParseContext *ctx = NULL;
+      g_autoptr (GMarkupParseContext) ctx = NULL;
      GMarkupParser parser = { languages_parse_start_tag, NULL, NULL, NULL, NULL };

      ctx = g_markup_parse_context_new (&parser, 0, NULL, NULL);

-      g_free (error);
      error = NULL;
      res = g_markup_parse_context_parse (ctx, buf, buf_len, &error);
-      g_free (ctx);

      if (!res)
        g_warning ("Failed to parse '%s': %s\n", filename, error->message);
    }
  else
    g_warning ("Failed to load '%s': %s\n", filename, error->message);
-
-  g_free (error);
-  g_free (filename);
-  g_free (buf);
 }

 static void
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -37,7 +37,7 @@ enum
 static Bug data[] =
 {
  { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
-  { FALSE, 60620, "Critical",   "gdk_surface_clear_area (gdksurface-win32.c) is not thread-safe" },
+  { FALSE, 60620, "Critical",   "gdk_window_clear_area (gdkwindow-win32.c) is not thread-safe" },
  { FALSE, 50214, "Major",      "Xft support does not clean up correctly" },
  { TRUE,  52877, "Major",      "GtkFileSelection needs a refresh method. " },
  { FALSE, 56070, "Normal",     "Can't click button after setting in sensitive" },
--- a/demos/gtk-demo/listbox.ui
+++ b/demos/gtk-demo/listbox.ui
@@ -3,53 +3,61 @@
  <!-- interface-requires gtk+ 3.10 -->
  <!-- interface-requires gtkdemo 3.10 -->
  <object class="GtkMenu" id="menu1">
+    <property name="visible">1</property>
    <child>
      <object class="GtkMenuItem" id="menuitem1">
+        <property name="visible">1</property>
        <property name="label" translatable="yes">Email message</property>
-        <property name="use-underline">1</property>
+        <property name="use_underline">1</property>
      </object>
    </child>
    <child>
      <object class="GtkMenuItem" id="menuitem2">
+        <property name="visible">1</property>
        <property name="label" translatable="yes">Embed message</property>
-        <property name="use-underline">1</property>
+        <property name="use_underline">1</property>
      </object>
    </child>
  </object>
  <template class="GtkMessageRow" parent="GtkListBoxRow">
    <child>
      <object class="GtkGrid" id="grid1">
+        <property name="visible">1</property>
        <property name="hexpand">1</property>
        <child>
          <object class="GtkImage" id="avatar_image">
-            <property name="width-request">32</property>
-            <property name="height-request">32</property>
+            <property name="width_request">32</property>
+            <property name="height_request">32</property>
+            <property name="visible">1</property>
            <property name="halign">center</property>
            <property name="valign">start</property>
-            <property name="margin-top">8</property>
-            <property name="margin-bottom">8</property>
-            <property name="margin-start">8</property>
-            <property name="margin-end">8</property>
+            <property name="margin_top">8</property>
+            <property name="margin_bottom">8</property>
+            <property name="margin_start">8</property>
+            <property name="margin_end">8</property>
            <property name="icon-name">image-missing</property>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
            <property name="height">5</property>
          </packing>
        </child>
        <child>
          <object class="GtkBox" id="box1">
+            <property name="visible">1</property>
            <property name="hexpand">1</property>
-            <property name="baseline-position">top</property>
+            <property name="baseline_position">top</property>
            <child>
              <object class="GtkButton" id="button2">
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                <property name="valign">baseline</property>
                <property name="relief">none</property>
                <child>
                  <object class="GtkLabel" id="source_name">
+                    <property name="visible">1</property>
                    <property name="valign">baseline</property>
                    <property name="label" translatable="0">Username</property>
                    <attributes>
@@ -61,6 +69,7 @@
            </child>
            <child>
              <object class="GtkLabel" id="source_nick">
+                <property name="visible">1</property>
                <property name="valign">baseline</property>
                <property name="label" translatable="0">@nick</property>
                <style>
@@ -73,6 +82,7 @@
            </child>
            <child>
              <object class="GtkLabel" id="short_time_label">
+                <property name="visible">1</property>
                <property name="valign">baseline</property>
                <property name="label" translatable="yes">38m</property>
                <style>
@@ -80,42 +90,42 @@
                </style>
              </object>
              <packing>
-                <property name="pack-type">end</property>
+                <property name="pack_type">end</property>
                <property name="position">2</property>
              </packing>
            </child>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="content_label">
+            <property name="visible">1</property>
            <property name="halign">start</property>
            <property name="valign">start</property>
            <property name="xalign">0</property>
            <property name="yalign">0</property>
            <property name="label" translatable="0">Message</property>
            <property name="wrap">1</property>
-            <accessibility>
-              <role type="static"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkBox" id="resent_box">
            <child>
              <object class="GtkImage" id="image2">
-                <property name="icon-name">media-playlist-repeat</property>
+                <property name="visible">1</property>
+                <property name="icon_name">media-playlist-repeat</property>
              </object>
            </child>
            <child>
              <object class="GtkLabel" id="label4">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">Resent by</property>
              </object>
              <packing>
@@ -125,8 +135,9 @@
            <child>
              <object class="GtkLinkButton" id="resent_by_button">
                <property name="label" translatable="0">reshareer</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                <property name="relief">none</property>
                <property name="uri">http://www.gtk.org</property>
              </object>
@@ -136,18 +147,20 @@
            </child>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
          </packing>
        </child>
        <child>
          <object class="GtkBox" id="box3">
+            <property name="visible">1</property>
            <property name="spacing">6</property>
            <child>
              <object class="GtkButton" id="expand_button">
                <property name="label" translatable="yes">Expand</property>
-                <property name="can-focus">1</property>
-                <property name="receives-default">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="receives_default">1</property>
                <property name="relief">none</property>
                <signal name="clicked" handler="expand_clicked" swapped="yes"/>
              </object>
@@ -158,16 +171,18 @@
                <child>
                  <object class="GtkButton" id="reply-button">
                    <property name="label" translatable="yes">Reply</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                    <property name="relief">none</property>
                  </object>
                </child>
                <child>
                  <object class="GtkButton" id="reshare-button">
                    <property name="label" translatable="yes">Reshare</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                    <property name="relief">none</property>
                    <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
                  </object>
@@ -178,8 +193,9 @@
                <child>
                  <object class="GtkButton" id="favorite-buttton">
                    <property name="label" translatable="yes">Favorite</property>
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                    <property name="relief">none</property>
                    <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
                  </object>
@@ -189,12 +205,14 @@
                </child>
                <child>
                  <object class="GtkMenuButton" id="more-button">
-                    <property name="can-focus">1</property>
-                    <property name="receives-default">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
+                    <property name="receives_default">1</property>
                    <property name="relief">none</property>
                    <property name="popup">menu1</property>
                    <child>
                      <object class="GtkLabel" id="label7">
+                        <property name="visible">1</property>
                        <property name="label" translatable="yes">More...</property>
                      </object>
                    </child>
@@ -210,44 +228,53 @@
            </child>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">3</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
          </packing>
        </child>
        <child>
          <object class="GtkRevealer" id="details_revealer">
+            <property name="visible">1</property>
            <child>
              <object class="GtkBox" id="box5">
+                <property name="visible">1</property>
                <property name="orientation">vertical</property>
                <child>
                  <object class="GtkBox" id="box7">
-                    <property name="margin-top">2</property>
-                    <property name="margin-bottom">2</property>
+                    <property name="visible">1</property>
+                    <property name="margin_top">2</property>
+                    <property name="margin_bottom">2</property>
                    <property name="spacing">8</property>
                    <child>
                      <object class="GtkFrame" id="frame1">
-                        <property name="shadow-type">none</property>
+                        <property name="visible">1</property>
+                        <property name="shadow_type">none</property>
                        <child>
                          <object class="GtkLabel" id="n_reshares_label">
+                            <property name="visible">1</property>
                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 Reshares</property>
-                            <property name="use-markup">1</property>
+                            <property name="use_markup">1</property>
                          </object>
                        </child>
-                        <child type="label_item"/>
+                        <child type="label_item">
+                        </child>
                      </object>
                    </child>
                    <child>
                      <object class="GtkFrame" id="frame2">
-                        <property name="shadow-type">none</property>
+                        <property name="visible">1</property>
+                        <property name="shadow_type">none</property>
                        <child>
                          <object class="GtkLabel" id="n_favorites_label">
+                            <property name="visible">1</property>
                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 FAVORITES</property>
-                            <property name="use-markup">1</property>
+                            <property name="use_markup">1</property>
                          </object>
                        </child>
-                        <child type="label_item"/>
+                        <child type="label_item">
+                        </child>
                      </object>
                      <packing>
                        <property name="position">1</property>
@@ -260,8 +287,10 @@ FAVORITES</property>
                </child>
                <child>
                  <object class="GtkBox" id="box6">
+                    <property name="visible">1</property>
                    <child>
                      <object class="GtkLabel" id="detailed_time_label">
+                        <property name="visible">1</property>
                        <property name="label" translatable="0">4:25 AM - 14 Jun 13 </property>
                        <style>
                          <class name="dim-label"/>
@@ -271,8 +300,9 @@ FAVORITES</property>
                    <child>
                      <object class="GtkButton" id="button5">
                        <property name="label" translatable="yes">Details</property>
-                        <property name="can-focus">1</property>
-                        <property name="receives-default">1</property>
+                        <property name="visible">1</property>
+                        <property name="can_focus">1</property>
+                        <property name="receives_default">1</property>
                        <property name="relief">none</property>
                        <style>
                          <class name="dim-label"/>
@@ -291,8 +321,8 @@ FAVORITES</property>
            </child>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">4</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">4</property>
          </packing>
        </child>
      </object>
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -250,7 +250,7 @@ static gchar *types[] =
  "GtkTreeSelection ",
  "GdkDisplay ",
  "GdkScreen ",
-  "GdkSurface ",
+  "GdkWindow ",
  "GdkEventButton ",
  "GdkCursor ",
  "GtkTreeIter ",
@@ -532,106 +532,7 @@ fontify (GtkTextBuffer *source_buffer)
    }
 }

-static GtkWidget *
-display_image (const char *resource)
-{
-  GtkWidget *sw, *image;
-
-  image = gtk_image_new_from_resource (resource);
-  gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (sw), image);
-
-  return sw;
-}
-
-static GtkWidget *
-display_text (const char *resource)
-{
-  GtkTextBuffer *buffer;
-  GtkWidget *textview, *sw;
-  GBytes *bytes;
-
-  bytes = g_resources_lookup_data (resource, 0, NULL);
-  g_assert (bytes);
-
-  g_assert (g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL));
-
-  textview = gtk_text_view_new ();
-  g_object_set (textview,
-                "left-margin", 20,
-                "right-margin", 20,
-                "top-margin", 20,
-                "bottom-margin", 20,
-                NULL);
-  gtk_text_view_set_editable (GTK_TEXT_VIEW (textview), FALSE);
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (textview), FALSE);
-  /* Make it a bit nicer for text. */
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (textview), GTK_WRAP_WORD);
-  gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (textview), 2);
-  gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (textview), 2);
-
-  buffer = gtk_text_buffer_new (NULL);
-  gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-  if (g_str_has_suffix (resource, ".c"))
-    fontify (buffer);
-  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
-
-  g_bytes_unref (bytes);
-
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                       GTK_SHADOW_NONE);
-  gtk_container_add (GTK_CONTAINER (sw), textview);
-
-  return sw;
-}
-
-static GtkWidget *
-display_video (const char *resource)
-{
-  GtkWidget *video;
-
-  video = gtk_video_new_for_resource (resource);
-  gtk_video_set_loop (GTK_VIDEO (video), TRUE);
-
-  return video;
-}
-
-static GtkWidget *
-display_nothing (const char *resource)
-{
-  GtkWidget *widget;
-  char *str;
-
-  str = g_strdup_printf ("The lazy GTK developers forgot to add a way to display the resource '%s'", resource);
-  widget = gtk_label_new (str);
-  gtk_label_set_line_wrap (GTK_LABEL (widget), TRUE);
-
-  g_free (str);
-
-  return widget;
-}
-
-static struct {
-  const char *extension;
-  GtkWidget * (* display_func) (const char *resource);
-} display_funcs[] = {
-  { ".gif", display_image },
-  { ".jpg", display_image },
-  { ".png", display_image },
-  { ".c", display_text },
-  { ".css", display_text },
-  { ".glsl", display_text },
-  { ".h", display_text },
-  { ".txt", display_text },
-  { ".ui", display_text },
-  { ".webm", display_video }
-};
+static GtkWidget *create_text (GtkWidget **text_view, gboolean is_source);

 static void
 add_data_tab (const gchar *demoname)
@@ -639,7 +540,7 @@ add_data_tab (const gchar *demoname)
  gchar *resource_dir, *resource_name;
  gchar **resources;
  GtkWidget *widget, *label;
-  guint i, j;
+  guint i;

  resource_dir = g_strconcat ("/", demoname, NULL);
  resources = g_resources_enumerate_children (resource_dir, 0, NULL);
@@ -653,22 +554,58 @@ add_data_tab (const gchar *demoname)
    {
      resource_name = g_strconcat (resource_dir, "/", resources[i], NULL);

-      for (j = 0; j < G_N_ELEMENTS(display_funcs); j++)
+      widget = gtk_image_new_from_resource (resource_name);
+      if (gtk_image_get_surface (GTK_IMAGE (widget)) == NULL)
        {
-          if (g_str_has_suffix (resource_name, display_funcs[j].extension))
-            break;
+          GBytes *bytes;
+
+          /* So we've used the best API available to figure out it's
+           * not an image. Let's try something else then.
+           */
+          g_object_ref_sink (widget);
+          g_object_unref (widget);
+
+          bytes = g_resources_lookup_data (resource_name, 0, NULL);
+          g_assert (bytes);
+
+          if (g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
+            {
+              /* Looks like it parses as text. Dump it into a textview then! */
+              GtkTextBuffer *buffer;
+              GtkWidget *textview;
+
+              widget = create_text (&textview, FALSE);
+              buffer = gtk_text_buffer_new (NULL);
+              gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
+              if (g_str_has_suffix (resource_name, ".c"))
+                fontify (buffer);
+              gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
+            }
+          else
+            {
+              g_warning ("Don't know how to display resource '%s'", resource_name);
+              widget = NULL;
+            }
+
+          g_bytes_unref (bytes);
        }

-      if (j < G_N_ELEMENTS(display_funcs))
-        widget = display_funcs[j].display_func (resource_name);
-      else
-        widget = display_nothing (resource_name);
+      if (GTK_IS_IMAGE (widget))
+        {
+          GtkWidget *sw;
+
+          gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+          gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+          sw = gtk_scrolled_window_new (NULL, NULL);
+          gtk_container_add (GTK_CONTAINER (sw), widget);
+          widget = sw;
+        }

      label = gtk_label_new (resources[i]);
      gtk_widget_show (label);
      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
      gtk_container_child_set (GTK_CONTAINER (notebook),
-                               widget,
+                               GTK_WIDGET (widget),
                               "tab-expand", TRUE,
                               NULL);

@@ -888,6 +825,49 @@ selection_cb (GtkTreeSelection *selection,
  g_free (filename);
 }

+static GtkWidget *
+create_text (GtkWidget **view,
+             gboolean    is_source)
+{
+  GtkWidget *scrolled_window;
+  GtkWidget *text_view;
+
+  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window),
+                                       GTK_SHADOW_NONE);
+
+  *view = text_view = gtk_text_view_new ();
+  g_object_set (text_view,
+                "left-margin", 20,
+                "right-margin", 20,
+                "top-margin", 20,
+                "bottom-margin", 20,
+                NULL);
+
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
+  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_view), FALSE);
+
+  gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
+
+  if (is_source)
+    {
+      gtk_text_view_set_monospace (GTK_TEXT_VIEW (text_view), TRUE);
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_NONE);
+    }
+  else
+    {
+      /* Make it a bit nicer for text. */
+      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
+      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (text_view), 2);
+      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (text_view), 2);
+    }
+
+  return scrolled_window;
+}
+
 static void
 populate_model (GtkTreeModel *model)
 {
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -22,17 +22,20 @@
    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar">
+        <property name="visible">1</property>
        <property name="show-title-buttons">1</property>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="valign">center</property>
-            <property name="can-focus">1</property>
-            <property name="action-name">win.run</property>
+            <property name="can_focus">1</property>
+            <property name="action_name">win.run</property>
            <style>
              <class name="text-button"/>
            </style>
            <child>
              <object class="GtkLabel">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">Run</property>
              </object>
            </child>
@@ -42,19 +45,23 @@
    </child>
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <child>
          <object class="GtkFrame">
+            <property name="visible">1</property>
            <child>
              <object class="GtkScrolledWindow">
-                <property name="width-request">120</property>
-                <property name="can-focus">1</property>
-                <property name="hscrollbar-policy">never</property>
-                <property name="min-content-width">150</property>
+                <property name="width_request">120</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="min_content_width">150</property>
                <child>
                  <object class="GtkTreeView" id="treeview">
-                    <property name="can-focus">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                    <property name="model">treestore</property>
-                    <property name="headers-visible">0</property>
+                    <property name="headers_visible">0</property>
                    <child internal-child="selection">
                      <object class="GtkTreeSelection" id="treeview-selection">
                        <property name="mode">browse</property>
@@ -84,70 +91,77 @@
        </child>
        <child>
          <object class="GtkNotebook" id="notebook">
-            <property name="can-focus">1</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
            <property name="scrollable">1</property>
-            <property name="enable-popup">1</property>
-            <property name="show-border">0</property>
+            <property name="enable_popup">1</property>
+            <property name="show_border">0</property>
            <property name="expand">1</property>
            <child>
              <object class="GtkScrolledWindow">
-                <property name="can-focus">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                <child>
                  <object class="GtkTextView" id="info-textview">
-                    <property name="can-focus">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                    <property name="left-margin">20</property>
                    <property name="right-margin">20</property>
                    <property name="top-margin">20</property>
                    <property name="bottom-margin">20</property>
-                    <property name="pixels-above-lines">2</property>
-                    <property name="pixels-below-lines">2</property>
+                    <property name="pixels_above_lines">2</property>
+                    <property name="pixels_below_lines">2</property>
                    <property name="editable">0</property>
-                    <property name="wrap-mode">word</property>
-                    <property name="cursor-visible">0</property>
+                    <property name="wrap_mode">word</property>
+                    <property name="cursor_visible">0</property>
                  </object>
                </child>
              </object>
              <packing>
-                <property name="tab-expand">1</property>
+                <property name="tab_expand">1</property>
              </packing>
            </child>
            <child type="tab">
              <object class="GtkLabel">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">_Info</property>
-                <property name="use-underline">1</property>
+                <property name="use_underline">1</property>
              </object>
              <packing>
-                <property name="tab-expand">1</property>
-                <property name="tab-fill">0</property>
+                <property name="tab_expand">1</property>
+                <property name="tab_fill">0</property>
              </packing>
            </child>
            <child>
              <object class="GtkScrolledWindow" id="source-scrolledwindow">
-                <property name="can-focus">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                <child>
                  <object class="GtkTextView" id="source-textview">
-                    <property name="can-focus">1</property>
+                    <property name="visible">1</property>
+                    <property name="can_focus">1</property>
                    <property name="left-margin">20</property>
                    <property name="right-margin">20</property>
                    <property name="top-margin">20</property>
                    <property name="bottom-margin">20</property>
                    <property name="editable">0</property>
-                    <property name="cursor-visible">0</property>
+                    <property name="cursor_visible">0</property>
                  </object>
                </child>
              </object>
              <packing>
                <property name="position">1</property>
-                <property name="tab-expand">1</property>
+                <property name="tab_expand">1</property>
              </packing>
            </child>
            <child type="tab">
              <object class="GtkLabel">
+                <property name="visible">1</property>
                <property name="label" translatable="yes">Source</property>
              </object>
              <packing>
                <property name="position">1</property>
-                <property name="tab-fill">0</property>
+                <property name="tab_fill">0</property>
              </packing>
            </child>
          </object>
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -45,10 +45,6 @@ demos = files([
  'modelbutton.c',
  'overlay.c',
  'overlay2.c',
-  'paint.c',
-  'paintable.c',
-  'paintable_animated.c',
-  'paintable_mediastream.c',
  'panes.c',
  'pickers.c',
  'pixbufs.c',
@@ -70,18 +66,15 @@ demos = files([
  'textview.c',
  'textscroll.c',
  'theming_style_classes.c',
+  'toolpalette.c',
  'transparent.c',
  'tree_store.c',
-  'video_player.c',
 ])

 gtkdemo_deps = [ libgtk_dep, ]

-extra_demo_sources = files(['main.c', 'gtkfishbowl.c', 'fontplane.c', 'gtkgears.c'])
-
 if harfbuzz_dep.found() and pangoft_dep.found()
  demos += files('font_features.c')
-  extra_demo_sources += files(['script-names.c', 'language-names.c'])
  gtkdemo_deps += [ harfbuzz_dep, ]
 endif

@@ -101,12 +94,11 @@ gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
                                            source_dir: '.')

 executable('gtk4-demo',
-                   demos, demos_h, extra_demo_sources, gtkdemo_resources,
+           'main.c', 'gtkfishbowl.c', 'fontplane.c', 'script-names.c', 'language-names.c', demos, demos_h, gtkdemo_resources,
           c_args: gtkdemo_args,
           dependencies: gtkdemo_deps,
           include_directories: confinc,
           gui_app: true,
-           link_args: extra_demo_ldflags,
           install: true)

 executable('gtk4-demo-application',
@@ -115,7 +107,6 @@ executable('gtk4-demo-application',
           dependencies: gtkdemo_deps,
           include_directories: confinc,
           gui_app: true,
-           link_args: extra_demo_ldflags,
           install: true)

 # icons
@@ -135,6 +126,3 @@ install_data('gtk4-demo.desktop', install_dir: gtk_applicationsdir)
 # GSettings
 install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir)
 gnome.compile_schemas()
-
-# appdata
-install_data('org.gtk.Demo.appdata.xml', install_dir: gtk_appdatadir)
--- a/demos/gtk-demo/modelbutton.ui
+++ b/demos/gtk-demo/modelbutton.ui
@@ -4,19 +4,23 @@
  <object class="GtkWindow" id="window1">
    <child type="titlebar">
      <object class="GtkHeaderBar">
+        <property name="visible">1</property>
        <property name="show-title-buttons">1</property>
        <property name="title" translatable="yes">Model Button</property>
      </object>
    </child>
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <property name="orientation">vertical</property>
        <property name="margin">80</property>
        <child>
          <object class="GtkMenuButton">
+            <property name="visible">1</property>
            <property name="popover">thing_a</property>
            <child>
              <object class="GtkLabel">
+                <property name="visible">1</property>
                <property name="label">Color</property>
                <property name="hexpand">1</property>
              </object>
@@ -25,9 +29,11 @@
        </child>
        <child>
          <object class="GtkMenuButton">
+            <property name="visible">1</property>
            <property name="popover">thing_b</property>
            <child>
              <object class="GtkLabel">
+                <property name="visible">1</property>
                <property name="label">Flavors</property>
                <property name="hexpand">1</property>
              </object>
@@ -36,9 +42,11 @@
        </child>
        <child>
          <object class="GtkMenuButton">
+            <property name="visible">1</property>
            <property name="popover">thing_c</property>
            <child>
              <object class="GtkLabel">
+                <property name="visible">1</property>
                <property name="label">Tools</property>
                <property name="hexpand">1</property>
              </object>
@@ -51,25 +59,32 @@
  <object class="GtkPopover" id="thing_a">
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <property name="margin">10</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="action-name">win.color</property>
+            <property name="action-target">'red'</property>
            <property name="text">Red</property>
            <property name="inverted">1</property>
          </object>
        </child>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="action-name">win.color</property>
+            <property name="action-target">'green'</property>
            <property name="text">Green</property>
            <property name="inverted">1</property>
          </object>
        </child>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="action-name">win.color</property>
+            <property name="action-target">'blue'</property>
            <property name="text">Blue</property>
            <property name="inverted">1</property>
          </object>
@@ -80,27 +95,32 @@
  <object class="GtkPopover" id="thing_b">
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <property name="margin">10</property>
        <property name="orientation">vertical</property>
        <property name="spacing">10</property>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="action-name">win.chocolate</property>
            <property name="text">Chocolate</property>
          </object>
        </child>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="action-name">win.vanilla</property>
            <property name="text">Vanilla</property>
          </object>
        </child>
        <child>
          <object class="GtkSeparator">
+            <property name="visible">1</property>
          </object>
        </child>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="action-name">win.sprinkles</property>
            <property name="text">Add Sprinkles</property>
          </object>
@@ -111,11 +131,13 @@
  <object class="GtkPopover" id="thing_c">
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <property name="margin">10</property>
        <property name="orientation">vertical</property>
        <property name="spacing">10</property>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="text">Hammer</property>
            <property name="role">check</property>
            <signal name="clicked" handler="tool_clicked"/>
@@ -123,6 +145,7 @@
        </child>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="text">Screwdriver</property>
            <property name="role">check</property>
            <signal name="clicked" handler="tool_clicked"/>
@@ -130,6 +153,7 @@
        </child>
        <child>
          <object class="GtkModelButton">
+            <property name="visible">1</property>
            <property name="text">Drill</property>
            <property name="role">check</property>
            <signal name="clicked" handler="tool_clicked"/>
--- a/demos/gtk-demo/org.gtk.Demo.appdata.xml
+++ b/demos/gtk-demo/org.gtk.Demo.appdata.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>org.gtk.Demo.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.0+</project_license>
-  <name>GTK+ Demo</name>
-  <summary>Program to demonstrate GTK+ functions</summary>
-  <description>
-    <p>
-      GTK+ Demo is a collection of examples that demonstrate the major
-      features of the GTK+ toolkit.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-demo/gtk-demo1.png</image>
-      <caption>The main window</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-demo/gtk-demo2.png</image>
-      <caption>An example</caption>
-    </screenshot>
-  </screenshots>
-  <kudos>
-    <kudo>AppMenu</kudo>
-    <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>
-</component>
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -1,283 +0,0 @@
-/* Paint
- *
- * Demonstrates practical handling of drawing tablets in a real world
- * usecase.
- */
-#include <gtk/gtk.h>
-
-typedef struct
-{
-  GtkWidget parent_instance;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  GdkRGBA draw_color;
-
-  GtkGesture *stylus_gesture;
-} DrawingArea;
-
-typedef struct
-{
-  GtkWidgetClass parent_class;
-} DrawingAreaClass;
-
-G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_WIDGET)
-
-static void
-drawing_area_ensure_surface (DrawingArea *area,
-                             gint         width,
-                             gint         height)
-{
-  if (!area->surface ||
-      cairo_image_surface_get_width (area->surface) != width ||
-      cairo_image_surface_get_height (area->surface) != height)
-    {
-      cairo_surface_t *surface;
-
-      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                            width, height);
-      if (area->surface)
-        {
-          cairo_t *cr;
-
-          cr = cairo_create (surface);
-          cairo_set_source_surface (cr, area->surface, 0, 0);
-          cairo_paint (cr);
-
-          cairo_surface_destroy (area->surface);
-          cairo_destroy (area->cr);
-          cairo_destroy (cr);
-        }
-
-      area->surface = surface;
-      area->cr = cairo_create (surface);
-    }
-}
-
-static void
-drawing_area_size_allocate (GtkWidget           *widget,
-                            const GtkAllocation *allocation,
-                            int                  baseline)
-{
-  DrawingArea *area = (DrawingArea *) widget;
-
-  drawing_area_ensure_surface (area, allocation->width, allocation->height);
-
-  GTK_WIDGET_CLASS (drawing_area_parent_class)->size_allocate (widget, allocation, baseline);
-}
-
-static void
-drawing_area_map (GtkWidget *widget)
-{
-  GtkAllocation allocation;
-
-  GTK_WIDGET_CLASS (drawing_area_parent_class)->map (widget);
-
-  gtk_widget_get_allocation (widget, &allocation);
-  drawing_area_ensure_surface ((DrawingArea *) widget,
-                               allocation.width, allocation.height);
-}
-
-static void
-drawing_area_unmap (GtkWidget *widget)
-{
-  DrawingArea *area = (DrawingArea *) widget;
-
-  g_clear_pointer (&area->cr, cairo_destroy);
-  g_clear_pointer (&area->surface, cairo_surface_destroy);
-
-  GTK_WIDGET_CLASS (drawing_area_parent_class)->unmap (widget);
-}
-
-static void
-drawing_area_snapshot (GtkWidget   *widget,
-		       GtkSnapshot *snapshot)
-{
-  DrawingArea *area = (DrawingArea *) widget;
-  GtkAllocation allocation;
-  cairo_t *cr;
-
-  gtk_widget_get_allocation (widget, &allocation);
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT (
-                                    0, 0,
-				    allocation.width,
-				    allocation.height
-                                  ),
-                                  "DrawingArea");
-
-  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_paint (cr);
-
-  cairo_set_source_surface (cr, area->surface, 0, 0);
-  cairo_paint (cr);
-
-  cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
-  cairo_stroke (cr);
-
-  cairo_destroy (cr);
-}
-
-static void
-drawing_area_class_init (DrawingAreaClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  widget_class->size_allocate = drawing_area_size_allocate;
-  widget_class->snapshot = drawing_area_snapshot;
-  widget_class->map = drawing_area_map;
-  widget_class->unmap = drawing_area_unmap;
-}
-
-static void
-drawing_area_apply_stroke (DrawingArea   *area,
-                           GdkDeviceTool *tool,
-                           gdouble        x,
-                           gdouble        y,
-                           gdouble        pressure)
-{
-  if (gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
-    {
-      cairo_set_line_width (area->cr, 10 * pressure);
-      cairo_set_operator (area->cr, CAIRO_OPERATOR_DEST_OUT);
-    }
-  else
-    {
-      cairo_set_line_width (area->cr, 4 * pressure);
-      cairo_set_operator (area->cr, CAIRO_OPERATOR_SATURATE);
-    }
-
-  cairo_set_source_rgba (area->cr, area->draw_color.red,
-                         area->draw_color.green, area->draw_color.blue,
-                         area->draw_color.alpha * pressure);
-
-  //cairo_set_source_rgba (area->cr, 0, 0, 0, pressure);
-
-  cairo_line_to (area->cr, x, y);
-  cairo_stroke (area->cr);
-  cairo_move_to (area->cr, x, y);
-}
-
-static void
-stylus_gesture_down (GtkGestureStylus *gesture,
-                     gdouble           x,
-                     gdouble           y,
-                     DrawingArea      *area)
-{
-  cairo_new_path (area->cr);
-}
-
-static void
-stylus_gesture_motion (GtkGestureStylus *gesture,
-                       gdouble           x,
-                       gdouble           y,
-                       DrawingArea      *area)
-{
-  GdkTimeCoord *backlog;
-  GdkDeviceTool *tool;
-  gdouble pressure;
-  guint n_items;
-
-  tool = gtk_gesture_stylus_get_device_tool (gesture);
-
-  if (gtk_gesture_stylus_get_backlog (gesture, &backlog, &n_items))
-    {
-      guint i;
-
-      for (i = 0; i < n_items; i++)
-        {
-          drawing_area_apply_stroke (area, tool,
-                                     backlog[i].axes[GDK_AXIS_X],
-                                     backlog[i].axes[GDK_AXIS_Y],
-                                     backlog[i].axes[GDK_AXIS_PRESSURE]);
-        }
-
-      g_free (backlog);
-    }
-  else
-    {
-      if (!gtk_gesture_stylus_get_axis (gesture, GDK_AXIS_PRESSURE, &pressure))
-        pressure = 1;
-
-      drawing_area_apply_stroke (area, tool, x, y, pressure);
-    }
-
-  gtk_widget_queue_draw (GTK_WIDGET (area));
-}
-
-static void
-drawing_area_init (DrawingArea *area)
-{
-  gtk_widget_set_has_surface (GTK_WIDGET (area), FALSE);
-
-  area->stylus_gesture = gtk_gesture_stylus_new (GTK_WIDGET (area));
-  g_signal_connect (area->stylus_gesture, "down",
-                    G_CALLBACK (stylus_gesture_down), area);
-  g_signal_connect (area->stylus_gesture, "motion",
-                    G_CALLBACK (stylus_gesture_motion), area);
-
-  area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
-}
-
-GtkWidget *
-drawing_area_new (void)
-{
-  return g_object_new (drawing_area_get_type (), NULL);
-}
-
-void
-drawing_area_set_color (DrawingArea *area,
-                        GdkRGBA     *color)
-{
-  area->draw_color = *color;
-}
-
-static void
-color_button_color_set (GtkColorButton *button,
-                        DrawingArea    *draw_area)
-{
-  GdkRGBA color;
-
-  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
-  drawing_area_set_color (draw_area, &color);
-}
-
-GtkWidget *
-do_paint (GtkWidget *toplevel)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *draw_area, *headerbar, *colorbutton;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-      draw_area = drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), draw_area);
-
-      headerbar = gtk_header_bar_new ();
-      gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar), "Paint");
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (headerbar), TRUE);
-
-      colorbutton = gtk_color_button_new ();
-      g_signal_connect (colorbutton, "color-set",
-                        G_CALLBACK (color_button_color_set), draw_area);
-      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (colorbutton),
-                                  &(GdkRGBA) { 0, 0, 0, 1 });
-
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
-      gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -1,179 +0,0 @@
-/* Paintable/A simple paintable
- *
- * GdkPaintable is an interface used by GTK for drawings of any sort
- * that do not require layouting or positioning.
- *
- * This demo code gives a simple example on how a paintable can
- * be created.
- *
- * Paintables can be used in many places inside GTK widgets, but the
- * most common usage is inside GtkImage and that's what we're going
- * to do here.
- */
-
-#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_ICON (gtk_nuclear_icon_get_type ())
-G_DECLARE_FINAL_TYPE (GtkNuclearIcon, gtk_nuclear_icon, GTK, NUCLEAR_ICON, GObject)
-
-/* Declare the struct. */
-struct _GtkNuclearIcon
-{
-  GObject parent_instance;
-
-  /* We store this rotation value here.
-   * We are not doing with it here, but it will come in
-   * very useful in the followup demos.
-   */
-  double rotation;
-};
-
-struct _GtkNuclearIconClass
-{
-  GObjectClass parent_class;
-};
-
-/* This is the function that draws the actual icon.
- * We make it a custom function and define it in the paintable.h header
- * so that it can be called from all the other demos, too.
- */
-void
-gtk_nuclear_snapshot (GtkSnapshot *snapshot,
-                      double       width,
-                      double       height,
-                      double       rotation)
-{
-#define RADIUS 0.3
-  cairo_t *cr;
-  double size;
-
-  gtk_snapshot_append_color (snapshot,
-                             &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 },
-                             &GRAPHENE_RECT_INIT (0, 0, width, height),
-                             "Yellow background");
-
-  size = MIN (width, height);
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT ((width - size) / 2.0,
-                                                       (height - size) / 2.0,
-                                                       size, size),
-                                  "Radioactive Icon");
-  cairo_translate (cr, width / 2.0, height / 2.0);
-  cairo_scale (cr, size, size);
-  cairo_rotate (cr, rotation);
-
-  cairo_arc (cr, 0, 0, 0.1, - G_PI, G_PI);
-  cairo_fill (cr);
-
-  cairo_set_line_width (cr, RADIUS);
-  cairo_set_dash (cr, (double[1]) { RADIUS * G_PI / 3 }, 1, 0.0);
-  cairo_arc (cr, 0, 0, RADIUS, - G_PI, G_PI);
-  cairo_stroke (cr);
-
-  cairo_destroy (cr);
-}
-
-/* Here, we implement the functionality required by the GdkPaintable interface */
-static void
-gtk_nuclear_icon_snapshot (GdkPaintable *paintable,
-                           GdkSnapshot  *snapshot,
-                           double        width,
-                           double        height)
-{
-  GtkNuclearIcon *nuclear = GTK_NUCLEAR_ICON (paintable);
-
-  /* The snapshot function is the only function we need to implement.
-   * It does the actual drawing of the paintable.
-   */
-
-  gtk_nuclear_snapshot (snapshot,
-                        width, height,
-                        nuclear->rotation);
-}
-
-static GdkPaintableFlags
-gtk_nuclear_icon_get_flags (GdkPaintable *paintable)
-{
-  /* The flags are very useful to let GTK know that this image
-   * is never going to change.
-   * This allows many optimizations and should therefore always
-   * be set.
-   */
-  return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
-}
-
-static void
-gtk_nuclear_icon_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_nuclear_icon_snapshot;
-  iface->get_flags = gtk_nuclear_icon_get_flags;
-}
-
-/* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkNuclearIcon, gtk_nuclear_icon, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_nuclear_icon_paintable_init))
-
-/* Here's the boilerplate for the GObject declaration.
- * We don't need to do anything special here, because we keep no
- * data of our own.
- */
-static void
-gtk_nuclear_icon_class_init (GtkNuclearIconClass *klass)
-{
-}
-
-static void
-gtk_nuclear_icon_init (GtkNuclearIcon *nuclear)
-{
-}
-
-/* And finally, we add a simple constructor.
- * It is declared in the header so that the other examples
- * can use it.
- */
-GdkPaintable *
-gtk_nuclear_icon_new (double rotation)
-{
-  GtkNuclearIcon *nuclear;
-
-  nuclear = g_object_new (GTK_TYPE_NUCLEAR_ICON, NULL);
-  nuclear->rotation = rotation;
-
-  return GDK_PAINTABLE (nuclear);
-}
-
-GtkWidget *
-do_paintable (GtkWidget *do_widget)
-{
-  GdkPaintable *nuclear;
-  GtkWidget *image;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Nuclear Icon");
-      gtk_window_set_default_size (GTK_WINDOW (window), 300, 200);
-
-      nuclear = gtk_nuclear_icon_new (0.0);
-      image = gtk_image_new_from_paintable (nuclear);
-      gtk_container_add (GTK_CONTAINER (window), image);
-      g_object_unref (nuclear);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/paintable.h
+++ b/demos/gtk-demo/paintable.h
@@ -1,15 +0,0 @@
-#ifndef __PAINTABLE_H__
-#define __PAINTABLE_H__
-
-#include <gtk/gtk.h>
-
-void            gtk_nuclear_snapshot           (GtkSnapshot     *snapshot,
-                                                double           width,
-                                                double           height,
-                                                double           rotation);
-
-GdkPaintable *  gtk_nuclear_icon_new            (double          rotation);
-GdkPaintable *  gtk_nuclear_animation_new       (void);
-GtkMediaStream *gtk_nuclear_media_stream_new    (void);
-
-#endif /* __PAINTABLE_H__ */
--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -1,209 +0,0 @@
-/* Paintable/An animated paintable
- *
- * GdkPaintable also allows paintables to change.
- *
- * This demo code gives an example of how this could work. It builds
- * on the previous simple example.
- *
- * Paintables can also change their size, this works similarly, but
- * we will not demonstrate this here as our icon does not have any size.
- */
-
-#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_ANIMATION (gtk_nuclear_animation_get_type ())
-G_DECLARE_FINAL_TYPE (GtkNuclearAnimation, gtk_nuclear_animation, GTK, NUCLEAR_ANIMATION, GObject)
-
-/* Do a full rotation in 5 seconds.
- * We will register the timeout for doing a single step to
- * be executed every 10ms, which means after 1000 steps
- * 10s will have elapsed.
- */
-#define MAX_PROGRESS 500
-
-/* Declare the struct. */
-struct _GtkNuclearAnimation
-{
-  GObject parent_instance;
-
-  /* This variable stores the progress of our animation.
-   * We just count upwards until we hit MAX_PROGRESS and
-   * then start from scratch.
-   */
-  int progress;
-
-  /* This variable holds the ID of the timer that updates
-   * our progress variable.
-   * We need to keep track of it so that we can remove it
-   * again.
-   */
-  guint source_id;
-};
-
-struct _GtkNuclearAnimationClass
-{
-  GObjectClass parent_class;
-};
-
-/* Again, we implement the functionality required by the GdkPaintable interface */
-static void
-gtk_nuclear_animation_snapshot (GdkPaintable *paintable,
-                                GdkSnapshot  *snapshot,
-                                double        width,
-                                double        height)
-{
-  GtkNuclearAnimation *nuclear = GTK_NUCLEAR_ANIMATION (paintable);
-
-  /* We call the function from the previous example here. */
-  gtk_nuclear_snapshot (snapshot,
-                        width, height,
-                        2 * G_PI * nuclear->progress / MAX_PROGRESS);
-}
-
-static GdkPaintable *
-gtk_nuclear_animation_get_current_image (GdkPaintable *paintable)
-{
-  GtkNuclearAnimation *nuclear = GTK_NUCLEAR_ANIMATION (paintable);
-
-  /* For non-static paintables, this function needs to be implemented.
-   * It must return a static paintable with the same contents
-   * as this one currently has.
-   *
-   * Luckily we added the rotation property to the nuclear icon
-   * object previously, so we can just return an instance of that one.
-   */
-  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / MAX_PROGRESS);
-}
-
-static GdkPaintableFlags
-gtk_nuclear_animation_get_flags (GdkPaintable *paintable)
-{
-  /* This time, we cannot set the static contents flag because our animation
-   * changes the contents.
-   * However, our size still doesn't change, so report that flag.
-   */
-  return GDK_PAINTABLE_STATIC_SIZE;
-}
-
-static void
-gtk_nuclear_animation_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_nuclear_animation_snapshot;
-  iface->get_current_image = gtk_nuclear_animation_get_current_image;
-  iface->get_flags = gtk_nuclear_animation_get_flags;
-}
-
-/* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkNuclearAnimation, gtk_nuclear_animation, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_nuclear_animation_paintable_init))
-
-/* This time, we need to implement the finalize function,
- */
-static void
-gtk_nuclear_animation_finalize (GObject *object)
-{
-  GtkNuclearAnimation *nuclear = GTK_NUCLEAR_ANIMATION (object);
-
-  /* Remove the timeout we registered when constructing
-   * the object. 
-   */
-  g_source_remove (nuclear->source_id);
-
-  /* Don't forget to chain up to the parent class' implementation
-   * of the finalize function.
-   */
-  G_OBJECT_CLASS (gtk_nuclear_animation_parent_class)->finalize (object);
-}
-
-/* In the class declaration, we need to add our finalize function.
- */
-static void
-gtk_nuclear_animation_class_init (GtkNuclearAnimationClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = gtk_nuclear_animation_finalize;
-}
-
-static gboolean
-gtk_nuclear_animation_step (gpointer data)
-{
-  GtkNuclearAnimation *nuclear = data;
-
-  /* Add 1 to the progress and reset it when we've reached
-   * the maximum value.
-   * The animation will rotate by 360 degrees at MAX_PROGRESS
-   * so it will be identical to the original unrotated one.
-   */
-  nuclear->progress = (nuclear->progress + 1) % MAX_PROGRESS;
-
-  /* Now we need to tell all listeners that we've changed out contents
-   * so that they can redraw this paintable.
-   */
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (nuclear));
-
-  /* We want this timeout function to be called repeatedly,
-   * so we return this value here.
-   * If this was a single-shot timeout, we could also
-   * return G_SOURCE_REMOVE here to get rid of it.
-   */
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-gtk_nuclear_animation_init (GtkNuclearAnimation *nuclear)
-{
-  /* Add a timer here that constantly updates our animations.
-   * We want to update it often enough to guarantee a smooth animation.
-   *
-   * Ideally, we'd attach to the frame clock, but because we do
-   * not have it available here, we just use a regular timeout
-   * that hopefully triggers often enough to be smooth.
-   */
-  nuclear->source_id = g_timeout_add (10,
-                                      gtk_nuclear_animation_step,
-                                      nuclear);
-}
-
-/* And finally, we add the simple constructor we declared in the header. */
-GdkPaintable *
-gtk_nuclear_animation_new (void)
-{
-  return g_object_new (GTK_TYPE_NUCLEAR_ANIMATION, NULL);
-}
-
-GtkWidget *
-do_paintable_animated (GtkWidget *do_widget)
-{
-  GdkPaintable *nuclear;
-  GtkWidget *image;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Nuclear Animation");
-      gtk_window_set_default_size (GTK_WINDOW (window), 300, 200);
-
-      nuclear = gtk_nuclear_animation_new ();
-      image = gtk_image_new_from_paintable (nuclear);
-      gtk_container_add (GTK_CONTAINER (window), image);
-      g_object_unref (nuclear);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -1,312 +0,0 @@
-/* Paintable/A media stream
- *
- * GdkPaintable is also used by the GtkMediaStream class.
- *
- * This demo code turns the nuclear media_stream into the object
- * GTK uses for videos. This allows treating the icon like a
- * regular video, so we can for example attach controls to it.
- *
- * After all, what good is an media_stream if one cannot pause
- * it.
- */
-
-#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_MEDIA_STREAM (gtk_nuclear_media_stream_get_type ())
-G_DECLARE_FINAL_TYPE (GtkNuclearMediaStream, gtk_nuclear_media_stream, GTK, NUCLEAR_MEDIA_STREAM, GtkMediaStream)
-
-/* Do a full rotation in 5 seconds.
- *
- * We do not save steps here but real timestamps.
- * GtkMediaStream uses microseconds, so we will do so, too.
- */
-#define DURATION (5 * G_USEC_PER_SEC)
-
-/* Declare the struct. */
-struct _GtkNuclearMediaStream
-{
-  /* We now inherit from the media stream object. */
-  GtkMediaStream parent_instance;
-
-  /* This variable stores the progress of our video.
-   */
-  gint64 progress;
-
-  /* This variable stores the timestamp of the last
-   * time we updated the progress variable when the
-   * video is currently playing.
-   * This is so that we can always accurately compute the
-   * progress we've had, even if the timeout does not
-   * exactly work.
-   */
-  gint64 last_time;
-
-  /* This variable again holds the ID of the timer that 
-   * updates our progress variable. Nothing changes about
-   * how this works compared to the previous example.
-   */
-  guint source_id;
-};
-
-struct _GtkNuclearMediaStreamClass
-{
-  GObjectClass parent_class;
-};
-
-/* GtkMediaStream is a GdkPaintable. So when we want to display video,
- * we have to implement the interface, just like in the animation example.
- */
-static void
-gtk_nuclear_media_stream_snapshot (GdkPaintable *paintable,
-                                   GdkSnapshot  *snapshot,
-                                   double        width,
-                                   double        height)
-{
-  GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (paintable);
-
-  /* We call the function from the previous example here. */
-  gtk_nuclear_snapshot (snapshot,
-                        width, height,
-                        2 * G_PI * nuclear->progress / DURATION);
-}
-
-static GdkPaintable *
-gtk_nuclear_media_stream_get_current_image (GdkPaintable *paintable)
-{
-  GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (paintable);
-
-  /* Same thing as with the animation */
-  return gtk_nuclear_icon_new (2 * G_PI * nuclear->progress / DURATION);
-}
-
-static GdkPaintableFlags
-gtk_nuclear_media_stream_get_flags (GdkPaintable *paintable)
-{
-  /* And same thing as with the animation over here, too. */
-  return GDK_PAINTABLE_STATIC_SIZE;
-}
-
-static void
-gtk_nuclear_media_stream_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_nuclear_media_stream_snapshot;
-  iface->get_current_image = gtk_nuclear_media_stream_get_current_image;
-  iface->get_flags = gtk_nuclear_media_stream_get_flags;
-}
-
-/* This time, we inherit from GTK_TYPE_MEDIA_STREAM */
-G_DEFINE_TYPE_WITH_CODE (GtkNuclearMediaStream, gtk_nuclear_media_stream, GTK_TYPE_MEDIA_STREAM,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_nuclear_media_stream_paintable_init))
-
-static gboolean
-gtk_nuclear_media_stream_step (gpointer data)
-{
-  GtkNuclearMediaStream *nuclear = data;
-  gint64 current_time;
-
-  /* Compute the time that has elapsed since the last time we were called
-   * and add it to our current progress.
-   */
-  current_time = g_source_get_time (g_main_current_source ());
-  nuclear->progress += current_time - nuclear->last_time;
-
-  /* Check if we've ended */
-  if (nuclear->progress > DURATION)
-    {
-      if (gtk_media_stream_get_loop (GTK_MEDIA_STREAM (nuclear)))
-        {
-          /* We're looping. So make the progress loop using modulo */
-          nuclear->progress %= DURATION;
-        }
-      else
-        {
-          /* Just make sure we don't overflow */
-          nuclear->progress = DURATION;
-        }
-    }
-
-  /* Update the last time to the current timestamp. */
-  nuclear->last_time = current_time;
-
-  /* Update the timestamp of the media stream */
-  gtk_media_stream_update (GTK_MEDIA_STREAM (nuclear), nuclear->progress);
-
-  /* We also need to invalidate our contents again.
-   * After all, we are a video and not just an audio stream.
-   */
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (nuclear));
-
-  /* Now check if we have finished playing and if so,
-   * tell the media stream. The media stream will then
-   * call our pause function to pause the stream.
-   */
-  if (nuclear->progress >= DURATION)
-    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.
-   */
-  return G_SOURCE_CONTINUE;
-}
-
-static gboolean
-gtk_nuclear_media_stream_play (GtkMediaStream *stream)
-{
-  GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (stream);
-
-  /* If we're already at the end of the stream, we don't want
-   * to start playing and exit early.
-   */
-  if (nuclear->progress >= DURATION)
-    return FALSE;
-
-  /* This time, we add the source only when we start playing.
-   */
-  nuclear->source_id = g_timeout_add (10,
-                                      gtk_nuclear_media_stream_step,
-                                      nuclear);
-
-  /* We also want to initialize our time, so that we can
-   * do accurate updates.
-   */
-  nuclear->last_time = g_get_monotonic_time ();
-  
-  /* We successfully started playing, so we return TRUE here. */
-  return TRUE;
-}
-
-static void
-gtk_nuclear_media_stream_pause (GtkMediaStream *stream)
-{
-  GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (stream);
-
-  /* This function will be called when a playing stream
-   * gets paused.
-   * So we remove the updating source here and set it
-   * back to 0 so that the finalize function doesn't try
-   * to remove it again.
-   */
-  g_source_remove (nuclear->source_id);
-  nuclear->source_id = 0;
-  nuclear->last_time = 0;
-}
-
-static void
-gtk_nuclear_media_stream_seek (GtkMediaStream *stream,
-                               gint64          timestamp)
-{
-  GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (stream);
-
-  /* This is optional functionality for media streams,
-   * but not being able to seek is kinda boring.
-   * And it's trivial to implement, so let's go for it.
-   */
-  nuclear->progress = timestamp;
-
-  /* Media streams are asynchronous, so seeking can take a while.
-   * We however don't need that functionality, so we can just
-   * report success.
-   */
-  gtk_media_stream_seek_success (stream);
-
-  /* We also have to update our timestamp and tell the
-   * paintable interface abbout the seek
-   */
-  gtk_media_stream_update (stream, nuclear->progress);
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (nuclear));
-}
-
-/* Again, we need to implement the finalize function.
- */
-static void
-gtk_nuclear_media_stream_finalize (GObject *object)
-{
-  GtkNuclearMediaStream *nuclear = GTK_NUCLEAR_MEDIA_STREAM (object);
-
-  /* This time, we need to check if the source exists before
-   * removing it as it only exists while we are playing.
-   */
-  if (nuclear->source_id > 0)
-    g_source_remove (nuclear->source_id);
-
-  /* Don't forget to chain up to the parent class' implementation
-   * of the finalize function.
-   */
-  G_OBJECT_CLASS (gtk_nuclear_media_stream_parent_class)->finalize (object);
-}
-
-/* In the class declaration, we need to implement the media stream */
-static void
-gtk_nuclear_media_stream_class_init (GtkNuclearMediaStreamClass *klass)
-{
-  GtkMediaStreamClass *stream_class = GTK_MEDIA_STREAM_CLASS (klass);
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  stream_class->play = gtk_nuclear_media_stream_play;
-  stream_class->pause = gtk_nuclear_media_stream_pause;
-  stream_class->seek = gtk_nuclear_media_stream_seek;
-
-  gobject_class->finalize = gtk_nuclear_media_stream_finalize;
-}
-
-static void
-gtk_nuclear_media_stream_init (GtkNuclearMediaStream *nuclear)
-{
-  /* This time, we don't have to add a timer here, because media
-   * streams start paused.
-   *
-   * However, media streams need to tell GTK once they are intialized,
-   * so we do that here.
-   */
-  gtk_media_stream_prepared (GTK_MEDIA_STREAM (nuclear),
-                             FALSE,
-                             TRUE,
-                             TRUE,
-                             DURATION);
-}
-
-/* And finally, we add the simple constructor we declared in the header. */
-GtkMediaStream *
-gtk_nuclear_media_stream_new (void)
-{
-  return g_object_new (GTK_TYPE_NUCLEAR_MEDIA_STREAM, NULL);
-}
-
-GtkWidget *
-do_paintable_mediastream (GtkWidget *do_widget)
-{
-  GtkMediaStream *nuclear;
-  GtkWidget *video;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Nuclear MediaStream");
-      gtk_window_set_default_size (GTK_WINDOW (window), 300, 200);
-
-      nuclear = gtk_nuclear_media_stream_new ();
-      gtk_media_stream_set_loop (GTK_MEDIA_STREAM (nuclear), TRUE);
-
-      video = gtk_video_new_for_media_stream (nuclear);
-      gtk_container_add (GTK_CONTAINER (window), video);
-
-      g_object_unref (nuclear);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/popover.c
+++ b/demos/gtk-demo/popover.c
@@ -58,7 +58,8 @@ static void
 entry_size_allocate_cb (GtkEntry            *entry,
                        const GtkAllocation *allocation,
                        int                  baseline,
-                        gpointer             user_data)
+                        GtkAllocation       *out_clip,
+                        gpointer       user_data)
 {
  GtkEntryIconPosition popover_pos;
  GtkPopover *popover = user_data;
--- a/demos/gtk-demo/popover.ui
+++ b/demos/gtk-demo/popover.ui
@@ -43,28 +43,32 @@
  <object class="GtkWindow" id="window">
    <child>
      <object class="GtkBox" id="box">
+        <property name="visible">1</property>
        <property name="orientation">vertical</property>
        <property name="spacing">6</property>
        <child>
          <object class="GtkEntry" id="entry1">
-            <property name="can-focus">1</property>
-            <property name="primary-icon-name">edit-find</property>
-            <property name="secondary-icon-name">edit-clear</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="primary_icon_name">edit-find</property>
+            <property name="secondary_icon_name">edit-clear</property>
          </object>
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="can-focus">1</property>
-            <property name="shadow-type">in</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="shadow_type">in</property>
            <property name="max-content-height">100</property>
            <child>
              <object class="GtkTreeView" id="treeview1">
-                <property name="can-focus">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
                <property name="vexpand">1</property>
                <property name="model">liststore1</property>
-                <property name="headers-visible">0</property>
-                <property name="enable-search">0</property>
-                <property name="search-column">2</property>
+                <property name="headers_visible">0</property>
+                <property name="enable_search">0</property>
+                <property name="search_column">2</property>
                <child internal-child="selection">
                  <object class="GtkTreeSelection" id="treeview-selection1"/>
                </child>
--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -2,19 +2,22 @@
 <interface>
  <!-- interface-requires gtk+ 3.6 -->
  <object class="GtkWindow" id="window">
-    <property name="default-width">300</property>
-    <property name="default-height">300</property>
+    <property name="default_width">300</property>
+    <property name="default_height">300</property>
    <property name="title">Revealer</property>
    <child>
      <object class="GtkGrid">
+        <property name="visible">1</property>
        <property name="halign">center</property>
        <property name="valign">center</property>
        <child>
          <object class="GtkRevealer" id="revealer0">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <property name="transition-type">crossfade</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
@@ -27,10 +30,12 @@
        </child>
        <child>
          <object class="GtkRevealer" id="revealer1">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <property name="transition-type">slide-up</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
@@ -43,10 +48,12 @@
        </child>
        <child>
          <object class="GtkRevealer" id="revealer2">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <property name="transition-type">slide-right</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
@@ -59,9 +66,11 @@
        </child>
        <child>
          <object class="GtkRevealer" id="revealer3">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
@@ -74,10 +83,12 @@
        </child>
        <child>
          <object class="GtkRevealer" id="revealer4">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <property name="transition-type">slide-left</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
@@ -90,10 +101,12 @@
        </child>
        <child>
          <object class="GtkRevealer" id="revealer5">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <property name="transition-type">slide-up</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
@@ -106,10 +119,12 @@
        </child>
        <child>
          <object class="GtkRevealer" id="revealer6">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <property name="transition-type">slide-right</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
@@ -122,9 +137,11 @@
        </child>
        <child>
          <object class="GtkRevealer" id="revealer7">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
@@ -137,10 +154,12 @@
        </child>
        <child>
          <object class="GtkRevealer" id="revealer8">
+            <property name="visible">1</property>
            <property name="transition-duration">2000</property>
            <property name="transition-type">slide-left</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="icon-name">face-cool-symbolic</property>
                <property name="icon-size">large</property>
              </object>
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -23,56 +23,52 @@
    <property name="title" translatable="yes">Scales</property>
    <child>
      <object class="GtkGrid" id="grid1">
+        <property name="visible">1</property>
        <property name="row-spacing">10</property>
        <property name="column-spacing">10</property>
        <property name="margin">20</property>
        <child>
-          <object class="GtkLabel" id="label_plain">
+          <object class="GtkLabel">
+            <property name="visible">1</property>
            <property name="label">Plain</property>
            <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_plain"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
-          <object class="GtkScale" id="scale_plain">
-            <property name="can-focus">1</property>
+          <object class="GtkScale">
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
            <property name="width-request">200</property>
-            <property name="draw-value">0</property>
+            <property name="draw_value">0</property>
            <property name="adjustment">adjustment1</property>
            <property name="hexpand">1</property>
-            <accessibility>
-              <relation type="labelled-by" target="label_plain"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
-          <object class="GtkLabel" id="label_marks">
+          <object class="GtkLabel">
+            <property name="visible">1</property>
            <property name="label">Marks</property>
            <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_marks"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
-          <object class="GtkScale" id="scale_marks">
-            <property name="can-focus">1</property>
+          <object class="GtkScale">
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
            <property name="width-request">200</property>
-            <property name="draw-value">0</property>
+            <property name="draw_value">0</property>
            <property name="adjustment">adjustment2</property>
            <property name="hexpand">1</property>
            <marks>
@@ -82,39 +78,32 @@
              <mark value="3" position="bottom"></mark>
              <mark value="4" position="bottom"></mark>
            </marks>
-            <accessibility>
-              <relation type="labelled-by" target="label_marks"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
-          <object class="GtkLabel" id="label_discrete">
+          <object class="GtkLabel">
+            <property name="visible">1</property>
            <property name="label">Discrete</property>
            <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_discrete"/>
-            </accessibility>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
          </packing>
        </child>
        <child>
-          <object class="GtkScale" id="scale_discrete">
-            <property name="can-focus">1</property>
+          <object class="GtkScale">
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
            <property name="width-request">200</property>
            <property name="round-digits">0</property>
-            <property name="draw-value">0</property>
+            <property name="draw_value">0</property>
            <property name="adjustment">adjustment3</property>
            <property name="hexpand">1</property>
-            <accessibility>
-              <relation type="labelled-by" target="label_discrete"/>
-            </accessibility>
            <marks>
              <mark value="0" position="bottom"></mark>
              <mark value="1" position="bottom"></mark>
@@ -124,8 +113,8 @@
            </marks>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
          </packing>
        </child>
      </object>
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -31,10 +31,7 @@ window_key_press_event_cb (GtkWidget    *widget,
 			   GdkEvent     *event,
 			   GtkSearchBar *bar)
 {
-  if (gdk_event_get_event_type (event) == GDK_KEY_PRESS)
-    return gtk_search_bar_handle_event (bar, event);
-
-  return GDK_EVENT_PROPAGATE;
+  return gtk_search_bar_handle_event (bar, event);
 }

 static void
@@ -102,7 +99,8 @@ do_search_entry2 (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), searchbar);

      /* Hook the search bar to key presses */
-      g_signal_connect (window, "event", G_CALLBACK (window_key_press_event_cb), searchbar);
+      g_signal_connect (window, "key-press-event",
+                        G_CALLBACK (window_key_press_event_cb), searchbar);

      /* Help */
      label = gtk_label_new ("Start Typing to search");
--- a/demos/gtk-demo/shortcuts-boxes.ui
+++ b/demos/gtk-demo/shortcuts-boxes.ui
@@ -1,79 +1,104 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 3.17 -->
+
  <object class="GtkShortcutsWindow" id="shortcuts-boxes">
    <property name="modal">1</property>
+    
    <child>
      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
        <property name="section-name">shortcuts</property>
        <property name="max-height">12</property>
+
        <!-- Overview shortcuts -->
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Overview</property>
            <property name="view">overview</property>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">F1</property>
                <property name="title" translatable="yes">Help</property>
              </object>
            </child>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Ctrl&gt;n</property>
                <property name="title" translatable="yes">Create a new box</property>
              </object>
            </child>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Ctrl&gt;f</property>
                <property name="title" translatable="yes">Search</property>
              </object>
            </child>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Ctrl&gt;k</property>
                <property name="title" translatable="yes">Keyboard shortcuts</property>
              </object>
            </child>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Ctrl&gt;q</property>
                <property name="title" translatable="yes">Close Window/Quit Boxes</property>
              </object>
            </child>
          </object>
        </child>
+
        <!-- Wizard and Properties shortcuts -->
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Box Creation and Properties</property>
            <property name="view">wizard</property>
+
            <!-- LTR -->
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="direction">ltr</property>
                <property name="accelerator">&lt;Alt&gt;Right</property>
                <property name="title" translatable="yes">Switch to the next page</property>
              </object>
            </child>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="direction">ltr</property>
                <property name="accelerator">&lt;Alt&gt;Left</property>
                <property name="title" translatable="yes">Switch to the previous page</property>
              </object>
            </child>
+
            <!-- RTL -->
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="direction">rtl</property>
                <property name="accelerator">&lt;Alt&gt;Left</property>
                <property name="title" translatable="yes">Switch to the next page</property>
              </object>
            </child>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="direction">rtl</property>
                <property name="accelerator">&lt;Alt&gt;Right</property>
                <property name="title" translatable="yes">Switch to the previous page</property>
@@ -81,48 +106,62 @@
            </child>
          </object>
        </child>
+
        <!-- Display shortcuts -->
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Box Display</property>
            <property name="view">display</property>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Control_L+Alt_L</property>
                <property name="title" translatable="yes">Grab/Ungrab keyboard</property>
              </object>
            </child>
+
            <!-- LTR -->
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="direction">ltr</property>
                <property name="accelerator">&lt;Alt&gt;Left</property>
                <property name="title" translatable="yes">Back to overview</property>
              </object>
            </child>
+
            <!-- RTL -->
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="direction">rtl</property>
                <property name="accelerator">&lt;Alt&gt;Right</property>
                <property name="title" translatable="yes">Back to overview</property>
              </object>
            </child>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Ctrl&gt;q</property>
                <property name="title" translatable="yes">Close window/Quit Boxes</property>
              </object>
            </child>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">F11</property>
                <property name="title" translatable="yes">Fullscreen/Restore from fullscreen</property>
              </object>
            </child>
          </object>
        </child>
+
      </object>
    </child>
  </object>
+
 </interface>
--- a/demos/gtk-demo/shortcuts-builder.ui
+++ b/demos/gtk-demo/shortcuts-builder.ui
@@ -1,41 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 3.17 -->
+
  <object class="GtkShortcutsWindow" id="shortcuts-builder">
    <property name="modal">1</property>
    <child>
      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
        <property name="section-name">editor</property>
        <property name="title" translatable="yes">Editor Shortcuts</property>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">General</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Global Search</property>
                <property name="accelerator">&lt;ctrl&gt;period</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Preferences</property>
                <property name="accelerator">&lt;ctrl&gt;comma</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Command Bar</property>
                <property name="accelerator">&lt;ctrl&gt;Return</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Terminal</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;t</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Keyboard Shortcuts</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;question</property>
              </object>
@@ -44,21 +52,25 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Panels</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Toggle left panel</property>
                <property name="accelerator">F9</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Toggle right panel</property>
                <property name="accelerator">&lt;shift&gt;F9</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Toggle bottom panel</property>
                <property name="accelerator">&lt;ctrl&gt;F9</property>
              </object>
@@ -67,15 +79,18 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Touchpad gestures</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                <property name="title" translatable="yes">Switch to the next document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                <property name="title" translatable="yes">Switch to the previous document</property>
              </object>
@@ -84,39 +99,46 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Files</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;n</property>
                <property name="title" translatable="yes">Create new document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;o</property>
                <property name="title" translatable="yes">Open a document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;s</property>
                <property name="title" translatable="yes">Save the document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;w</property>
                <property name="title" translatable="yes">Close the document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;Page_Down</property>
                <property name="title" translatable="yes">Switch to the next document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;Page_Up</property>
                <property name="title" translatable="yes">Switch to the previous document</property>
              </object>
@@ -125,27 +147,32 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Find and replace</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;f</property>
                <property name="title" translatable="yes">Find</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;g</property>
                <property name="title" translatable="yes">Find the next match</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;g</property>
                <property name="title" translatable="yes">Find the previous match</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;k</property>
                <property name="title" translatable="yes">Clear highlight</property>
              </object>
@@ -154,21 +181,25 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Copy and Paste</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;c</property>
                <property name="title" translatable="yes">Copy selected text to clipboard</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;x</property>
                <property name="title" translatable="yes">Cut selected text to clipboard</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;v</property>
                <property name="title" translatable="yes">Paste text from clipboard</property>
              </object>
@@ -177,15 +208,18 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Undo and Redo</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;z</property>
                <property name="title" translatable="yes">Undo previous command</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;z</property>
                <property name="title" translatable="yes">Redo previous command</property>
              </object>
@@ -194,39 +228,46 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Editing</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;a</property>
                <property name="title" translatable="yes">Increment number at cursor</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;x</property>
                <property name="title" translatable="yes">Decrement number at cursor</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;j</property>
                <property name="title" translatable="yes">Join selected lines</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;space</property>
                <property name="title" translatable="yes">Show completion window</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Insert</property>
                <property name="title" translatable="yes">Toggle overwrite</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;alt&gt;i</property>
                <property name="title" translatable="yes">Reindent line</property>
              </object>
@@ -235,63 +276,74 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Navigation</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;n</property>
                <property name="title" translatable="yes">Move to next error in file</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;p</property>
                <property name="title" translatable="yes">Move to previous error in file</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;shift&gt;&lt;alt&gt;Left</property>
                <property name="title" translatable="yes">Move to previous edit location</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;shift&gt;&lt;alt&gt;Right</property>
                <property name="title" translatable="yes">Move to next edit location</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;period</property>
                <property name="title" translatable="yes">Jump to definition of symbol</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Up</property>
                <property name="title" translatable="yes">Move sectionport up within the file</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Down</property>
                <property name="title" translatable="yes">Move sectionport down within the file</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;&lt;shift&gt;End</property>
                <property name="title" translatable="yes">Move sectionport to end of file</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;&lt;shift&gt;Home</property>
                <property name="title" translatable="yes">Move sectionport to beginning of file</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;percent</property>
                <property name="title" translatable="yes">Move to matching bracket</property>
              </object>
@@ -300,15 +352,18 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Selections</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;a</property>
                <property name="title" translatable="yes">Select all</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;backslash</property>
                <property name="title" translatable="yes">Unselect all</property>
              </object>
@@ -319,38 +374,45 @@
    </child>
    <child>
      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
        <property name="max-height">16</property>
        <property name="section-name">terminal</property>
        <property name="title" translatable="yes">Terminal Shortcuts</property>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">General</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Global Search</property>
                <property name="accelerator">&lt;ctrl&gt;period</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Preferences</property>
                <property name="accelerator">&lt;ctrl&gt;comma</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Command Bar</property>
                <property name="accelerator">&lt;ctrl&gt;Return</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Terminal</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;t</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="title" translatable="yes">Keyboard Shortcuts</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;question</property>
              </object>
@@ -359,15 +421,18 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Copy and Paste</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;c</property>
                <property name="title" translatable="yes">Copy selected text to clipboard</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;shift&gt;v</property>
                <property name="title" translatable="yes">Paste text from clipboard</property>
              </object>
@@ -376,98 +441,122 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Switching</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;1...9</property>
                <property name="title" translatable="yes">Switch to n-th tab</property>
              </object>
            </child>
          </object>
        </child>
+
        <child>
          <object class="GtkShortcutsGroup">
-            <property name="title" translatable="yes">&apos;Special&apos; combinations</property>
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">'Special' combinations</property>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">t+t</property>
                <property name="title" translatable="yes">You want tea ?</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;shift&gt;&lt;ctrl&gt;</property>
                <property name="title" translatable="yes">Shift Control</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&amp;&lt;ctrl&gt;</property>
                <property name="title" translatable="yes">Control Control</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Control_L&amp;Control_R</property>
                <property name="title" translatable="yes">Left and right control</property>
              </object>
            </child>
+
          </object>
        </child>
+
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">All gestures</property>
+
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-pinch</property>
                <property name="title" translatable="yes">A stock pinch gesture</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-stretch</property>
                <property name="title" translatable="yes">A stock stretch gesture</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-rotate-clockwise</property>
                <property name="title" translatable="yes">A stock rotation gesture</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-rotate-counterclockwise</property>
                <property name="title" translatable="yes">A stock rotation gesture</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                <property name="title" translatable="yes">A stock swipe gesture</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                <property name="title" translatable="yes">A stock swipe gesture</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-swipe-left</property>
                <property name="title" translatable="yes">A stock swipe gesture</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-swipe-right</property>
                <property name="title" translatable="yes">A stock swipe gesture</property>
              </object>
            </child>
+
          </object>
        </child>
+
      </object>
    </child>
  </object>
+
 </interface>
--- a/demos/gtk-demo/shortcuts-clocks.ui
+++ b/demos/gtk-demo/shortcuts-clocks.ui
@@ -1,35 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 3.17 -->
+
  <object class="GtkShortcutsWindow" id="shortcuts-clocks">
    <property name="modal">1</property>
    <child>
      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
        <property name="section-name">shortcuts</property>
        <property name="max-height">10</property>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">General</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;Page_Down</property>
                <property name="title" translatable="yes">Go to the next section</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;Page_Up</property>
                <property name="title" translatable="yes">Go to the previous section</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;Q</property>
                <property name="title" translatable="yes">Quit</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;Right</property>
                <property name="direction">ltr</property>
                <property name="title" translatable="yes">Forward</property>
@@ -37,6 +44,7 @@
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;Left</property>
                <property name="direction">ltr</property>
                <property name="title" translatable="yes">Back</property>
@@ -44,6 +52,7 @@
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;alt&gt;Left</property>
                <property name="direction">rtl</property>
                <property name="title" translatable="yes">Forward</property>
@@ -51,6 +60,7 @@
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;Right</property>
                <property name="direction">rtl</property>
                <property name="title" translatable="yes">Back</property>
@@ -60,16 +70,19 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="view">world</property>
            <property name="title" translatable="yes">World Clocks</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;N</property>
                <property name="title" translatable="yes">Add a world clock</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;S</property>
                <property name="title" translatable="yes">Select world clocks</property>
              </object>
@@ -78,16 +91,19 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="view">alarm</property>
            <property name="title" translatable="yes">Alarm</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;N</property>
                <property name="title" translatable="yes">Add an alarm</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;S</property>
                <property name="title" translatable="yes">Select alarms</property>
              </object>
@@ -96,22 +112,26 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="view">stopwatch</property>
            <property name="title" translatable="yes">Stopwatch</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Return space</property>
                <property name="title" translatable="yes">Start / Stop / Continue</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">L</property>
                <property name="title" translatable="yes">Lap</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Delete</property>
                <property name="title" translatable="yes">Reset</property>
              </object>
@@ -120,16 +140,19 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="view">timer</property>
            <property name="title" translatable="yes">Timer</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Return space</property>
                <property name="title" translatable="yes">Start / Stop / Pause</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Delete</property>
                <property name="title" translatable="yes">Reset</property>
              </object>
@@ -139,4 +162,5 @@
      </object>
    </child>
  </object>
+
 </interface>
--- a/demos/gtk-demo/shortcuts-gedit.ui
+++ b/demos/gtk-demo/shortcuts-gedit.ui
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 3.17 -->
+
  <object class="GtkShortcutsWindow" id="shortcuts-gedit">
    <property name="modal">1</property>
    <child>
      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
        <property name="section-name">shortcuts</property>
        <property name="max-height">12</property>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Touchpad gestures</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                <property name="title" translatable="yes">Switch to the next document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                <property name="title" translatable="yes">Switch to the previous document</property>
              </object>
@@ -26,39 +31,46 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Documents</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;N</property>
                <property name="title" translatable="yes">Create new document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;O</property>
                <property name="title" translatable="yes">Open a document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;S</property>
                <property name="title" translatable="yes">Save the document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;W</property>
                <property name="title" translatable="yes">Close the document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;Alt&gt;Page_Down</property>
                <property name="title" translatable="yes">Switch to the next document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;Alt&gt;Page_Up</property>
                <property name="title" translatable="yes">Switch to the previous document</property>
              </object>
@@ -67,39 +79,46 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Find and Replace</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;F</property>
                <property name="title" translatable="yes">Find</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;G</property>
                <property name="title" translatable="yes">Find the next match</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;G</property>
                <property name="title" translatable="yes">Find the previous match</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;H</property>
                <property name="title" translatable="yes">Find and Replace</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;&lt;Shift&gt;K</property>
                <property name="title" translatable="yes">Clear highlight</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;I</property>
                <property name="title" translatable="yes">Go to line</property>
              </object>
@@ -108,9 +127,11 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Tools</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;shift&gt;F7</property>
                <property name="title" translatable="yes">Check spelling</property>
              </object>
@@ -119,21 +140,25 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title" translatable="yes">Miscellaneous</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">F11</property>
                <property name="title" translatable="yes">Fullscreen on / off</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;ctrl&gt;P</property>
                <property name="title" translatable="yes">Print the document</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Insert</property>
                <property name="title" translatable="yes">Toggle insert / overwrite</property>
              </object>
@@ -143,4 +168,5 @@
      </object>
    </child>
  </object>
+
 </interface>
--- a/demos/gtk-demo/shortcuts.ui
+++ b/demos/gtk-demo/shortcuts.ui
@@ -1,51 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 3.17 -->
+
  <object class="GtkWindow" id="window1">
    <property name="title" translatable="yes">Shortcuts</property>
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <property name="orientation">vertical</property>
        <property name="margin">50</property>
        <property name="spacing">10</property>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Builder</property>
            <signal name="clicked" handler="builder_shortcuts" swapped="1" object="window1"/>
          </object>
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">GEdit</property>
            <signal name="clicked" handler="gedit_shortcuts" swapped="1" object="window1"/>
          </object>
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Clocks - All</property>
            <signal name="clicked" handler="clocks_shortcuts" swapped="1" object="window1"/>
          </object>
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Clocks - Stopwatch</property>
            <signal name="clicked" handler="clocks_shortcuts_stopwatch" swapped="1" object="window1"/>
          </object>
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Boxes</property>
            <signal name="clicked" handler="boxes_shortcuts" swapped="1" object="window1"/>
          </object>
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Boxes - Wizard</property>
            <signal name="clicked" handler="boxes_shortcuts_wizard" swapped="1" object="window1"/>
          </object>
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Boxes - Display</property>
            <signal name="clicked" handler="boxes_shortcuts_display" swapped="1" object="window1"/>
          </object>
--- a/demos/gtk-demo/spinbutton.ui
+++ b/demos/gtk-demo/spinbutton.ui
@@ -3,176 +3,189 @@
  <object class="GtkAdjustment" id="basic_adjustment">
    <property name="lower">-10000</property>
    <property name="upper">10000</property>
-    <property name="step-increment">0.5</property>
-    <property name="page-increment">100</property>
+    <property name="step_increment">0.5</property>
+    <property name="page_increment">100</property>
  </object>
  <object class="GtkAdjustment" id="hex_adjustment">
    <property name="upper">255</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">16</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">16</property>
  </object>
  <object class="GtkAdjustment" id="time_adjustment">
    <property name="upper">1410</property>
-    <property name="step-increment">30</property>
-    <property name="page-increment">60</property>
+    <property name="step_increment">30</property>
+    <property name="page_increment">60</property>
  </object>
  <object class="GtkAdjustment" id="month_adjustment">
    <property name="lower">1</property>
    <property name="upper">12</property>
    <property name="value">1</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">5</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">5</property>
  </object>
  <object class="GtkWindow" id="window">
    <property name="title" translatable="yes">Spin Button</property>
    <child>
      <object class="GtkGrid">
+        <property name="visible">1</property>
        <property name="margin">20</property>
        <property name="row-spacing">10</property>
        <property name="column-spacing">10</property>
        <child>
          <object class="GtkLabel">
+            <property name="visible">1</property>
            <property name="label">_Numeric</property>
-            <property name="use-underline">1</property>
-            <property name="mnemonic-widget">basic_spin</property>
+            <property name="use_underline">1</property>
+            <property name="mnemonic_widget">basic_spin</property>
            <property name="xalign">1</property>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkSpinButton" id="basic_spin">
+            <property name="visible">1</property>
            <property name="halign">start</property>
-            <property name="width-chars">5</property>
+            <property name="width_chars">5</property>
            <property name="adjustment">basic_adjustment</property>
-            <property name="climb-rate">1</property>
+            <property name="climb_rate">1</property>
            <property name="digits">2</property>
            <property name="numeric">1</property>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="basic_label">
-            <property name="width-chars">10</property>
+            <property name="visible">1</property>
+            <property name="width_chars">10</property>
            <property name="xalign">1</property>
          </object>
          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel">
+            <property name="visible">1</property>
            <property name="label">_Hexadecimal</property>
-            <property name="use-underline">1</property>
-            <property name="mnemonic-widget">hex_spin</property>
+            <property name="use_underline">1</property>
+            <property name="mnemonic_widget">hex_spin</property>
            <property name="xalign">1</property>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkSpinButton" id="hex_spin">
+            <property name="visible">1</property>
            <property name="halign">start</property>
-            <property name="width-chars">4</property>
+            <property name="width_chars">4</property>
            <property name="adjustment">hex_adjustment</property>
            <signal name="input" handler="hex_spin_input"/>
            <signal name="output" handler="hex_spin_output"/>
            <property name="wrap">1</property>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="hex_label">
-            <property name="width-chars">10</property>
+            <property name="visible">1</property>
+            <property name="width_chars">10</property>
            <property name="xalign">1</property>
          </object>
          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel">
+            <property name="visible">1</property>
            <property name="label">_Time</property>
-            <property name="use-underline">1</property>
-            <property name="mnemonic-widget">time_spin</property>
+            <property name="use_underline">1</property>
+            <property name="mnemonic_widget">time_spin</property>
            <property name="xalign">1</property>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
          </packing>
        </child>
        <child>
          <object class="GtkSpinButton" id="time_spin">
+            <property name="visible">1</property>
            <property name="halign">start</property>
-            <property name="width-chars">5</property>
+            <property name="width_chars">5</property>
            <property name="adjustment">time_adjustment</property>
            <signal name="input" handler="time_spin_input"/>
            <signal name="output" handler="time_spin_output"/>
            <property name="wrap">1</property>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="time_label">
-            <property name="width-chars">10</property>
+            <property name="visible">1</property>
+            <property name="width_chars">10</property>
            <property name="xalign">1</property>
          </object>
          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">2</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">2</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel">
+            <property name="visible">1</property>
            <property name="label">_Month</property>
-            <property name="use-underline">1</property>
-            <property name="mnemonic-widget">month_spin</property>
+            <property name="use_underline">1</property>
+            <property name="mnemonic_widget">month_spin</property>
            <property name="xalign">1</property>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
          </packing>
        </child>
        <child>
          <object class="GtkSpinButton" id="month_spin">
+            <property name="visible">1</property>
            <property name="halign">start</property>
-            <property name="width-chars">9</property>
+            <property name="width_chars">9</property>
            <signal name="input" handler="month_spin_input"/>
            <signal name="output" handler="month_spin_output"/>
            <property name="adjustment">month_adjustment</property>
            <property name="wrap">1</property>
-            <property name="update-policy">if-valid</property>
+            <property name="update_policy">if-valid</property>
          </object>
          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">3</property>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="month_label">
-            <property name="width-chars">10</property>
+            <property name="visible">1</property>
+            <property name="width_chars">10</property>
            <property name="xalign">1</property>
          </object>
          <packing>
-            <property name="left-attach">2</property>
-            <property name="top-attach">3</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">3</property>
          </packing>
        </child>
      </object>
--- a/demos/gtk-demo/stack.ui
+++ b/demos/gtk-demo/stack.ui
@@ -5,22 +5,26 @@
    <property name="title" translatable="yes">Stack</property>
    <child>
      <object class="GtkGrid">
+        <property name="visible">1</property>
        <child>
          <object class="GtkStackSwitcher">
+            <property name="visible">1</property>
            <property name="stack">stack</property>
            <property name="halign">center</property>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
          </packing>
        </child>
        <child>
          <object class="GtkStack" id="stack">
-            <property name="can-focus">1</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
            <property name="transition-type">crossfade</property>
            <child>
              <object class="GtkImage">
+                <property name="visible">1</property>
                <property name="margin-top">20</property>
                <property name="margin-bottom">20</property>
                <property name="icon-name">gtk3-demo</property>
@@ -33,7 +37,9 @@
            <child>
              <object class="GtkCheckButton">
                <property name="label" translatable="yes">Page 2</property>
-                <property name="can-focus">1</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="draw_indicator">1</property>
                <property name="halign">center</property>
                <property name="valign">center</property>
              </object>
@@ -44,6 +50,7 @@
            </child>
            <child>
              <object class="GtkSpinner">
+                <property name="visible">1</property>
                <property name="halign">center</property>
                <property name="valign">center</property>
                <property name="active">1</property>
@@ -55,8 +62,8 @@
            </child>
          </object>
          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
          </packing>
        </child>
      </object>
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -5,6 +5,7 @@
    <property name="orientation">vertical</property>
    <child>
      <object class="GtkToolbar">
+        <property name="visible">1</property>
        <property name="hexpand">1</property>
        <property name="show-arrow">0</property>
        <style>
@@ -12,10 +13,11 @@
        </style>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Normal</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
+            <property name="icon_name">edit-find</property>
          </object>
          <packing>
            <property name="homogeneous">1</property>
@@ -23,10 +25,11 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Active</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
+            <property name="icon_name">edit-find</property>
            <property name="active">1</property>
          </object>
          <packing>
@@ -35,11 +38,12 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="sensitive">0</property>
            <property name="label" translatable="yes">Insensitive</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
+            <property name="icon_name">edit-find</property>
          </object>
          <packing>
            <property name="homogeneous">1</property>
@@ -47,10 +51,11 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Raised</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
+            <property name="icon_name">edit-find</property>
            <style>
              <class name="raised"/>
            </style>
@@ -61,10 +66,11 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Raised Active</property>
-            <property name="use-underline">1</property>
-            <property name="is-important">1</property>
-            <property name="icon-name">edit-find</property>
+            <property name="use_underline">1</property>
+            <property name="is_important">1</property>
+            <property name="icon_name">edit-find</property>
            <property name="active">1</property>
            <style>
              <class name="raised"/>
@@ -76,11 +82,12 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="sensitive">0</property>
            <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">edit-find</property>
-            <property name="is-important">1</property>
+            <property name="use_underline">1</property>
+            <property name="icon_name">edit-find</property>
+            <property name="is_important">1</property>
            <property name="active">1</property>
          </object>
          <packing>
@@ -89,10 +96,12 @@
        </child>
        <child>
          <object class="GtkToolItem">
+            <property name="visible">1</property>
            <child>
              <object class="GtkEntry" id="entry1">
-                <property name="can-focus">1</property>
-                <property name="invisible-char">•</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
+                <property name="invisible_char">•</property>
                <property name="placeholder-text" translatable="yes">Search...</property>
                <property name="secondary-icon-name">edit-find-symbolic</property>
              </object>
@@ -101,10 +110,11 @@
        </child>
        <child>
          <object class="GtkToolItem">
+            <property name="visible">1</property>
            <child>
              <object class="GtkSwitch" id="switch1">
-                <property name="can-focus">1</property>
-                <property name="tooltip_text">Switch it</property>
+                <property name="visible">1</property>
+                <property name="can_focus">1</property>
              </object>
            </child>
          </object>
@@ -113,6 +123,7 @@
    </child>
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <property name="valign">center</property>
        <property name="halign">center</property>
        <style>
@@ -121,15 +132,17 @@
        <child>
          <object class="GtkButton">
            <property name="label" translatable="yes">Hi, I am a button</property>
-            <property name="can-focus">1</property>
-            <property name="receives-default">1</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
          </object>
        </child>
        <child>
          <object class="GtkButton">
-            <property name="label" translatable="yes">And I&apos;m another button</property>
-            <property name="can-focus">1</property>
-            <property name="receives-default">1</property>
+            <property name="label" translatable="yes">And I'm another button</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
          </object>
          <packing>
            <property name="position">1</property>
@@ -138,8 +151,9 @@
        <child>
          <object class="GtkButton">
            <property name="label" translatable="yes">This is a button party!</property>
-            <property name="can-focus">1</property>
-            <property name="receives-default">1</property>
+            <property name="visible">1</property>
+            <property name="can_focus">1</property>
+            <property name="receives_default">1</property>
          </object>
          <packing>
            <property name="position">2</property>
@@ -149,6 +163,7 @@
    </child>
    <child>
      <object class="GtkToolbar">
+        <property name="visible">1</property>
        <property name="hexpand">1</property>
        <property name="toolbar-style">icons</property>
        <style>
@@ -156,9 +171,10 @@
        </style>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Normal</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">list-add-symbolic</property>
+            <property name="use_underline">1</property>
+            <property name="icon_name">list-add-symbolic</property>
          </object>
          <packing>
            <property name="homogeneous">1</property>
@@ -166,9 +182,10 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Normal</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">list-add-symbolic</property>
+            <property name="use_underline">1</property>
+            <property name="icon_name">list-add-symbolic</property>
          </object>
          <packing>
            <property name="homogeneous">1</property>
@@ -177,8 +194,8 @@
        <child>
          <object class="GtkToggleToolButton">
            <property name="label" translatable="yes">Active</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">list-remove-symbolic</property>
+            <property name="use_underline">1</property>
+            <property name="icon_name">list-remove-symbolic</property>
            <property name="active">1</property>
          </object>
          <packing>
@@ -187,9 +204,10 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="label" translatable="yes">Active</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">list-remove-symbolic</property>
+            <property name="use_underline">1</property>
+            <property name="icon_name">list-remove-symbolic</property>
            <property name="active">1</property>
          </object>
          <packing>
@@ -198,10 +216,11 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="sensitive">0</property>
            <property name="label" translatable="yes">Insensitive</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">edit-find-symbolic</property>
+            <property name="use_underline">1</property>
+            <property name="icon_name">edit-find-symbolic</property>
          </object>
          <packing>
            <property name="homogeneous">1</property>
@@ -209,10 +228,11 @@
        </child>
        <child>
          <object class="GtkToggleToolButton">
+            <property name="visible">1</property>
            <property name="sensitive">0</property>
            <property name="label" translatable="yes">Insensitive Active</property>
-            <property name="use-underline">1</property>
-            <property name="icon-name">go-up-symbolic</property>
+            <property name="use_underline">1</property>
+            <property name="icon_name">go-up-symbolic</property>
            <property name="active">1</property>
          </object>
          <packing>
@@ -223,9 +243,12 @@
    </child>
    <child>
      <object class="GtkBox">
+        <property name="visible">1</property>
        <property name="spacing">10</property>
+        <property name="orientation">horizontal</property>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Plain</property>
            <property name="halign">end</property>
            <property name="hexpand">1</property>
@@ -234,6 +257,7 @@
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Destructive</property>
            <style>
              <class name="destructive-action"/>
@@ -242,6 +266,7 @@
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Suggested</property>
            <style>
              <class name="suggested-action"/>
--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -0,0 +1,795 @@
+/* Tool Palette
+ *
+ * A tool palette widget shows groups of toolbar items as a grid of icons
+ * or a list of names.
+ */
+
+#include <string.h>
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+
+static void load_icon_items (GtkToolPalette *palette);
+static void load_toggle_items (GtkToolPalette *palette);
+static void load_special_items (GtkToolPalette *palette);
+
+typedef struct _CanvasItem CanvasItem;
+
+struct _CanvasItem
+{
+  GdkPixbuf *pixbuf;
+  gdouble x, y;
+};
+
+static gboolean drag_data_requested_for_drop = FALSE;
+static CanvasItem *drop_item = NULL;
+static GList *canvas_items = NULL;
+
+/********************************/
+/* ====== Canvas drawing ====== */
+/********************************/
+
+static CanvasItem*
+canvas_item_new (GtkWidget     *widget,
+                 GtkToolButton *button,
+                 gdouble        x,
+                 gdouble        y)
+{
+  CanvasItem *item = NULL;
+  const gchar *icon_name;
+  GdkPixbuf *pixbuf;
+  GtkIconTheme *icon_theme;
+
+  icon_name = gtk_tool_button_get_icon_name (button);
+  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
+  pixbuf = gtk_icon_theme_load_icon (icon_theme,
+                                     icon_name,
+                                     48,
+                                     GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+                                     NULL);
+
+  if (pixbuf)
+    {
+      item = g_slice_new0 (CanvasItem);
+      item->pixbuf = pixbuf;
+      item->x = x;
+      item->y = y;
+    }
+
+  return item;
+}
+
+static void
+canvas_item_free (CanvasItem *item)
+{
+  g_object_unref (item->pixbuf);
+  g_slice_free (CanvasItem, item);
+}
+
+static void
+canvas_item_draw (const CanvasItem *item,
+                  cairo_t          *cr,
+                  gboolean          preview)
+{
+  gdouble cx = gdk_pixbuf_get_width (item->pixbuf);
+  gdouble cy = gdk_pixbuf_get_height (item->pixbuf);
+
+  gdk_cairo_set_source_pixbuf (cr,
+                               item->pixbuf,
+                               item->x - cx * 0.5,
+                               item->y - cy * 0.5);
+
+  if (preview)
+    cairo_paint_with_alpha (cr, 0.6);
+  else
+    cairo_paint (cr);
+}
+
+static gboolean
+canvas_draw (GtkWidget *widget,
+             cairo_t   *cr)
+{
+  GList *iter;
+
+  cairo_set_source_rgb (cr, 1, 1, 1);
+  cairo_paint (cr);
+
+  for (iter = canvas_items; iter; iter = iter->next)
+    canvas_item_draw (iter->data, cr, FALSE);
+
+  if (drop_item)
+    canvas_item_draw (drop_item, cr, TRUE);
+
+  return TRUE;
+}
+
+/*****************************/
+/* ====== Palette DnD ====== */
+/*****************************/
+
+static void
+palette_drop_item (GtkToolItem      *drag_item,
+                   GtkToolItemGroup *drop_group,
+                   gint              x,
+                   gint              y)
+{
+  GtkWidget *drag_group = gtk_widget_get_parent (GTK_WIDGET (drag_item));
+  GtkToolItem *drop_item = gtk_tool_item_group_get_drop_item (drop_group, x, y);
+  gint drop_position = -1;
+
+  if (drop_item)
+    drop_position = gtk_tool_item_group_get_item_position (GTK_TOOL_ITEM_GROUP (drop_group), drop_item);
+
+  if (GTK_TOOL_ITEM_GROUP (drag_group) != drop_group)
+    {
+      gboolean homogeneous, expand, fill, new_row;
+
+      g_object_ref (drag_item);
+      gtk_container_child_get (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item),
+                               "homogeneous", &homogeneous,
+                               "expand", &expand,
+                               "fill", &fill,
+                               "new-row", &new_row,
+                               NULL);
+      gtk_container_remove (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item));
+      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (drop_group),
+                                  drag_item, drop_position);
+      gtk_container_child_set (GTK_CONTAINER (drop_group), GTK_WIDGET (drag_item),
+                               "homogeneous", homogeneous,
+                               "expand", expand,
+                               "fill", fill,
+                               "new-row", new_row,
+                               NULL);
+      g_object_unref (drag_item);
+    }
+  else
+    gtk_tool_item_group_set_item_position (GTK_TOOL_ITEM_GROUP (drop_group),
+                                           drag_item, drop_position);
+}
+
+static void
+palette_drop_group (GtkToolPalette   *palette,
+                    GtkToolItemGroup *drag_group,
+                    GtkToolItemGroup *drop_group)
+{
+  gint drop_position = -1;
+
+  if (drop_group)
+    drop_position = gtk_tool_palette_get_group_position (palette, drop_group);
+
+  gtk_tool_palette_set_group_position (palette, drag_group, drop_position);
+}
+
+static void
+palette_drag_data_received (GtkWidget        *widget,
+                            GdkDragContext   *context,
+                            gint              x,
+                            gint              y,
+                            GtkSelectionData *selection,
+                            guint             time,
+                            gpointer          data)
+{
+  GtkAllocation     allocation;
+  GtkToolItemGroup *drop_group = NULL;
+  GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
+  GtkWidget        *drag_item = NULL;
+
+  while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette))
+    drag_palette = gtk_widget_get_parent (drag_palette);
+
+  if (drag_palette)
+    {
+      drag_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (drag_palette),
+                                                  selection);
+      drop_group = gtk_tool_palette_get_drop_group (GTK_TOOL_PALETTE (widget),
+                                                    x, y);
+    }
+
+  if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
+    palette_drop_group (GTK_TOOL_PALETTE (drag_palette),
+                        GTK_TOOL_ITEM_GROUP (drag_item),
+                        drop_group);
+  else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group)
+    {
+      gtk_widget_get_allocation (GTK_WIDGET (drop_group), &allocation);
+      palette_drop_item (GTK_TOOL_ITEM (drag_item),
+                         drop_group,
+                         x - allocation.x,
+                         y - allocation.y);
+    }
+}
+
+/********************************/
+/* ====== Passive Canvas ====== */
+/********************************/
+
+static void
+passive_canvas_drag_data_received (GtkWidget        *widget,
+                                   GdkDragContext   *context,
+                                   gint              x,
+                                   gint              y,
+                                   GtkSelectionData *selection,
+                                   guint             time,
+                                   gpointer          data)
+{
+  /* find the tool button, which is the source of this DnD operation */
+
+  GtkWidget *palette = gtk_drag_get_source_widget (context);
+  CanvasItem *canvas_item = NULL;
+  GtkWidget *tool_item = NULL;
+
+  while (palette && !GTK_IS_TOOL_PALETTE (palette))
+    palette = gtk_widget_get_parent (palette);
+
+  if (palette)
+    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
+                                                selection);
+
+  g_assert (NULL == drop_item);
+
+  /* append a new canvas item when a tool button was found */
+
+  if (GTK_IS_TOOL_ITEM (tool_item))
+    canvas_item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
+
+  if (canvas_item)
+    {
+      canvas_items = g_list_append (canvas_items, canvas_item);
+      gtk_widget_queue_draw (widget);
+    }
+}
+
+/************************************/
+/* ====== Interactive Canvas ====== */
+/************************************/
+
+static gboolean
+interactive_canvas_drag_motion (GtkWidget      *widget,
+                                GdkDragContext *context,
+                                gint            x,
+                                gint            y,
+                                guint           time,
+                                gpointer        data)
+{
+  if (drop_item)
+    {
+      /* already have a drop indicator - just update position */
+
+      drop_item->x = x;
+      drop_item->y = y;
+
+      gtk_widget_queue_draw (widget);
+      gdk_drag_status (context, GDK_ACTION_COPY, time);
+    }
+  else
+    {
+      /* request DnD data for creating a drop indicator */
+
+      GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
+
+      if (!target)
+        return FALSE;
+
+      drag_data_requested_for_drop = FALSE;
+      gtk_drag_get_data (widget, context, target, time);
+    }
+
+  return TRUE;
+}
+
+static void
+interactive_canvas_drag_data_received (GtkWidget        *widget,
+                                       GdkDragContext   *context,
+                                       gint              x,
+                                       gint              y,
+                                       GtkSelectionData *selection,
+                                       guint             time,
+                                       gpointer          data)
+
+{
+  /* find the tool button which is the source of this DnD operation */
+
+  GtkWidget *palette = gtk_drag_get_source_widget (context);
+  GtkWidget *tool_item = NULL;
+  CanvasItem *item;
+
+  while (palette && !GTK_IS_TOOL_PALETTE (palette))
+    palette = gtk_widget_get_parent (palette);
+
+  if (palette)
+    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
+                                                selection);
+
+  /* create a canvas item when a tool button was found */
+
+  g_assert (NULL == drop_item);
+
+  if (!GTK_IS_TOOL_ITEM (tool_item))
+    return;
+
+  if (drop_item)
+    {
+      canvas_item_free (drop_item);
+      drop_item = NULL;
+    }
+
+  item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
+
+  /* Either create a new item or just create a preview item, 
+     depending on why the drag data was requested. */
+  if(drag_data_requested_for_drop)
+    {
+      canvas_items = g_list_append (canvas_items, item);
+      drop_item = NULL;
+
+      gtk_drag_finish (context, TRUE, time);
+    } else
+    {
+      drop_item = item;
+      gdk_drag_status (context, GDK_ACTION_COPY, time);
+    }
+
+  gtk_widget_queue_draw (widget);
+}
+
+static gboolean
+interactive_canvas_drag_drop (GtkWidget      *widget,
+                              GdkDragContext *context,
+                              gint            x,
+                              gint            y,
+                              guint           time,
+                              gpointer        data)
+{
+  GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
+
+  if (!target)
+    return FALSE;
+
+  drag_data_requested_for_drop = TRUE;
+  gtk_drag_get_data (widget, context, target, time);
+
+  return FALSE;
+}
+
+static void
+interactive_canvas_drag_leave (gpointer data)
+{
+  if (drop_item)
+    {
+      GtkWidget *widget = GTK_WIDGET (data);
+
+      canvas_item_free (drop_item);
+      drop_item = NULL;
+
+      if (widget)
+        gtk_widget_queue_draw (widget);
+    }
+}
+
+static void
+on_combo_orientation_changed (GtkComboBox *combo_box,
+                              gpointer     user_data)
+{
+  GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
+  GtkScrolledWindow *sw;
+  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
+  GtkTreeIter iter;
+  gint val = 0;
+
+  sw = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (GTK_WIDGET (palette)));
+
+  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
+    return;
+
+  gtk_tree_model_get (model, &iter, 1, &val, -1);
+
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (palette), val);
+
+  if (val == GTK_ORIENTATION_HORIZONTAL)
+    gtk_scrolled_window_set_policy (sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+  else
+    gtk_scrolled_window_set_policy (sw, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+}
+
+static void
+on_combo_style_changed (GtkComboBox *combo_box,
+                        gpointer     user_data)
+{
+  GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
+  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
+  GtkTreeIter iter;
+  gint val = 0;
+
+  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
+    return;
+
+  gtk_tree_model_get (model, &iter, 1, &val, -1);
+
+  if (val == -1)
+    gtk_tool_palette_unset_style (palette);
+  else
+    gtk_tool_palette_set_style (palette, val);
+}
+
+GtkWidget *
+do_toolpalette (GtkWidget *do_widget)
+{
+  GtkWidget *box = NULL;
+  GtkWidget *hbox = NULL;
+  GtkWidget *combo_orientation = NULL;
+  GtkListStore *orientation_model = NULL;
+  GtkWidget *combo_style = NULL;
+  GtkListStore *style_model = NULL;
+  GtkCellRenderer *cell_renderer = NULL;
+  GtkTreeIter iter;
+  GtkWidget *palette = NULL;
+  GtkWidget *palette_scroller = NULL;
+  GtkWidget *notebook = NULL;
+  GtkWidget *contents = NULL;
+  GtkWidget *contents_scroller = NULL;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Tool Palette");
+      gtk_window_set_default_size (GTK_WINDOW (window), 200, 600);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      /* Add widgets to control the ToolPalette appearance: */
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+      g_object_set (box, "margin", 6, NULL);
+      gtk_container_add (GTK_CONTAINER (window), box);
+
+      /* Orientation combo box: */
+      orientation_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+      gtk_list_store_append (orientation_model, &iter);
+      gtk_list_store_set (orientation_model, &iter,
+                          0, "Horizontal",
+                          1, GTK_ORIENTATION_HORIZONTAL,
+                          -1);
+      gtk_list_store_append (orientation_model, &iter);
+      gtk_list_store_set (orientation_model, &iter,
+                          0, "Vertical",
+                          1, GTK_ORIENTATION_VERTICAL,
+                          -1);
+
+      combo_orientation =
+        gtk_combo_box_new_with_model (GTK_TREE_MODEL (orientation_model));
+      cell_renderer = gtk_cell_renderer_text_new ();
+      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_orientation),
+                                  cell_renderer,
+                                  TRUE);
+      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_orientation),
+                                      cell_renderer,
+                                      "text", 0,
+                                      NULL);
+      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter);
+      gtk_box_pack_start (GTK_BOX (box), combo_orientation);
+
+      /* Style combo box: */
+      style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Text",
+                          1, GTK_TOOLBAR_TEXT,
+                          -1);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Both",
+                          1, GTK_TOOLBAR_BOTH,
+                          -1);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Both: Horizontal",
+                          1, GTK_TOOLBAR_BOTH_HORIZ,
+                          -1);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Icons",
+                          1, GTK_TOOLBAR_ICONS,
+                          -1);
+      gtk_list_store_append (style_model, &iter);
+      gtk_list_store_set (style_model, &iter,
+                          0, "Default",
+                          1, -1,  /* A custom meaning for this demo. */
+                          -1);
+      combo_style = gtk_combo_box_new_with_model (GTK_TREE_MODEL (style_model));
+      cell_renderer = gtk_cell_renderer_text_new ();
+      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_style),
+                                  cell_renderer,
+                                  TRUE);
+      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_style),
+                                      cell_renderer,
+                                      "text", 0,
+                                      NULL);
+      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter);
+      gtk_box_pack_start (GTK_BOX (box), combo_style);
+
+      /* Add hbox */
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+      gtk_box_pack_start (GTK_BOX (box), hbox);
+
+      /* Add and fill the ToolPalette: */
+      palette = gtk_tool_palette_new ();
+
+      load_icon_items (GTK_TOOL_PALETTE (palette));
+      load_toggle_items (GTK_TOOL_PALETTE (palette));
+      load_special_items (GTK_TOOL_PALETTE (palette));
+
+      palette_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_widget_set_vexpand (palette_scroller, TRUE);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
+                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC);
+      g_object_set (palette_scroller, "margin", 6, NULL);
+      gtk_widget_set_hexpand (palette_scroller, TRUE);
+
+      gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
+      gtk_container_add (GTK_CONTAINER (hbox), palette_scroller);
+
+      /* Connect signals: */
+      g_signal_connect (combo_orientation, "changed",
+                        G_CALLBACK (on_combo_orientation_changed), palette);
+      g_signal_connect (combo_style, "changed",
+                        G_CALLBACK (on_combo_style_changed), palette);
+
+      /* Keep the widgets in sync: */
+      on_combo_orientation_changed (GTK_COMBO_BOX (combo_orientation), palette);
+
+      /* ===== notebook ===== */
+
+      notebook = gtk_notebook_new ();
+      g_object_set (notebook, "margin", 6, NULL);
+      gtk_box_pack_end (GTK_BOX(hbox), notebook);
+
+      /* ===== DnD for tool items ===== */
+
+      g_signal_connect (palette, "drag-data-received",
+                        G_CALLBACK (palette_drag_data_received), NULL);
+
+      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
+                                      palette,
+                                      GTK_DEST_DEFAULT_ALL,
+                                      GTK_TOOL_PALETTE_DRAG_ITEMS |
+                                      GTK_TOOL_PALETTE_DRAG_GROUPS,
+                                      GDK_ACTION_MOVE);
+
+      /* ===== passive DnD dest ===== */
+
+      contents = gtk_drawing_area_new ();
+
+      g_object_connect (contents,
+                        "draw", canvas_draw, NULL,
+                        "drag-data-received", passive_canvas_drag_data_received, NULL,
+                        NULL);
+
+      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
+                                      contents,
+                                      GTK_DEST_DEFAULT_ALL,
+                                      GTK_TOOL_PALETTE_DRAG_ITEMS,
+                                      GDK_ACTION_COPY);
+
+      contents_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_ALWAYS);
+      gtk_container_add (GTK_CONTAINER (contents_scroller), contents);
+
+      gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                                contents_scroller,
+                                gtk_label_new ("Passive DnD Mode"));
+      g_object_set (contents_scroller, "margin", 6, NULL);
+
+      /* ===== interactive DnD dest ===== */
+
+      contents = gtk_drawing_area_new ();
+
+      g_object_connect (contents,
+                        "draw", canvas_draw, NULL,
+                        "drag-motion", interactive_canvas_drag_motion, NULL,
+                        "drag-data-received", interactive_canvas_drag_data_received, NULL,
+                        "drag-leave", interactive_canvas_drag_leave, contents,
+                        "drag-drop", interactive_canvas_drag_drop, NULL,
+                        NULL);
+
+      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
+                                      contents,
+                                      GTK_DEST_DEFAULT_HIGHLIGHT,
+                                      GTK_TOOL_PALETTE_DRAG_ITEMS,
+                                      GDK_ACTION_COPY);
+
+      contents_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_ALWAYS);
+      gtk_container_add (GTK_CONTAINER (contents_scroller), contents);
+
+      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), contents_scroller,
+                                gtk_label_new ("Interactive DnD Mode"));
+    }
+
+  if (!gtk_widget_get_visible (window))
+    {
+      gtk_widget_show (window);
+    }
+  else
+    {
+      gtk_widget_destroy (window);
+      window = NULL;
+    }
+
+  return window;
+}
+
+
+static void
+load_icon_items (GtkToolPalette *palette)
+{
+  GList *contexts;
+  GList *l;
+  GtkIconTheme *icon_theme;
+
+  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (palette)));
+
+  contexts = gtk_icon_theme_list_contexts (icon_theme);
+  for (l = contexts; l; l = l->next)
+    {
+      gchar *context = l->data;
+      GList *icon_names;
+      GList *ll;
+      const guint max_icons = 10;
+      guint icons_count = 0;
+
+      GtkWidget *group = gtk_tool_item_group_new (context);
+      gtk_container_add (GTK_CONTAINER (palette), group);
+
+      if (g_strcmp0 (context, "Animations") == 0)
+        continue;
+
+      g_message ("Got context '%s'", context);
+      icon_names = gtk_icon_theme_list_icons (icon_theme, context);
+      icon_names = g_list_sort (icon_names, (GCompareFunc) strcmp);
+
+      for (ll = icon_names; ll; ll = ll->next)
+        {
+          GtkToolItem *item;
+          gchar *id = ll->data;
+
+          if (g_str_equal (id, "emblem-desktop"))
+            continue;
+
+          if (g_str_has_suffix (id, "-symbolic"))
+            continue;
+
+          g_message ("Got id '%s'", id);
+
+          item = gtk_tool_button_new (NULL, NULL);
+          gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), id);
+          gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item), id);
+          gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+
+          /* Prevent us having an insane number of icons: */
+          ++icons_count;
+          if(icons_count >= max_icons)
+            break;
+        }
+
+      g_list_free_full (icon_names, g_free);
+    }
+
+  g_list_free_full (contexts, g_free);
+}
+
+static void
+load_toggle_items (GtkToolPalette *palette)
+{
+  GSList *toggle_group = NULL;
+  GtkToolItem *item;
+  GtkWidget *group;
+  char *label;
+  int i;
+
+  group = gtk_tool_item_group_new ("Radio Item");
+  gtk_container_add (GTK_CONTAINER (palette), group);
+
+  for (i = 1; i <= 10; ++i)
+    {
+      label = g_strdup_printf ("#%d", i);
+      item = gtk_radio_tool_button_new (toggle_group);
+      gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), label);
+      g_free (label);
+
+      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+      toggle_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item));
+    }
+}
+
+static GtkToolItem *
+create_entry_item (const char *text)
+{
+  GtkToolItem *item;
+  GtkWidget *entry;
+
+  entry = gtk_entry_new ();
+  gtk_entry_set_text (GTK_ENTRY (entry), text);
+  gtk_entry_set_width_chars (GTK_ENTRY (entry), 5);
+
+  item = gtk_tool_item_new ();
+  gtk_container_add (GTK_CONTAINER (item), entry);
+
+  return item;
+}
+
+static void
+load_special_items (GtkToolPalette *palette)
+{
+  GtkToolItem *item;
+  GtkWidget *group;
+  GtkWidget *label_button;
+
+  group = gtk_tool_item_group_new (NULL);
+  label_button = gtk_button_new_with_label ("Advanced Features");
+  gtk_widget_show (label_button);
+  gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (group),
+                                        label_button);
+  gtk_container_add (GTK_CONTAINER (palette), group);
+
+  item = create_entry_item ("homogeneous=FALSE");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE, NULL);
+
+  item = create_entry_item ("homogeneous=FALSE, expand=TRUE");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE, "expand", TRUE,
+                           NULL);
+
+  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, fill=FALSE");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE, "expand", TRUE,
+                           "fill", FALSE, NULL);
+
+  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, new-row=TRUE");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE, "expand", TRUE,
+                           "new-row", TRUE, NULL);
+
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "go-up");
+  gtk_tool_item_set_tooltip_text (item, "Show on vertical palettes only");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_tool_item_set_visible_horizontal (item, FALSE);
+
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "go-next");
+  gtk_tool_item_set_tooltip_text (item, "Show on horizontal palettes only");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_tool_item_set_visible_vertical (item, FALSE);
+
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "edit-delete");
+  gtk_tool_item_set_tooltip_text (item, "Do not show at all");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_widget_hide (GTK_WIDGET (item));
+
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "view-fullscreen");
+  gtk_tool_item_set_tooltip_text (item, "Expanded this item");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
+                           "homogeneous", FALSE,
+                           "expand", TRUE,
+                           NULL);
+
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "help-browser");
+  gtk_tool_item_set_tooltip_text (item, "A regular item");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+}
--- a/demos/gtk-demo/video_player.c
+++ b/demos/gtk-demo/video_player.c
@@ -1,96 +0,0 @@
-/* Video Player
- *
- * This is a simple video player using just GTK widgets.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-static void
-open_dialog_response_cb (GtkWidget *dialog,
-                         int        response,
-                         GtkWidget *video)
-{
-  gtk_widget_hide (dialog);
-
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      GFile *file;
-
-      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-      gtk_video_set_file (GTK_VIDEO (video), file);
-      g_object_unref (file);
-    }
-
-  gtk_widget_destroy (dialog);
-}
-
-static void
-open_clicked_cb (GtkWidget *button,
-                 GtkWidget *video)
-{
-  GtkWidget *dialog;
-
-  dialog = gtk_file_chooser_dialog_new ("Select a video",
-                                        GTK_WINDOW (gtk_widget_get_toplevel (button)),
-                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        "_Cancel", GTK_RESPONSE_CANCEL,
-                                        "_Open", GTK_RESPONSE_ACCEPT,
-                                        NULL);
-  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-  g_signal_connect (dialog, "response", G_CALLBACK (open_dialog_response_cb), video);
-  gtk_widget_show (dialog);
-}
-
-static void
-fullscreen_clicked_cb (GtkWidget *button,
-                       gpointer   unused)
-{
-  GtkWidget *window = gtk_widget_get_toplevel (button);
-
-  gtk_window_fullscreen (GTK_WINDOW (window));
-}
-
-GtkWidget *
-do_video_player (GtkWidget *do_widget)
-{
-  GtkWidget *title;
-  GtkWidget *video;
-  GtkWidget *open_button;
-  GtkWidget *fullscreen_button;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Video Player");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      video = gtk_video_new ();
-      gtk_container_add (GTK_CONTAINER (window), video);
-
-      title = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (title), TRUE);
-      gtk_header_bar_set_title (GTK_HEADER_BAR (title), "Video Player");
-      gtk_window_set_titlebar (GTK_WINDOW (window), title);
-
-      open_button = gtk_button_new_with_mnemonic ("_Open");
-      g_signal_connect (open_button, "clicked", G_CALLBACK (open_clicked_cb), video);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (title), open_button);
-
-      fullscreen_button = gtk_button_new_from_icon_name ("view-fullscreen-symbolic");
-      g_signal_connect (fullscreen_button, "clicked", G_CALLBACK (fullscreen_clicked_cb), NULL);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (title), fullscreen_button);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/widgetbowl.c
+++ b/demos/gtk-demo/widgetbowl.c
@@ -1,14 +1,13 @@
 /* Benchmark/Widgetbowl
 *
- * This is a version of the Fishbowl demo that instead shows different
- * kinds of widgets, which is useful for comparing the rendering performance
- * of theme specifics.
+ * This demo models the fishbowl demos seen on the web in a GTK way.
+ * It's also a neat little tool to see how fast your computer (or
+ * your GTK version) is.
 */

 #include <gtk/gtk.h>

 #include "gtkfishbowl.h"
-#include "gtkgears.h"

 const char *const css =
 ".blurred-button {"
@@ -81,38 +80,6 @@ create_label (void)
  return w;
 }

-static GtkWidget *
-create_video (void)
-{
-  GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-  GtkWidget *w = gtk_image_new_from_paintable (GDK_PAINTABLE (stream));
-  gtk_media_stream_set_loop (stream, TRUE);
-  gtk_media_stream_play (stream);
-  g_object_unref (stream);
-
-  return w;
-}
-
-static GtkWidget *
-create_gears (void)
-{
-  GtkWidget *w = gtk_gears_new ();
-
-  gtk_widget_set_size_request (w, 100, 100);
-
-  return w;
-}
-
-static GtkWidget *
-create_switch (void)
-{
-  GtkWidget *w = gtk_switch_new ();
-
-  gtk_switch_set_state (GTK_SWITCH (w), TRUE);
-
-  return w;
-}
-
 static const struct {
  const char *name;
  GtkWidget * (*create_func) (void);
@@ -124,9 +91,6 @@ static const struct {
  { "Label"     , create_label          },
  { "Spinner"   , create_spinner        },
  { "Spinbutton", create_spinbutton     },
-  { "Video",      create_video          },
-  { "Gears",      create_gears          },
-  { "Switch",     create_switch         },
 };

 static int selected_widget_type = -1;
--- a/demos/icon-browser/iconbrowserwin.c
+++ b/demos/icon-browser/iconbrowserwin.c
@@ -54,7 +54,6 @@ struct _IconBrowserWindow
  GtkWidget *image6;
  GtkWidget *label6;
  GtkWidget *description;
-  GtkEventController *controller;
 };

 struct _IconBrowserWindowClass
@@ -287,16 +286,13 @@ populate (IconBrowserWindow *win)
 }

 static gboolean
-key_event_cb (GtkEventController *controller,
-              guint               keyval,
-              guint               keycode,
-              GdkModifierType     state,
-              gpointer            data)
+key_press_event_cb (GtkWidget *widget,
+                    GdkEvent  *event,
+                    gpointer   data)
 {
  IconBrowserWindow *win = data;

-  return gtk_search_bar_handle_event (GTK_SEARCH_BAR (win->searchbar),
-                                      gtk_get_current_event ());
+  return gtk_search_bar_handle_event (GTK_SEARCH_BAR (win->searchbar), event);
 }

 static void
@@ -471,7 +467,6 @@ icon_browser_window_init (IconBrowserWindow *win)
  setup_image_dnd (win->image3);
  setup_image_dnd (win->image4);
  setup_image_dnd (win->image5);
-  setup_image_dnd (win->image6);
  setup_scalable_image_dnd (win->image6);

  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, context_free);
@@ -484,31 +479,12 @@ icon_browser_window_init (IconBrowserWindow *win)

  symbolic_toggled (GTK_TOGGLE_BUTTON (win->symbolic_radio), win);

-  win->controller = gtk_event_controller_key_new (GTK_WIDGET (win));
-  g_signal_connect (win->controller, "key-pressed", G_CALLBACK (key_event_cb), win);
-
  populate (win);
 }

-static void
-icon_browser_window_finalize (GObject *object)
-{
-  IconBrowserWindow *win = ICON_BROWSER_WINDOW (object);
-
-  g_hash_table_unref (win->contexts);
-
-  g_object_unref (win->controller);
-
-  G_OBJECT_CLASS (icon_browser_window_parent_class)->finalize (object);
-}
-
 static void
 icon_browser_window_class_init (IconBrowserWindowClass *class)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = icon_browser_window_finalize;
-
  g_type_ensure (ICON_STORE_TYPE);

  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
@@ -539,6 +515,7 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), item_activated);
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), selected_context_changed);
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), symbolic_toggled);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), key_press_event_cb);
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), copy_to_clipboard);
 }

--- a/demos/icon-browser/meson.build
+++ b/demos/icon-browser/meson.build
@@ -14,7 +14,6 @@ executable('gtk4-icon-browser',
           dependencies: libgtk_dep,
           include_directories: confinc,
           gui_app: true,
-           link_args: extra_demo_ldflags,
           install: true)

 install_data('gtk4-icon-browser.desktop', install_dir: gtk_applicationsdir)
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -1,32 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
  <!-- interface-requires gtk+ 3.8 -->
-  <object class="IconStore" id="store"/>
+  <object class="IconStore" id="store">
+  </object>
  <object class="GtkTreeModelFilter" id="filter_model">
-    <property name="child-model">store</property>
+    <property name="child_model">store</property>
  </object>
  <template class="IconBrowserWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="yes">Icon Browser</property>
    <property name="default-width">1024</property>
    <property name="default-height">768</property>
+    <signal name="key-press-event" handler="key_press_event_cb"/>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
+        <property name="visible">True</property>
        <property name="title" translatable="yes">Icon Browser</property>
-        <property name="show-title-buttons">1</property>
+        <property name="show-title-buttons">True</property>
        <child type="title">
          <object class="GtkBox">
+            <property name="visible">True</property>
            <style>
              <class name="linked"/>
            </style>
            <child>
              <object class="GtkRadioButton" id="normal_radio">
-                <property name="draw-indicator">0</property>
+                <property name="visible">True</property>
+                <property name="draw_indicator">False</property>
                <property name="label" translatable="yes">Normal</property>
              </object>
            </child>
            <child>
              <object class="GtkRadioButton" id="symbolic_radio">
-                <property name="draw-indicator">0</property>
+                <property name="visible">True</property>
+                <property name="draw_indicator">False</property>
                <property name="label" translatable="yes">Symbolic</property>
                <property name="group">normal_radio</property>
                <signal name="toggled" handler="symbolic_toggled"/>
@@ -36,11 +42,13 @@
        </child>
        <child>
          <object class="GtkToggleButton" id="search">
+            <property name="visible">True</property>
            <style>
              <class name="image-button"/>
            </style>
            <child>
              <object class="GtkImage" id="search-icon">
+                <property name="visible">True</property>
                <property name="icon-name">edit-find-symbolic</property>
              </object>
            </child>
@@ -53,24 +61,32 @@
    </child>
    <child>
      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="orientation">horizontal</property>
        <child>
          <object class="GtkListBox" id="context_list">
+            <property name="visible">True</property>
+            <property name="selection_mode">single</property>
            <signal name="selected-rows-changed" handler="selected_context_changed"/>
          </object>
        </child>
        <child>
          <object class="GtkSeparator">
+            <property name="visible">True</property>
            <property name="orientation">vertical</property>
          </object>
        </child>
        <child>
          <object class="GtkBox" id="content_box">
+            <property name="visible">True</property>
            <property name="orientation">vertical</property>
            <child>
              <object class="GtkSearchBar" id="searchbar">
+                <property name="visible">True</property>
                <property name="search-mode-enabled" bind-source="search" bind-property="active" bind-flags="bidirectional"/>
                <child>
                  <object class="GtkSearchEntry" id="searchentry">
+                    <property name="visible">True</property>
                    <signal name="search-changed" handler="search_text_changed"/>
                  </object>
                </child>
@@ -78,24 +94,29 @@
            </child>
            <child>
              <object class="GtkScrolledWindow" id="sw">
-                <property name="expand">1</property>
+                <property name="visible">True</property>
+                <property name="expand">True</property>
                <property name="hscrollbar-policy">never</property>
+                <property name="vscrollbar-policy">automatic</property>
                <child>
                  <object class="GtkIconView" id="list">
+                    <property name="visible">True</property>
                    <property name="model">filter_model</property>
                    <property name="selection-mode">none</property>
-                    <property name="activate-on-single-click">1</property>
+                    <property name="activate-on-single-click">True</property>
                    <signal name="item_activated" handler="item_activated"/>
                    <child>
                      <object class="GtkCellRendererPixbuf" id="cell">
                        <property name="xpad">10</property>
                        <property name="ypad">10</property>
+                        <property name="stock-size">6</property>
                      </object>
                    </child>
                    <child>
                      <object class="GtkCellRendererText" id="text_cell">
                        <property name="xpad">10</property>
                        <property name="ypad">10</property>
+                        <property name="xalign">0.5</property>
                      </object>
                    </child>
                  </object>
@@ -116,25 +137,24 @@
    </widgets>
  </object>
  <object class="GtkDialog" id="details">
-    <property name="modal">1</property>
+    <property name="modal">True</property>
    <property name="use-header-bar">1</property>
-    <property name="resizable">0</property>
+    <property name="resizable">False</property>
    <property name="hide-on-close">1</property>
    <child internal-child="vbox">
      <object class="GtkBox">
        <child>
          <object class="GtkGrid">
+            <property name="visible">True</property>
            <property name="margin">10</property>
            <property name="row-spacing">18</property>
            <property name="column-spacing">18</property>
            <property name="halign">center</property>
            <child>
              <object class="GtkImage" id="image1">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label1"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">0</property>
@@ -143,11 +163,9 @@
            </child>
            <child>
              <object class="GtkImage" id="image2">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label2"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">1</property>
@@ -156,11 +174,9 @@
            </child>
            <child>
              <object class="GtkImage" id="image3">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label3"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">2</property>
@@ -169,11 +185,9 @@
            </child>
            <child>
              <object class="GtkImage" id="image4">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label4"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">3</property>
@@ -182,11 +196,9 @@
            </child>
            <child>
              <object class="GtkImage" id="image5">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label5"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">4</property>
@@ -195,28 +207,25 @@
            </child>
            <child>
              <object class="GtkImage" id="image6">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label6"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">5</property>
                <property name="top-attach">1</property>
              </packing>
            </child>
+
            <child>
              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">baseline</property>
                <property name="label">16×16</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image1"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">0</property>
@@ -225,15 +234,13 @@
            </child>
            <child>
              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">baseline</property>
                <property name="label">24×24</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image2"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">1</property>
@@ -242,15 +249,13 @@
            </child>
            <child>
              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">baseline</property>
                <property name="label">32×32</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image3"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">2</property>
@@ -259,15 +264,13 @@
            </child>
            <child>
              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">baseline</property>
                <property name="label">48×48</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image4"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">3</property>
@@ -276,15 +279,13 @@
            </child>
            <child>
              <object class="GtkLabel" id="label5">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">baseline</property>
                <property name="label">64×64</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image5"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">4</property>
@@ -293,15 +294,13 @@
            </child>
            <child>
              <object class="GtkLabel" id="label6">
+                <property name="visible">True</property>
                <property name="halign">center</property>
                <property name="valign">baseline</property>
                <property name="label">scalable</property>
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image6"/>
-                </accessibility>
              </object>
              <packing>
                <property name="left-attach">5</property>
@@ -312,6 +311,7 @@
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">True</property>
            <property name="label" translatable="yes">Copy to Clipboard</property>
            <property name="halign">center</property>
            <property name="valign">center</property>
@@ -322,7 +322,8 @@
        <child>
          <object class="GtkLabel" id="description">
            <property name="margin">10</property>
-            <property name="wrap">1</property>
+            <property name="visible">True</property>
+            <property name="wrap">True</property>
            <property name="max-width-chars">60</property>
            <property name="valign">start</property>
          </object>
--- a/demos/widget-factory/help-overlay.ui
+++ b/demos/widget-factory/help-overlay.ui
@@ -2,23 +2,28 @@
  <object class="GtkShortcutsWindow" id="help_overlay">
    <child>
      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title">General</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">F1</property>
                <property name="title">Show About Dialog</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Primary&gt;q</property>
                <property name="title">Quit</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Primary&gt;d</property>
                <property name="title">Switch to dark theme</property>
              </object>
@@ -27,22 +32,26 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title">Traditional</property>
            <property name="view">page2</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Primary&gt;s</property>
                <property name="title">Search</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">Delete</property>
                <property name="title">Delete</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Primary&gt;b</property>
                <property name="title">Set background</property>
              </object>
@@ -51,22 +60,26 @@
        </child>
        <child>
          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
            <property name="title">Modern</property>
            <property name="view">page3</property>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Primary&gt;o</property>
                <property name="title">Open a file</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Primary&gt;r</property>
                <property name="title">Start recording</property>
              </object>
            </child>
            <child>
              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                <property name="accelerator">&lt;Primary&gt;l</property>
                <property name="title">Lock or unlock</property>
              </object>
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -9,7 +9,6 @@ executable('gtk4-widget-factory',
           dependencies: libgtk_dep,
           include_directories: confinc,
           gui_app: true,
-           link_args: extra_demo_ldflags,
           install: true)

 # desktop file
@@ -25,6 +24,3 @@ foreach icon_size : ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
  install_data('data/@0@/gtk4-widget-factory-symbolic.symbolic.png'.format(icon_size),
               install_dir: icons_dir)
 endforeach
-
-# appdata
-install_data('org.gtk.WidgetFactory.appdata.xml', install_dir: gtk_appdatadir)
--- a/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
+++ b/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>org.gtk.WidgetFactory.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.0+</project_license>
-  <name>GTK+ Widget Factory</name>
-  <summary>Program to demonstrate GTK+ functions</summary>
-  <description>
-    <p>
-      GTK+ Widget Factory is a showcase of GTK+ widgets. It was
-      originally created to help theme authors test their creations
-      for completeness.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-widget-factory/gtk-widget-factory1.png</image>
-      <caption>Page 1</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://static.gnome.org/appdata/gtk4-widget-factory/gtk-widget-factory2.png</image>
-      <caption>Page 3</caption>
-    </screenshot>
-  </screenshots>
-  <kudos>
-    <kudo>AppMenu</kudo>
-    <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>
-</component>
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -64,7 +64,7 @@ get_idle (gpointer data)
  GtkApplication *app = gtk_window_get_application (GTK_WINDOW (window));

  gtk_widget_set_sensitive (window, TRUE);
-  gdk_surface_set_cursor (gtk_widget_get_surface (window), NULL);
+  gdk_window_set_cursor (gtk_widget_get_window (window), NULL);
  g_application_unmark_busy (G_APPLICATION (app));

  return G_SOURCE_REMOVE;
@@ -81,7 +81,7 @@ get_busy (GSimpleAction *action,

  g_application_mark_busy (G_APPLICATION (app));
  cursor = gdk_cursor_new_from_name ("wait", NULL);
-  gdk_surface_set_cursor (gtk_widget_get_surface (window), cursor);
+  gdk_window_set_cursor (gtk_widget_get_window (window), cursor);
  g_object_unref (cursor);
  g_timeout_add (5000, get_idle, window);

@@ -1082,7 +1082,7 @@ set_accel (GtkApplication *app, GtkWidget *widget)
 typedef struct
 {
  GtkTextView tv;
-  GdkPixbuf *pixbuf;
+  cairo_surface_t *surface;
 } MyTextView;

 typedef GtkTextViewClass MyTextViewClass;
@@ -1101,10 +1101,10 @@ my_tv_draw_layer (GtkTextView      *widget,
 {
  MyTextView *tv = (MyTextView *)widget;

-  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT && tv->pixbuf)
+  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT && tv->surface)
    {
      cairo_save (cr);
-      gdk_cairo_set_source_pixbuf (cr, tv->pixbuf, 0.0, 0.0);
+      cairo_set_source_surface (cr, tv->surface, 0.0, 0.0);
      cairo_paint_with_alpha (cr, 0.333);
      cairo_restore (cr);
    }
@@ -1115,7 +1115,8 @@ my_tv_finalize (GObject *object)
 {
  MyTextView *tv = (MyTextView *)object;

-  g_clear_object (&tv->pixbuf);
+  if (tv->surface)
+    cairo_surface_destroy (tv->surface);

  G_OBJECT_CLASS (my_text_view_parent_class)->finalize (object);
 }
@@ -1133,14 +1134,18 @@ my_text_view_class_init (MyTextViewClass *class)
 static void
 my_text_view_set_background (MyTextView *tv, const gchar *filename)
 {
+  GdkPixbuf *pixbuf;
  GError *error = NULL;

-  g_clear_object (&tv->pixbuf);
+  if (tv->surface)
+    cairo_surface_destroy (tv->surface);
+
+  tv->surface = NULL;

  if (filename == NULL)
    return;

-  tv->pixbuf = gdk_pixbuf_new_from_file (filename, &error);
+  pixbuf = gdk_pixbuf_new_from_file (filename, &error);
  if (error)
    {
      g_warning ("%s", error->message);
@@ -1148,6 +1153,10 @@ my_text_view_set_background (MyTextView *tv, const gchar *filename)
      return;
    }

+  tv->surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 1, NULL);
+
+  g_object_unref (pixbuf);
+
  gtk_widget_queue_draw (GTK_WIDGET (tv));
 }

--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
--- a/docs/CODE-OWNERS
+++ b/docs/CODE-OWNERS
@@ -1,68 +0,0 @@
-# These are the people responsible for subsystems in GTK; if you're opening
-# a merge request for files listed here, please add the following people to
-# the list of reviewers
-
-# The syntax of this file is similar to the GitHub CODEOWNERS file:
-#   https://help.github.com/articles/about-codeowners/
-# Which, in turn, is similar to the .gitignore and .gitattributes files:
-#
-#  - comments start with `#`
-#  - the first column contains paths and globs
-#  - the second column contains GitLab user names or email addresses,
-#    separated by spaces
-#
-# If you want to be responsible for code reviews in specific sections of
-# the GTK code base, add yourself here.
-
-# Maintainer
-*                       @matthiasc
-
-# Build system
-meson.build             @ebassi @nirbheek
-*.py                    @ebassi
-
-# CSS
-gtk/gtkcss*.[ch]        @otte @baedert
-gtk/gtkstyle*.[ch]      @otte @baedert
-
-# Gestures
-gtk/gtkeventcontroller* @carlosg
-gtk/gtkgesture*.[ch]    @carlosg
-
-# GtkFileChooser
-gtk/gtkfilechooser*     @federico
-gtk/gtkfilesystem*      @federico
-gtk/gtkfilefilter*      @federico
-
-# GtkFontChooser
-gtk/gtkfontchooser*     @matthiasc
-
-# Input methods
-gtk/gtkimcontext*       @carlosg
-
-# Media
-gtk/gtkmedia*           @otte
-
-# GSK
-gsk                     @otte @baedert @ebassi
-
-# GL rendering
-gsk/gl                  @baedert @ebassi
-
-# Vulkan rendering
-gsk/vulkan
-
-# Documentation
-docs/                   @ebassi @dboles
-
-# Wayland
-gdk/wayland             @jadahl
-
-# X11
-gdk/x11                 @ofourdan @matthiasc
-
-# Themes
-gtk/themes              @lapoc @jimmac
-
-# Inspector
-gtk/inspector           @otte @matthiasc
--- a/docs/CODING-STYLE
+++ b/docs/CODING-STYLE
@@ -439,91 +439,41 @@ Public headers should never be included directly:
  #error "Only <gtk/gtk.h> can be included directly."
  #endif

-Private headers should include the public header first, if one exists:
-
-  #ifndef __GTK_FOO_PRIVATE_H__
-  #define __GTK_FOO_PRIVATE_H__
-
-  #include "gtkfoo.h"
-
-  ...
-
-  #endif /* __GTK_FOO_PRIVATE_H__ */
-
-All headers should have inclusion guards:
+All headers should have inclusion guards (for internal usage)
+and C++ guards:

  #ifndef __GTK_FOO_H__
  #define __GTK_FOO_H__

-  ...
-
-  #endif /* __GTK_FOO_H__ */
-
-You can also use the "once" pragma instead of the classic pre-processor guard:
-
-  #pragma once
-
-Additionally, public headers should use C++ guards around their declarations:
+  #include <gtk/gtk-bar.h>

  G_BEGIN_DECLS

-  GDK_AVAILABLE_IN_ALL
-  GType         gtk_foo_get_type        (void) G_GNUC_CONST;
-
-  GDK_AVAILABLE_IN_ALL
-  GtkWidget *   gtk_foo_new             (void);
-
  ...

  G_END_DECLS

+  #endif /* __GTK_FOO_H__ */
+
 + Includes

-GTK+ source files must never include the global gtk.h header; instead, it
-should include the individual headers that are needed.
-
-Every source file must include config.h first, followed by the header matching
-the source file, either the public installed header, or the private header, if
-it exists.
+GTK+ source files should never include the global gtk.h header, but
+instead include the individual headers that are needed. Every file must
+include config.h first, then its own header, then other GTK+ headers
+that it needs, then system and third-party headers that it needs.

+  /* valid */
  #include "config.h"

  #include "gtkfoo.h"

-Source files should then include project headers, in alphabetical order,
-starting from headers in the current directory; then headers in
-sub-directories; and, finally, in paths relative to the top-level
-directory:
-
-  #include "config.h"
-
-  #include "gtkfooprivate.h"
-
-  #include "gtkbutton.h"
  #include "gtkwidget.h"
+  #include "gtkbutton.h"

-  #include "a11y/gtkwidgetaccessible.h"
+  ...

-  #include "gdk/gdkwindowprivate.h"
-
-Finally, source files should include the system headers last:
-
-  #include "config.h"
-
-  #include "gtkbarprivate.h"
-
-  #include "gtkcontainerprivate.h"
-
-  #include "a11y/gtkcontaineraccessible.h"
-  #include "a11y/gtkwidgetaccessible.h"
-
-  #include "gdk/gdkwindowprivate.h"
-
-  #include <graphene.h>
  #include <string.h>

-Cyclic dependencies should be avoided if at all possible; for instance, you
-could use additional headers to break cycles.

 + GObject

@@ -534,6 +484,7 @@ Typedef declarations should be placed at the beginning of the file:

  typedef struct _GtkFoo          GtkFoo;
  typedef struct _GtkFooClass     GtkFooClass;
+  typedef struct _GtkFooPrivate   GtkFooPrivate;

 This includes enumeration types:

@@ -548,21 +499,26 @@ And callback types:
  typedef void (* GtkCallback) (GtkWidget *widget,
                                gpointer   user_data);

-Instance structures should only contain the parent type:
+Instance structures should only contain the parent type, and optionally a
+pointer to a private data structure, and they should be annotated as
+"private" using the gtk-doc trigraph:

  struct _GtkFoo
  {
+    /*< private >*/
    GtkWidget parent_instance;
+
+    GtkFooPrivate *priv;
  };

-You should use the G_DECLARE_DERIVABLE_TYPE() and G_DECLARE_FINAL_TYPE()
-macros in newly written headers.
+The private data pointer is optional and should be omitted in newly
+written classes.

-Inside your source file, always use the G_DEFINE_TYPE(),
-G_DEFINE_TYPE_WITH_PRIVATE(), and G_DEFINE_TYPE_WITH_CODE() macros, or their
-abstract variants G_DEFINE_ABSTRACT_TYPE(),
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(), and G_DEFINE_ABSTRACT_TYPE_WITH_CODE();
-also, use the similar macros for defining interfaces, quarks, and boxed types.
+Always use the G_DEFINE_TYPE(), G_DEFINE_TYPE_WITH_PRIVATE(), and
+G_DEFINE_TYPE_WITH_CODE() macros, or their abstract variants
+G_DEFINE_ABSTRACT_TYPE(), G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(), and
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE(); also, use the similar macros for
+defining interfaces and boxed types.

 All the properties should be stored inside the private data structure, which
 is defined inside the source file - or, if needed, inside a private header
@@ -570,14 +526,14 @@ file; the private header filename must end with "private.h" and must not be
 installed.

 The private data structure should only be accessed internally either using the
-pointer inside the instance structure, for legacy code, or the generated
+pointer inside the instance structure, if one is available, or the generated
 instance private data getter function for your type. You should never use the
 G_TYPE_INSTANCE_GET_PRIVATE() macro or the g_type_instance_get_private()
 function.

 Interface types should always have the dummy typedef for cast purposes:

-        typedef struct _GtkFoo                  GtkFoo;
+        typedef struct _GtkFoo              GtkFoo;

 The interface structure should have "Interface" postfixed to the dummy typedef:

@@ -608,16 +564,19 @@ Inline functions are usually preferable to private macros.

 Public macros should not be used unless they evaluate to a constant.

-+ Symbol visibility
+ Public API

-Any symbol that is not explicitly annotated using a GDK_AVAILABLE_IN_*
-macro is considered internal, and not exported in the shared library.
-
-Never export variables as public API, since this is cumbersome on some
+Avoid exporting variables as public API, since this is cumbersome on some
 platforms. It is always preferable to add getters and setters instead.

+All public functions must be listed in the gtk.symbols file.
+
+ Private API
+
 Non-exported functions that are needed in more than one source file
-should be declared in a private header file.
+should be named "_gtk_...", and declared in a private header file.
+
+Underscore-prefixed functions are never exported.

 Non-exported functions that are only needed in one source file
 should be declared static.
@@ -679,4 +638,4 @@ of tabs, etc.

 It is ok to update the style of a code block or function when you
 are touching it anyway, but sweeping whitespace changes obscure the
-source revision history, and should be avoided.
+git history and should be avoided.
--- a/docs/developers.txt
+++ b/docs/developers.txt
@@ -26,13 +26,13 @@ Refer to the file widget_system.txt which covers widget flags and the
 resulting invariants in a detailed way.


-GdkSurface pointers may be NULL in GdkEvents
+GdkWindow pointers may be NULL in GdkEvents
 -------------------------------------------

 The notification nature of the signal mechanism might cause events to
-be emitted that have their GdkSurface pointer set to NULL.
+be emitted that have their GdkWindow pointer set to NULL.
 This is due to the fact that certain events need to be emitted after the
-real GdkSurface of a widget is not any longer pertinent.
+real GdkWindow of a widget is not any longer pertinent.
 It's up to the signal handling function (application) to check for the
 window field of the event structure to be != NULL, if it is going to
 perform any operations through Gdk calls on it.
@@ -43,7 +43,7 @@ GDK_SELECTION_CLEAR     GtkWidget::selection_clear_event
 GDK_FOCUS_CHANGE        GtkWidget::focus_in_event
                        GtkWidget::focus_out_event

-Events that are assured to have a valid GdkEvent.any.surface field are
+Events that are assured to have a valid GdkEvent.any.window field are

 GDK_EXPOSE		GtkWidget::expose_event

@@ -51,10 +51,10 @@ GDK_EXPOSE		GtkWidget::expose_event
 Writing Gdk functions
 ---------------------

-When writing Gdk functions that operate on GdkSurface structures in any
-meaningful sense, that is casting to a GdkSurfacePrivate structure for
-access to fields other then GdkSurface.user_data, the programmer is
-recommended to check for the GdkSurfacePrivate.destroyed field to be ==
-FALSE, especially if the GdkSurfacePrivate.xwindow field is used.
+When writing Gdk functions that operate on GdkWindow structures in any
+meaningful sense, that is casting to a GdkWindowPrivate structure for
+access to fields other then GdkWindow.user_data, the programmer is
+recommended to check for the GdkWindowPrivate.destroyed field to be ==
+FALSE, especially if the GdkWindowPrivate.xwindow field is used.
 Silent abortion of the Gdk function is the correct behaviour if this
 condition isn't met.
--- a/docs/dnd_internals.txt
+++ b/docs/dnd_internals.txt
@@ -81,19 +81,19 @@ GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);

 /* Source side */

-GdkDragContext * gdk_drag_begin      (GdkSurface      *window,
+GdkDragContext * gdk_drag_begin      (GdkWindow      *window,
 				      GList          *targets,
 				      GdkDragAction   actions);
 gboolean         gdk_drag_get_protocol (guint32          xid,
 					GdkDragProtocol *protocol);
 void             gdk_drag_find_window (GdkDragContext   *context,
-				       GdkSurface       *drag_surface,
+				       GdkWindow       *drag_window,
 			 	       gint             x_root,
 				       gint             y_root,
-				       GdkSurface      **dest_surface,
+				       GdkWindow      **dest_window,
 				       GdkDragProtocol *protocol);
 gboolean        gdk_drag_motion      (GdkDragContext *context,
-				      GdkSurface      *dest_surface,
+				      GdkWindow      *dest_window,
 				      GdkDragProtocol protocol,
 				      gint            x_root, 
 				      gint            y_root,
--- a/docs/reference/gdk/gdk4-docs.xml
+++ b/docs/reference/gdk/gdk4-docs.xml
@@ -45,6 +45,7 @@
    <xi:include href="xml/gdkcontentserializer.xml" />
    <xi:include href="xml/gdkcontentdeserializer.xml" />
    <xi:include href="xml/properties.xml" />
+    <xi:include href="xml/threads.xml" />
    <xi:include href="xml/gdkapplaunchcontext.xml" />
    <xi:include href="xml/pixbufs.xml" />
    <xi:include href="xml/pango_interaction.xml" />
@@ -61,6 +62,54 @@
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
+  <index id="api-index-3-0" role="3.0">
+    <title>Index of new symbols in 3.0</title>
+    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-2" role="3.2">
+    <title>Index of new symbols in 3.2</title>
+    <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-4" role="3.4">
+    <title>Index of new symbols in 3.4</title>
+    <xi:include href="xml/api-index-3.4.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-6" role="3.6">
+    <title>Index of new symbols in 3.6</title>
+    <xi:include href="xml/api-index-3.6.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-8" role="3.8">
+    <title>Index of new symbols in 3.8</title>
+    <xi:include href="xml/api-index-3.8.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-10" role="3.10">
+    <title>Index of new symbols in 3.10</title>
+    <xi:include href="xml/api-index-3.10.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-12" role="3.12">
+    <title>Index of new symbols in 3.12</title>
+    <xi:include href="xml/api-index-3.12.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-14" role="3.14">
+    <title>Index of new symbols in 3.14</title>
+    <xi:include href="xml/api-index-3.14.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-16" role="3.16">
+    <title>Index of new symbols in 3.16</title>
+    <xi:include href="xml/api-index-3.16.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-18" role="3.18">
+    <title>Index of new symbols in 3.18</title>
+    <xi:include href="xml/api-index-3.18.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-20" role="3.20">
+    <title>Index of new symbols in 3.20</title>
+    <xi:include href="xml/api-index-3.20.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-22" role="3.22">
+    <title>Index of new symbols in 3.22</title>
+    <xi:include href="xml/api-index-3.22.xml"><xi:fallback /></xi:include>
+  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -12,7 +12,21 @@ GDK_WINDOWING_QUARTZ
 GDK_WINDOWING_WAYLAND

 <SUBSECTION>
-GDK_VERSION_4_0
+GDK_VERSION_3_0
+GDK_VERSION_3_2
+GDK_VERSION_3_4
+GDK_VERSION_3_6
+GDK_VERSION_3_8
+GDK_VERSION_3_10
+GDK_VERSION_3_12
+GDK_VERSION_3_14
+GDK_VERSION_3_16
+GDK_VERSION_3_18
+GDK_VERSION_3_20
+GDK_VERSION_3_22
+GDK_VERSION_3_90
+GDK_VERSION_3_92
+GDK_VERSION_3_94
 GDK_VERSION_MIN_REQUIRED
 GDK_VERSION_MAX_ALLOWED
 GDK_DISABLE_DEPRECATION_WARNINGS
@@ -47,21 +61,57 @@ gdk_scroll_direction_get_type
 gdk_setting_action_get_type
 gdk_status_get_type
 gdk_visibility_state_get_type
-gdk_surface_attributes_type_get_type
-gdk_surface_edge_get_type
-gdk_surface_hints_get_type
-gdk_surface_state_get_type
-gdk_surface_type_get_type
-gdk_surface_type_hint_get_type
+gdk_window_attributes_type_get_type
+gdk_window_edge_get_type
+gdk_window_hints_get_type
+gdk_window_state_get_type
+gdk_window_type_get_type
+gdk_window_type_hint_get_type
 gdk_wm_decoration_get_type
 gdk_wm_function_get_type
-GDK_AVAILABLE_IN_4_0
+GDK_AVAILABLE_IN_3_0
+GDK_AVAILABLE_IN_3_10
+GDK_AVAILABLE_IN_3_12
+GDK_AVAILABLE_IN_3_14
+GDK_AVAILABLE_IN_3_16
+GDK_AVAILABLE_IN_3_18
+GDK_AVAILABLE_IN_3_2
+GDK_AVAILABLE_IN_3_20
+GDK_AVAILABLE_IN_3_22
+GDK_AVAILABLE_IN_3_4
+GDK_AVAILABLE_IN_3_6
+GDK_AVAILABLE_IN_3_8
+GDK_AVAILABLE_IN_3_90
+GDK_AVAILABLE_IN_3_92
+GDK_AVAILABLE_IN_3_94
 GDK_AVAILABLE_IN_ALL
 GDK_UNAVAILABLE
 GDK_DEPRECATED
 GDK_DEPRECATED_FOR
-GDK_DEPRECATED_IN_4_0
-GDK_DEPRECATED_IN_4_0_FOR
+GDK_DEPRECATED_IN_3_0
+GDK_DEPRECATED_IN_3_0_FOR
+GDK_DEPRECATED_IN_3_10
+GDK_DEPRECATED_IN_3_10_FOR
+GDK_DEPRECATED_IN_3_12
+GDK_DEPRECATED_IN_3_12_FOR
+GDK_DEPRECATED_IN_3_14
+GDK_DEPRECATED_IN_3_14_FOR
+GDK_DEPRECATED_IN_3_16
+GDK_DEPRECATED_IN_3_16_FOR
+GDK_DEPRECATED_IN_3_18
+GDK_DEPRECATED_IN_3_18_FOR
+GDK_DEPRECATED_IN_3_2
+GDK_DEPRECATED_IN_3_20
+GDK_DEPRECATED_IN_3_20_FOR
+GDK_DEPRECATED_IN_3_22
+GDK_DEPRECATED_IN_3_22_FOR
+GDK_DEPRECATED_IN_3_2_FOR
+GDK_DEPRECATED_IN_3_4
+GDK_DEPRECATED_IN_3_4_FOR
+GDK_DEPRECATED_IN_3_6
+GDK_DEPRECATED_IN_3_6_FOR
+GDK_DEPRECATED_IN_3_8
+GDK_DEPRECATED_IN_3_8_FOR
 GDK_VERSION_CUR_STABLE
 GDK_VERSION_PREV_STABLE
 </SECTION>
@@ -96,7 +146,7 @@ gdk_display_get_n_monitors
 gdk_display_get_monitor
 gdk_display_get_primary_monitor
 gdk_display_get_monitor_at_point
-gdk_display_get_monitor_at_surface
+gdk_display_get_monitor_at_window
 gdk_display_get_clipboard
 gdk_display_get_primary_clipboard
 gdk_display_get_setting
@@ -169,176 +219,191 @@ gdk_rgba_get_type
 <SECTION>
 <TITLE>Windows</TITLE>
 <FILE>windows</FILE>
-GdkSurface
-GdkSurfaceType
-GdkSurfaceClass
-GdkSurfaceHints
+GdkWindow
+GdkWindowType
+GdkWindowClass
+GdkWindowHints
 GdkGeometry
 GdkGravity
 GdkAnchorHints
-GdkSurfaceEdge
-GdkSurfaceTypeHint
-GdkSurfaceState
-gdk_surface_new_toplevel
-gdk_surface_new_popup
-gdk_surface_new_temp
-gdk_surface_new_child
-gdk_surface_destroy
-gdk_surface_get_surface_type
-gdk_surface_get_display
-gdk_surface_show
-gdk_surface_show_unraised
-gdk_surface_hide
-gdk_surface_is_destroyed
-gdk_surface_is_visible
-gdk_surface_is_viewable
-gdk_surface_is_input_only
-gdk_surface_get_state
-gdk_surface_withdraw
-gdk_surface_iconify
-gdk_surface_deiconify
-gdk_surface_stick
-gdk_surface_unstick
-gdk_surface_maximize
-gdk_surface_unmaximize
-gdk_surface_fullscreen
-gdk_surface_fullscreen_on_monitor
-gdk_surface_unfullscreen
+GdkWindowEdge
+GdkWindowTypeHint
+GdkWindowState
+gdk_window_new_toplevel
+gdk_window_new_popup
+gdk_window_new_temp
+gdk_window_new_child
+gdk_window_destroy
+gdk_window_get_window_type
+gdk_window_get_display
+gdk_window_show
+gdk_window_show_unraised
+gdk_window_hide
+gdk_window_is_destroyed
+gdk_window_is_visible
+gdk_window_is_viewable
+gdk_window_is_input_only
+gdk_window_is_shaped
+gdk_window_get_state
+gdk_window_withdraw
+gdk_window_iconify
+gdk_window_deiconify
+gdk_window_stick
+gdk_window_unstick
+gdk_window_maximize
+gdk_window_unmaximize
+gdk_window_fullscreen
+gdk_window_fullscreen_on_monitor
+gdk_window_unfullscreen
 GdkFullscreenMode
-gdk_surface_get_fullscreen_mode
-gdk_surface_set_fullscreen_mode
-gdk_surface_set_keep_above
-gdk_surface_set_keep_below
-gdk_surface_set_opacity
-gdk_surface_set_pass_through
-gdk_surface_get_pass_through
-gdk_surface_move
-gdk_surface_resize
-gdk_surface_move_resize
-gdk_surface_has_native
-gdk_surface_raise
-gdk_surface_lower
-gdk_surface_restack
-gdk_surface_focus
-gdk_surface_register_dnd
-gdk_surface_begin_resize_drag
-gdk_surface_begin_resize_drag_for_device
-gdk_surface_begin_move_drag
-gdk_surface_begin_move_drag_for_device
-gdk_surface_show_window_menu
-gdk_surface_constrain_size
-gdk_surface_beep
-gdk_surface_get_scale_factor
-gdk_surface_set_opaque_region
-gdk_surface_create_gl_context
-gdk_surface_create_vulkan_context
+gdk_window_get_fullscreen_mode
+gdk_window_set_fullscreen_mode
+gdk_window_set_keep_above
+gdk_window_set_keep_below
+gdk_window_set_opacity
+gdk_window_set_pass_through
+gdk_window_get_pass_through
+gdk_window_move
+gdk_window_resize
+gdk_window_move_resize
+gdk_window_scroll
+gdk_window_move_region
+gdk_window_has_native
+gdk_window_raise
+gdk_window_lower
+gdk_window_restack
+gdk_window_focus
+gdk_window_register_dnd
+gdk_window_begin_resize_drag
+gdk_window_begin_resize_drag_for_device
+gdk_window_begin_move_drag
+gdk_window_begin_move_drag_for_device
+gdk_window_show_window_menu
+gdk_window_constrain_size
+gdk_window_beep
+gdk_window_get_scale_factor
+gdk_window_set_opaque_region
+gdk_window_create_gl_context
+gdk_window_create_vulkan_context

 <SUBSECTION>
-gdk_surface_begin_draw_frame
-gdk_surface_end_draw_frame
+gdk_window_get_clip_region
+gdk_window_begin_draw_frame
+gdk_window_end_draw_frame
+gdk_window_get_visible_region

 <SUBSECTION>
-gdk_surface_invalidate_rect
-gdk_surface_invalidate_region
-gdk_surface_queue_expose
-gdk_surface_freeze_updates
-gdk_surface_thaw_updates
-gdk_surface_get_frame_clock
+gdk_window_invalidate_rect
+gdk_window_invalidate_region
+GdkWindowChildFunc
+gdk_window_invalidate_maybe_recurse
+gdk_window_get_update_area
+gdk_window_freeze_updates
+gdk_window_thaw_updates
+gdk_window_get_frame_clock

 <SUBSECTION>
-gdk_surface_set_user_data
-gdk_surface_set_accept_focus
-gdk_surface_get_accept_focus
-gdk_surface_set_focus_on_map
-gdk_surface_get_focus_on_map
-gdk_surface_input_shape_combine_region
-gdk_surface_set_child_input_shapes
-gdk_surface_merge_child_input_shapes
-gdk_surface_set_title
+gdk_window_set_user_data
+gdk_window_set_accept_focus
+gdk_window_get_accept_focus
+gdk_window_set_focus_on_map
+gdk_window_get_focus_on_map
+gdk_window_add_filter
+gdk_window_remove_filter
+GdkFilterFunc
+GdkFilterReturn
+GdkXEvent
+gdk_window_shape_combine_region
+gdk_window_set_child_shapes
+gdk_window_merge_child_shapes
+gdk_window_input_shape_combine_region
+gdk_window_set_child_input_shapes
+gdk_window_merge_child_input_shapes
+gdk_window_set_title
 GDK_PARENT_RELATIVE
-gdk_surface_set_cursor
-gdk_surface_get_cursor
-gdk_surface_get_user_data
-gdk_surface_get_geometry
-gdk_surface_set_geometry_hints
-gdk_surface_get_width
-gdk_surface_get_height
-gdk_surface_set_icon_list
-gdk_surface_set_modal_hint
-gdk_surface_get_modal_hint
-gdk_surface_set_type_hint
-gdk_surface_get_type_hint
-gdk_surface_set_shadow_width
-gdk_surface_set_skip_taskbar_hint
-gdk_surface_set_skip_pager_hint
-gdk_surface_set_urgency_hint
-gdk_surface_get_position
-gdk_surface_get_root_origin
-gdk_surface_get_frame_extents
-gdk_surface_get_origin
-gdk_surface_get_root_coords
-gdk_surface_get_device_position
-gdk_surface_get_device_position_double
+gdk_window_set_cursor
+gdk_window_get_cursor
+gdk_window_get_user_data
+gdk_window_get_geometry
+gdk_window_set_geometry_hints
+gdk_window_get_width
+gdk_window_get_height
+gdk_window_set_icon_list
+gdk_window_set_modal_hint
+gdk_window_get_modal_hint
+gdk_window_set_type_hint
+gdk_window_get_type_hint
+gdk_window_set_shadow_width
+gdk_window_set_skip_taskbar_hint
+gdk_window_set_skip_pager_hint
+gdk_window_set_urgency_hint
+gdk_window_get_position
+gdk_window_get_root_origin
+gdk_window_get_frame_extents
+gdk_window_get_origin
+gdk_window_get_root_coords
+gdk_window_get_device_position
+gdk_window_get_device_position_double
 GdkModifierType
 GdkModifierIntent
-gdk_surface_get_parent
-gdk_surface_get_toplevel
-gdk_surface_get_children
-gdk_surface_get_children_with_user_data
-gdk_surface_peek_children
-gdk_surface_get_events
-gdk_surface_set_events
-gdk_surface_set_icon_name
-gdk_surface_set_transient_for
-gdk_surface_set_role
-gdk_surface_set_startup_id
-gdk_surface_set_group
-gdk_surface_get_group
-gdk_surface_set_decorations
-gdk_surface_get_decorations
+gdk_window_get_parent
+gdk_window_get_toplevel
+gdk_window_get_children
+gdk_window_get_children_with_user_data
+gdk_window_peek_children
+gdk_window_get_events
+gdk_window_set_events
+gdk_window_set_icon_name
+gdk_window_set_transient_for
+gdk_window_set_role
+gdk_window_set_startup_id
+gdk_window_set_group
+gdk_window_get_group
+gdk_window_set_decorations
+gdk_window_get_decorations
 GdkWMDecoration
-gdk_surface_set_functions
+gdk_window_set_functions
 GdkWMFunction

 <SUBSECTION>
-gdk_surface_get_support_multidevice
-gdk_surface_set_support_multidevice
-gdk_surface_get_device_cursor
-gdk_surface_set_device_cursor
-gdk_surface_get_device_events
-gdk_surface_set_device_events
+gdk_window_get_support_multidevice
+gdk_window_set_support_multidevice
+gdk_window_get_device_cursor
+gdk_window_set_device_cursor
+gdk_window_get_device_events
+gdk_window_set_device_events

 <SUBSECTION>
-gdk_surface_coords_from_parent
-gdk_surface_coords_to_parent
+gdk_window_coords_from_parent
+gdk_window_coords_to_parent

 <SUBSECTION Standard>
-GDK_SURFACE
-GDK_SURFACE_GET_CLASS
-GDK_TYPE_SURFACE
-GDK_IS_SURFACE
-GDK_SURFACE_CLASS
-GDK_IS_SURFACE_CLASS
+GDK_WINDOW
+GDK_WINDOW_GET_CLASS
+GDK_TYPE_WINDOW
+GDK_IS_WINDOW
+GDK_WINDOW_CLASS
+GDK_IS_WINDOW_CLASS
 GDK_TYPE_FILTER_RETURN
 GDK_TYPE_GRAVITY
 GDK_TYPE_MODIFIER_TYPE
-GDK_TYPE_SURFACE_ATTRIBUTES_TYPE
-GDK_TYPE_SURFACE_EDGE
-GDK_TYPE_SURFACE_HINTS
-GDK_TYPE_SURFACE_TYPE
-GDK_TYPE_SURFACE_TYPE_HINT
+GDK_TYPE_WINDOW_ATTRIBUTES_TYPE
+GDK_TYPE_WINDOW_EDGE
+GDK_TYPE_WINDOW_HINTS
+GDK_TYPE_WINDOW_TYPE
+GDK_TYPE_WINDOW_TYPE_HINT
 GDK_TYPE_WM_DECORATION
 GDK_TYPE_WM_FUNCTION
-GDK_TYPE_SURFACE_STATE
+GDK_TYPE_WINDOW_STATE

 <SUBSECTION Private>
-gdk_surface_get_type
-gdk_surface_window_class_get_type
-GdkSurfaceClass
-GdkSurfaceImpl
-GdkSurfaceImplClass
-GdkSurfaceRedirect
-gdk_surface_impl_get_type
+gdk_window_get_type
+gdk_window_window_class_get_type
+GdkWindowClass
+GdkWindowImpl
+GdkWindowImplClass
+GdkWindowRedirect
+gdk_window_impl_get_type
 gdk_fullscreen_mode_get_type
 </SECTION>

@@ -373,16 +438,11 @@ gdk_content_formats_union_deserialize_mime_types
 <SUBSECTION>
 GdkContentFormatsBuilder
 gdk_content_formats_builder_new
-gdk_content_formats_builder_free_to_formats
+gdk_content_formats_builder_free
 gdk_content_formats_builder_add_formats
 gdk_content_formats_builder_add_gtype
 gdk_content_formats_builder_add_mime_type

-<SUBSECTION>
-gdk_content_formats_builder_ref
-gdk_content_formats_builder_unref
-gdk_content_formats_builder_to_formats
-
 <SUBSECTION Private>
 GDK_TYPE_FILE_LIST
 gdk_file_list_get_type
@@ -407,13 +467,16 @@ gdk_pango_layout_line_get_clip_region
 <SECTION>
 <TITLE>Cairo Interaction</TITLE>
 <FILE>cairo_interaction</FILE>
-gdk_surface_create_similar_surface
+gdk_window_create_similar_surface
+gdk_window_create_similar_image_surface
 gdk_cairo_get_clip_rectangle
+gdk_cairo_get_drawing_context
 gdk_cairo_set_source_rgba
 gdk_cairo_set_source_pixbuf
 gdk_cairo_rectangle
 gdk_cairo_region
 gdk_cairo_region_create_from_surface
+gdk_cairo_surface_create_from_pixbuf
 gdk_cairo_draw_from_gl
 gdk_cairo_surface_upload_to_gl
 </SECTION>
@@ -434,6 +497,22 @@ gdk_rectangle_contains_point
 gdk_rectangle_get_type
 </SECTION>

+<SECTION>
+<TITLE>Threads</TITLE>
+<FILE>threads</FILE>
+GDK_THREADS_ENTER
+GDK_THREADS_LEAVE
+gdk_threads_init
+gdk_threads_enter
+gdk_threads_leave
+gdk_threads_add_idle
+gdk_threads_add_idle_full
+gdk_threads_add_timeout
+gdk_threads_add_timeout_full
+gdk_threads_add_timeout_seconds
+gdk_threads_add_timeout_seconds_full
+</SECTION>
+
 <SECTION>
 <TITLE>Keyboard Handling</TITLE>
 <FILE>keys</FILE>
@@ -523,15 +602,15 @@ gdk_device_ungrab
 gdk_device_get_state
 gdk_device_get_position
 gdk_device_get_position_double
-gdk_device_get_surface_at_position
-gdk_device_get_surface_at_position_double
+gdk_device_get_window_at_position
+gdk_device_get_window_at_position_double
 gdk_device_get_history
 gdk_device_free_history
 GdkTimeCoord
 gdk_device_get_axis
 gdk_device_list_axes
 gdk_device_get_axis_value
-gdk_device_get_last_event_surface
+gdk_device_get_last_event_window

 <SUBSECTION>
 gdk_device_tool_get_serial
@@ -644,7 +723,7 @@ gdk_event_get_scroll_deltas
 gdk_event_is_scroll_stop_event
 gdk_event_get_state
 gdk_event_get_time
-gdk_event_get_surface
+gdk_event_get_window
 gdk_event_get_event_type
 GdkEventSequence
 gdk_event_get_event_sequence
@@ -660,7 +739,7 @@ gdk_event_get_crossing_mode
 gdk_event_get_drag_context
 gdk_event_get_focus_in
 gdk_event_get_grab_window
-gdk_event_get_motion_history
+gdk_event_get_history
 gdk_event_get_key_group
 gdk_event_get_key_is_modifier
 gdk_event_get_pad_axis_value
@@ -701,38 +780,17 @@ GDK_IS_EVENT
 gdk_event_get_type
 </SECTION>

-<SECTION>
-<TITLE>Paintable</TITLE>
-<FILE>paintable</FILE>
-GdkPaintable
-gdk_paintable_snapshot
-gdk_paintable_get_current_image
-gdk_paintable_get_flags
-gdk_paintable_get_intrinsic_width
-gdk_paintable_get_intrinsic_height
-gdk_paintable_get_intrinsic_aspect_ratio
-gdk_paintable_compute_concrete_size
-gdk_paintable_invalidate_contents
-gdk_paintable_invalidate_size
-gdk_paintable_new_empty
-<SECTION>
-
 <SECTION>
 <TITLE>Textures</TITLE>
 <FILE>textures</FILE>
 GdkTexture
+gdk_texture_new_for_data
 gdk_texture_new_for_pixbuf
 gdk_texture_new_from_resource
 gdk_texture_new_from_file
 gdk_texture_get_width
 gdk_texture_get_height
 gdk_texture_download
-gdk_texture_save_to_png
-GdkMemoryFormat
-GDK_MEMORY_FORMAT_DEFAULT
-gdk_memory_texture_new
-gdk_gl_texture_new
-gdk_gl_texture_release

 <SUBSECTION Standard>
 GdkTextureClass
@@ -740,16 +798,6 @@ gdk_texture_get_type
 GDK_TYPE_TEXTURE
 GDK_IS_TEXTURE
 GDK_TEXTURE
-GdkGLTextureClass
-gdk_gl_texture_get_type
-GDK_TYPE_GL_TEXTURE
-GDK_IS_GL_TEXTURE
-GDK_GL_TEXTURE
-GdkMemoryTextureClass
-gdk_memory_texture_get_type
-GDK_TYPE_MEMORY_TEXTURE
-GDK_IS_MEMORY_TEXTURE
-GDK_MEMORY_TEXTURE
 </SECTION>

 <SECTION>
@@ -793,9 +841,9 @@ gdk_drag_context_get_suggested_action
 gdk_drag_context_get_selected_action
 gdk_drag_context_get_formats
 gdk_drag_context_get_device
-gdk_drag_context_get_source_surface
-gdk_drag_context_get_dest_surface
-gdk_drag_context_get_drag_surface
+gdk_drag_context_get_source_window
+gdk_drag_context_get_dest_window
+gdk_drag_context_get_drag_window
 gdk_drag_context_set_hotspot

 <SUBSECTION Standard>
@@ -817,7 +865,7 @@ gdk_drag_context_get_type
 <INCLUDE>gdk/gdkx.h</INCLUDE>
 <TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
-GDK_SURFACE_XID
+GDK_WINDOW_XID
 GDK_DISPLAY_XDISPLAY
 GDK_POINTER_TO_XID
 GDK_XID_TO_POINTER
@@ -842,7 +890,7 @@ gdk_x11_display_error_trap_push
 gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_set_cursor_theme
-gdk_x11_display_set_surface_scale
+gdk_x11_display_set_window_scale
 gdk_x11_display_get_glx_version
 gdk_x11_register_standard_event_type
 gdk_x11_screen_get_screen_number
@@ -853,16 +901,17 @@ gdk_x11_screen_lookup_visual
 gdk_x11_screen_supports_net_wm_hint
 gdk_x11_screen_get_number_of_desktops
 gdk_x11_screen_get_current_desktop
-gdk_x11_surface_foreign_new_for_display
-gdk_x11_surface_lookup_for_display
-gdk_x11_surface_get_xid
-gdk_x11_surface_set_theme_variant
-gdk_x11_surface_set_user_time
-gdk_x11_surface_move_to_current_desktop
-gdk_x11_surface_move_to_desktop
-gdk_x11_surface_get_desktop
-gdk_x11_surface_set_utf8_property
-gdk_x11_surface_set_frame_sync_enabled
+gdk_x11_window_foreign_new_for_display
+gdk_x11_window_lookup_for_display
+gdk_x11_window_get_xid
+gdk_x11_window_set_theme_variant
+gdk_x11_window_set_user_time
+gdk_x11_window_move_to_current_desktop
+gdk_x11_window_move_to_desktop
+gdk_x11_window_get_desktop
+gdk_x11_window_set_utf8_property
+gdk_x11_window_set_frame_extents
+gdk_x11_window_set_frame_sync_enabled
 gdk_x11_keymap_get_group_for_state
 gdk_x11_keymap_key_is_modifier
 gdk_x11_visual_get_xvisual
@@ -955,12 +1004,12 @@ GDK_X11_VISUAL_CLASS
 GDK_IS_X11_VISUAL
 GDK_IS_X11_VISUAL_CLASS
 GDK_X11_VISUAL_GET_CLASS
-GDK_TYPE_X11_SURFACE
-GDK_X11_SURFACE
-GDK_X11_SURFACE_CLASS
-GDK_IS_X11_SURFACE
-GDK_IS_X11_SURFACE_CLASS
-GDK_X11_SURFACE_GET_CLASS
+GDK_TYPE_X11_WINDOW
+GDK_X11_WINDOW
+GDK_X11_WINDOW_CLASS
+GDK_IS_X11_WINDOW
+GDK_IS_X11_WINDOW_CLASS
+GDK_X11_WINDOW_GET_CLASS

 <SUBSECTION Private>
 gdk_x11_app_launch_context_get_type
@@ -977,8 +1026,8 @@ gdk_x11_drag_context_get_type
 gdk_x11_keymap_get_type
 gdk_x11_screen_get_type
 gdk_x11_visual_get_type
-gdk_x11_surface_get_type
-gdk_surface_impl_x11_get_type
+gdk_x11_window_get_type
+gdk_window_impl_x11_get_type
 </SECTION>

 <SECTION>
@@ -991,14 +1040,13 @@ gdk_wayland_device_get_wl_pointer
 gdk_wayland_device_get_wl_seat
 gdk_wayland_display_get_wl_compositor
 gdk_wayland_display_get_wl_display
-gdk_wayland_display_query_registry
-gdk_wayland_surface_new_subsurface
-gdk_wayland_surface_get_wl_surface
-gdk_wayland_surface_set_use_custom_surface
-GdkWaylandSurfaceExported
-gdk_wayland_surface_export_handle
-gdk_wayland_surface_unexport_handle
-gdk_wayland_surface_set_transient_for_exported
+gdk_wayland_window_new_subsurface
+gdk_wayland_window_get_wl_surface
+gdk_wayland_window_set_use_custom_surface
+GdkWaylandWindowExported
+gdk_wayland_window_export_handle
+gdk_wayland_window_unexport_handle
+gdk_wayland_window_set_transient_for_exported

 <SUBSECTION Standard>
 GDK_TYPE_WAYLAND_DEVICE
@@ -1019,18 +1067,18 @@ GDK_WAYLAND_DISPLAY_MANAGER_CLASS
 GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS
 GDK_IS_WAYLAND_DISPLAY_MANAGER
 GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS
-GDK_TYPE_WAYLAND_SURFACE
-GDK_WAYLAND_SURFACE
-GDK_WAYLAND_SURFACE_CLASS
-GDK_WAYLAND_SURFACE_GET_CLASS
-GDK_IS_WAYLAND_SURFACE
-GDK_IS_WAYLAND_SURFACE_CLASS
+GDK_TYPE_WAYLAND_WINDOW
+GDK_WAYLAND_WINDOW
+GDK_WAYLAND_WINDOW_CLASS
+GDK_WAYLAND_WINDOW_GET_CLASS
+GDK_IS_WAYLAND_WINDOW
+GDK_IS_WAYLAND_WINDOW_CLASS

 <SUBSECTION Private>
 gdk_wayland_device_get_type
 gdk_wayland_display_get_type
 gdk_wayland_display_manager_get_type
-gdk_wayland_surface_get_type
+gdk_wayland_window_get_type

 </SECTION>

@@ -1105,7 +1153,7 @@ gdk_frame_timings_get_type
 <FILE>gdkdrawcontext</FILE>
 GdkDrawContext
 gdk_draw_context_get_display
-gdk_draw_context_get_surface
+gdk_draw_context_get_window

 <SUBSECTION Standard>
 GDK_DRAW_CONTEXT
@@ -1121,7 +1169,7 @@ gdk_draw_context_get_type
 <FILE>gdkglcontext</FILE>
 GdkGLContext
 gdk_gl_context_get_display
-gdk_gl_context_get_surface
+gdk_gl_context_get_window
 gdk_gl_context_get_shared_context
 gdk_gl_context_get_version

@@ -1186,8 +1234,10 @@ GDK_IS_MONITOR
 <SECTION>
 <FILE>gdkdrawingcontext</FILE>
 GdkDrawingContext
+gdk_drawing_context_get_window
 gdk_drawing_context_get_clip
 gdk_drawing_context_get_cairo_context
+gdk_drawing_context_is_valid
 gdk_drawing_context_get_paint_context

 <SUBSECTION Standard>
--- a/docs/reference/gdk/gdk4.types
+++ b/docs/reference/gdk/gdk4.types
@@ -11,7 +11,7 @@ gdk_gl_context_get_type
 gdk_keymap_get_type
 gdk_monitor_get_type
 gdk_seat_get_type
-gdk_surface_get_type
+gdk_window_get_type
 gdk_content_serializer_get_type
 gdk_content_deserializer_get_type
 gdk_clipboard_get_type
--- a/docs/reference/gsk/gsk4-sections.txt
+++ b/docs/reference/gsk/gsk4-sections.txt
@@ -1,10 +1,12 @@
 <SECTION>
 <FILE>GskRenderer</FILE>
-gsk_renderer_new_for_surface
-gsk_renderer_get_surface
+gsk_renderer_new_for_window
+gsk_renderer_get_window
 gsk_renderer_get_display
 gsk_renderer_realize
 gsk_renderer_unrealize
+gsk_renderer_begin_draw_frame
+gsk_renderer_end_draw_frame
 gsk_renderer_render
 gsk_renderer_render_texture
 <SUBSECTION Standard>
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -293,6 +293,17 @@ How to compile GTK+ itself
        <cmdsynopsis>
          <command>meson</command>
          <sbr/>
+          <group>
+            <arg choice="plain">-Ddisable-modules=true</arg>
+            <arg choice="plain">-Ddisable-modules=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dwith-included-immodules=MODULE1,MODULE2,...</arg>
+            <arg choice="plain">-Dwith-included-immodules=all</arg>
+            <arg choice="plain">-Dwith-included-immodules=none</arg>
+          </group>
+          <sbr/>
          <group>
            <arg choice="plain">-Ddocumentation=true</arg>
            <arg choice="plain">-Ddocumentation=false</arg>
@@ -304,59 +315,75 @@ How to compile GTK+ itself
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dprint-backends=all</arg>
-            <arg choice="plain">-Dprint-backends=none</arg>
-            <arg choice="plain">-Dprint-backends=cups,lpr,...</arg>
+            <arg choice="plain">-Denable-cups-print-backend=yes</arg>
+            <arg choice="plain">-Denable-cups-print-backend=no</arg>
+            <arg choice="plain">-Denable-cups-print-backend=auto</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dcolord=yes</arg>
-            <arg choice="plain">-Dcolord=no</arg>
-            <arg choice="plain">-Dcolord=auto</arg>
+            <arg choice="plain">-Denable-papi-print-backend=yes</arg>
+            <arg choice="plain">-Denable-papi-print-backend=no</arg>
+            <arg choice="plain">-Denable-papi-print-backend=auto</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dvulkan=yes</arg>
-            <arg choice="plain">-Dvulkan=no</arg>
-            <arg choice="plain">-Dvulkan=auto</arg>
+            <arg choice="plain">-Denable-cloudprint-print-backend=yes</arg>
+            <arg choice="plain">-Denable-cloudprint-print-backend=no</arg>
+            <arg choice="plain">-Denable-cloudprint-print-backend=auto</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dx11-backend=true</arg>
-            <arg choice="plain">-Dx11-backend=false</arg>
+            <arg choice="plain">-Denable-test-print-backend=yes</arg>
+            <arg choice="plain">-Denable-test-print-backend=no</arg>
+            <arg choice="plain">-Denable-test-print-backend=auto</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dcloudproviders=true</arg>
-            <arg choice="plain">-Dcloudproviders=false</arg>
+            <arg choice="plain">-Denable-colord=yes</arg>
+            <arg choice="plain">-Denable-colord=no</arg>
+            <arg choice="plain">-Denable-colord=auto</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dxinerama=yes</arg>
-            <arg choice="plain">-Dxinerama=no</arg>
-            <arg choice="plain">-Dxinerama=auto</arg>
+            <arg choice="plain">-Denable-vulkan=yes</arg>
+            <arg choice="plain">-Denable-vulkan=no</arg>
+            <arg choice="plain">-Denable-vulkan=auto</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dwin32-backend=true</arg>
-            <arg choice="plain">-Dwin32-backend=false</arg>
+            <arg choice="plain">-Denable-x11-backend=true</arg>
+            <arg choice="plain">-Denable-x11-backend=false</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dquartz-backend=true</arg>
-            <arg choice="plain">-Dquartz-backend=false</arg>
+            <arg choice="plain">-Denable-xinerama=true</arg>
+            <arg choice="plain">-Denable-xinerama=false</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dbroadway-backend=true</arg>
-            <arg choice="plain">-Dbroadway-backend=false</arg>
+            <arg choice="plain">-Denable-win32-backend=true</arg>
+            <arg choice="plain">-Denable-win32-backend=false</arg>
          </group>
          <sbr/>
          <group>
-            <arg choice="plain">-Dwayland-backend=true</arg>
-            <arg choice="plain">-Dwayland-backend=false</arg>
+            <arg choice="plain">-Denable-quartz-backend=true</arg>
+            <arg choice="plain">-Denable-quartz-backend=false</arg>
          </group>
          <sbr/>
+          <group>
+            <arg choice="plain">-Denable-broadway-backend=true</arg>
+            <arg choice="plain">-Denable-broadway-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Denable-wayland-backend=true</arg>
+            <arg choice="plain">-Denable-wayland-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Denable-mir-backend=true</arg>
+            <arg choice="plain">-Denable-mir-backend=false</arg>
+          </group>
          <group>
            <arg choice="plain">-Dintrospection=true</arg>
            <arg choice="plain">-Dintrospection=false</arg>
@@ -365,7 +392,33 @@ How to compile GTK+ itself
      </para>

      <formalpara>
-        <title><systemitem>xinerama</systemitem></title>
+        <title><systemitem>disable-modules</systemitem></title>
+
+        <para>
+          Normally GTK+ will try to build the input method modules
+          as little shared libraries that are loaded on demand.
+          The <systemitem>disable-modules</systemitem> option
+          indicates that they should all be built statically
+          into the GTK+ library instead. This is useful for
+          people who need to produce statically-linked binaries.
+          If <systemitem>disable-modules</systemitem> is not specified,
+          then the <command>configure</command> script will try to
+          auto-detect whether shared modules work on your system.
+        </para>
+      </formalpara>
+
+      <formalpara>
+        <title><systemitem>with-included-immodules</systemitem></title>
+
+        <para>
+         This option allows you to specify which input method modules you
+         want to include directly into the GTK+ shared library, as opposed
+         to building them as loadable modules.
+        </para>
+      </formalpara>
+
+      <formalpara>
+        <title><systemitem>enable-xinerama</systemitem></title>

        <para>
          By default GTK+ will try to link against the Xinerama libraries
@@ -375,8 +428,8 @@ How to compile GTK+ itself
      </formalpara>

      <formalpara>
-        <title><systemitem>documentation</systemitem> and
-          <systemitem>man-pages</systemitem></title>
+        <title><systemitem>enable-documentation</systemitem> and
+          <systemitem>enable-man-pages</systemitem></title>

        <para>
          The <application>gtk-doc</application> package is
@@ -387,33 +440,38 @@ How to compile GTK+ itself
          <application>gtk-doc</application> installed and
          are modifying GTK+, you may want to enable
          <application>gtk-doc</application> support by passing
-          in <systemitem>documentation</systemitem>.
+          in <systemitem>enable-documentation</systemitem>.
        </para>
        <para>
          Additionally, some tools provided by GTK+ have their own
          manual pages generated using a similar set of dependencies;
          if you have <application>xsltproc</application> then you
-          can generate manual pages by passing <systemitem>man-pages</systemitem>
+          can generate manual pages by passing <systemitem>enable-man-pages</systemitem>
          when configuring the build.
        </para>
      </formalpara>

      <formalpara>
-        <title><systemitem>print-backends</systemitem></title>
+        <title><systemitem>enable-cups-print-backend</systemitem>,
+          <systemitem>enable-papi-print-backend</systemitem>,
+          <systemitem>enable-cloudprint-print-backend</systemitem>, and
+          <systemitem>enable-test-print-backend</systemitem></title>

        <para>
          By default, GTK+ will try to build various print backends if
-          their dependencies are found. This option can be used to
-          explicitly control which print backends should be built.
+          their dependencies are found. These options can be used to
+          explicitly control whether each print backend should be built
+          or not.
        </para>
      </formalpara>

      <formalpara>
-        <title><systemitem>x11-backend</systemitem>,
-          <systemitem>win32-backend</systemitem>,
-          <systemitem>quartz-backend</systemitem>,
-          <systemitem>broadway-backend</systemitem> and
-          <systemitem>wayland-backend</systemitem></title>
+        <title><systemitem>enable-x11-backend</systemitem>,
+          <systemitem>enable-win32-backend</systemitem>,
+          <systemitem>enable-quartz-backend</systemitem>,
+          <systemitem>enable-broadway-backend</systemitem>,
+          <systemitem>enable-wayland-backend</systemitem>, and
+          <systemitem>enable-mir-backend</systemitem></title>

        <para>
          Enable specific backends for GDK.  If none of these options
@@ -438,9 +496,8 @@ How to compile GTK+ itself
      </formalpara>

      <formalpara>
-        <title><systemitem>build-tests</systemitem>,
-               <systemitem>install-tests</systemitem>,
-               <systemitem>demos</systemitem></title>
+        <title><systemitem>build-tests</systemitem>
+          <systemitem>demos</systemitem></title>

        <para>
          By default, GTK+ will build quite a few tests and demos.
--- a/docs/reference/gtk/drawing-model.xml
+++ b/docs/reference/gtk/drawing-model.xml
@@ -90,7 +90,7 @@
        <link linkend="GdkEvent"><structname>GdkEvent</structname></link>
        structures and sends them on to the GTK layer.  In turn, the GTK layer
        finds the widget that corresponds to a particular
-        <classname>GdkSurface</classname> and emits the corresponding event
+        <classname>GdkWindow</classname> and emits the corresponding event
        signals on that widget.
      </para>

@@ -207,17 +207,17 @@
        
      <para>
        Normally, there is only a single cairo context which is used in
-        the entire repaint, rather than one per GdkSurface. This means you
+        the entire repaint, rather than one per GdkWindow. This means you
        have to respect (and not reset) existing clip and transformations
        set on it.
      </para>

      <para>
-        Most widgets, including those that create their own GdkSurfaces have
+        Most widgets, including those that create their own GdkWindows have
        a transparent background, so they draw on top of whatever widgets
        are below them. This was not the case in GTK+ 2 where the theme set
        the background of most widgets to the default background color. (In
-        fact, transparent GdkSurfaces used to be impossible.)
+        fact, transparent GdkWindows used to be impossible.)
      </para>

      <para>
@@ -263,10 +263,10 @@
    <para>
      Two basic functions in GDK form the core of the double-buffering
      mechanism:  <link
-      linkend="gdk_surface_begin_paint_region"><function>gdk_surface_begin_paint_region()</function></link>
+      linkend="gdk_window_begin_paint_region"><function>gdk_window_begin_paint_region()</function></link>
      and <link
-      linkend="gdk_surface_end_paint"><function>gdk_surface_end_paint()</function></link>.
-      The first function tells a <classname>GdkSurface</classname> to
+      linkend="gdk_window_end_paint"><function>gdk_window_end_paint()</function></link>.
+      The first function tells a <classname>GdkWindow</classname> to
      create a temporary off-screen buffer for drawing.  All
      subsequent drawing operations to this window get automatically
      redirected to that buffer.  The second function actually paints
@@ -278,16 +278,16 @@

      <para>
 	It would be inconvenient for all widgets to call
-	<function>gdk_surface_begin_paint_region()</function> and
-	<function>gdk_surface_end_paint()</function> at the beginning
+	<function>gdk_window_begin_paint_region()</function> and
+	<function>gdk_window_end_paint()</function> at the beginning
 	and end of their draw handlers.
      </para>

      <para>
 	To make this easier, GTK+ normally calls
-        <function>gdk_surface_begin_paint_region()</function>
+        <function>gdk_window_begin_paint_region()</function>
        before emitting the #GtkWidget::draw signal, and
-	then it calls <function>gdk_surface_end_paint()</function>
+	then it calls <function>gdk_window_end_paint()</function>
 	after the signal has been emitted. This is convenient for
 	most widgets, as they do not need to worry about creating
 	their own temporary drawing buffers or about calling those
@@ -335,8 +335,8 @@ my_widget_init (MyWidget *widget)
      <para>
 	Even if you turn off double buffering on a widget, you
 	can still call
-	<function>gdk_surface_begin_paint_region()</function> and
-	<function>gdk_surface_end_paint()</function> by hand to use
+	<function>gdk_window_begin_paint_region()</function> and
+	<function>gdk_window_end_paint()</function> by hand to use
 	temporary drawing buffers.
      </para>
    </refsect2>
--- a/docs/reference/gtk/getting_started.xml
+++ b/docs/reference/gtk/getting_started.xml
@@ -333,7 +333,7 @@

    <para>The full, buildable sources for these examples can be found
    in the examples/ directory of the GTK+ source distribution, or
-    <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples">online</ulink> in the GTK+ git repository.
+    <ulink url="https://git.gnome.org/browse/gtk+/tree/examples">online</ulink> in the GTK+ git repository.
    You can build each example separately by using make with the <filename>Makefile.example</filename>
    file. For more information, see the <filename>README</filename> included in the
    examples directory.</para>
@@ -450,13 +450,13 @@ example_app_window_class_init (ExampleAppWindowClass *class)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application2/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application2/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>You may have noticed that we used the <literal>_from_resource(<!-- -->)</literal> variant
-      of the function that sets a template. Now we need to use <ulink url="https://developer.gnome.org/gio/stable/GResource.html">GLib's resource functionality</ulink>
-      to include the ui file in the binary. This is commonly done by listing
-      all resources in a .gresource.xml file, such as this:
+      of the function that sets a template. Now we need to use GLib's resource
+      functionality to include the ui file in the binary. This is commonly
+      done by listing all resources in a .gresource.xml file, such as this:
      </para>

      <informalexample>
@@ -518,7 +518,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application3/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application3/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>Now we revisit the example_app_window_open() function that
@@ -567,7 +567,7 @@ example_app_window_open (ExampleAppWindow *win,

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application3/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application3/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>Note that we did not have to touch the stack switcher
@@ -665,7 +665,7 @@ example_app_class_init (ExampleAppClass *class)

 ...
        </programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application4/exampleapp.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application4/exampleapp.c">full source</ulink>)</para>
      </informalexample>

      <para>Our preferences menu item does not do anything yet,
@@ -731,7 +731,7 @@ example_app_window_init (ExampleAppWindow *win)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application5/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application5/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>The code to connect the font setting is a little more involved,
@@ -780,7 +780,7 @@ preferences_activated (GSimpleAction *action,

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application6/exampleapp.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application6/exampleapp.c">full source</ulink>)</para>
      </informalexample>

      <para>After all this work, our application can now show
@@ -866,7 +866,7 @@ example_app_window_init (ExampleAppWindow *win)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application7/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application7/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>With the search bar, our application now looks like this:</para>
@@ -926,7 +926,7 @@ example_app_window_init (ExampleAppWindow *win)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application8/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application8/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>What our application looks like now:</para>
@@ -989,12 +989,12 @@ example_app_window_init (ExampleAppWindow *win)

 ...
        </programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application9/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application9/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>We also need a function that counts the lines of the currently
      active tab, and updates the @lines label. See the
-      <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples/application9/exampleappwin.c">full source</ulink>
+      <ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application9/exampleappwin.c">full source</ulink>
      if you are interested in the details.</para>

      <para>This brings our example application to this appearance:</para>
--- a/docs/reference/gtk/glossary.xml
+++ b/docs/reference/gtk/glossary.xml
@@ -137,7 +137,7 @@
      <para>
 	This is the step in a <glossterm
 	linkend="widget">widget's</glossterm> life cycle where it
-	actually shows the GdkSurfaces it created when it was
+	actually shows the GdkWindows it created when it was
 	<glossterm linkend="realization">realized</glossterm>.  When a
 	widget is mapped, it must turn on its
 	%GTK_MAPPED <link linkend="GtkWidgetFlags">flag</link>.
@@ -146,7 +146,7 @@
      <para>
 	Note that due to the asynchronous nature of the X window
 	system, a widget's window may not appear on the screen
-	immediatly after one calls gdk_surface_show():
+	immediatly after one calls gdk_window_show():
 	you must wait for the corresponding map <glossterm
 	linkend="event">event</glossterm> to be received.  You can do
 	this with the <link
@@ -193,10 +193,10 @@
    <glossterm>no-window widget</glossterm>
    <glossdef>
      <para>
-	A widget that does not have a GdkSurface of its own on which to
+	A widget that does not have a GdkWindow of its own on which to
 	draw its contents, but rather shares its <glossterm
 	linkend="parent">parent's</glossterm>.  This can be tested with
-	the gtk_widget_get_has_surface() function.
+	the gtk_widget_get_has_window() function.
      </para>
    </glossdef>
  </glossentry>
@@ -218,20 +218,20 @@
      <para>
 	This is the step in a <glossterm
 	linkend="widget">widget's</glossterm> life cycle where it
-	creates its own GdkSurface, or otherwise associates itself with
+	creates its own GdkWindow, or otherwise associates itself with
 	its <glossterm linkend="parent">parent's</glossterm>
-	GdkSurface.  If the widget has its own window, then it must
+	GdkWindow.  If the widget has its own window, then it must
 	also attach a <glossterm linkend="style">style</glossterm> to
 	it.  A widget becomes unrealized by destroying its associated
-	GdkSurface.  When a widget is realized, it must turn on its
+	GdkWindow.  When a widget is realized, it must turn on its
 	%GTK_REALIZED <link linkend="GtkWidgetFlags">flag</link>.
      </para>

      <para>
-	Widgets that don't own the GdkSurface on which they draw are
+	Widgets that don't own the GdkWindow on which they draw are
 	called <glossterm linkend="no-window">no-window widgets</glossterm>.  
-        This can be tested with the gtk_widget_get_has_surface() function.  Normally,
-        these widgets draw on their parent's GdkSurface.
+        This can be tested with the gtk_widget_get_has_window() function.  Normally,
+        these widgets draw on their parent's GdkWindow.
      </para>

      <para>
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -183,6 +183,8 @@
      <xi:include href="xml/gtktoolshell.xml" />
      <xi:include href="xml/gtktoolbar.xml" />
      <xi:include href="xml/gtktoolitem.xml" />
+      <xi:include href="xml/gtktoolpalette.xml" />
+      <xi:include href="xml/gtktoolitemgroup.xml" />
      <xi:include href="xml/gtkseparatortoolitem.xml" />
      <xi:include href="xml/gtktoolbutton.xml" />
      <xi:include href="xml/gtkmenutoolbutton.xml" />
@@ -208,6 +210,7 @@
      <xi:include href="xml/gtkfontbutton.xml" />
      <xi:include href="xml/gtkfontchooserwidget.xml" />
      <xi:include href="xml/gtkfontchooserdialog.xml" />
+      <xi:include href="xml/gtkplacessidebar.xml" />
    </chapter>

    <chapter id="Ornaments">
@@ -273,6 +276,11 @@
    <chapter id="RecentDocuments">
      <title>Recently Used Documents</title>
      <xi:include href="xml/gtkrecentmanager.xml" />
+      <xi:include href="xml/gtkrecentchooser.xml" />
+      <xi:include href="xml/gtkrecentchooserdialog.xml" />
+      <xi:include href="xml/gtkrecentchoosermenu.xml" />
+      <xi:include href="xml/gtkrecentchooserwidget.xml" />
+      <xi:include href="xml/gtkrecentfilter.xml" />
    </chapter>

    <chapter id="ApplicationChoosing">
@@ -351,6 +359,7 @@
    <xi:include href="gtk4-demo-application.xml" />
    <xi:include href="gtk4-widget-factory.xml" />
    <xi:include href="gtk4-icon-browser.xml" />
+    <xi:include href="gtk4-query-immodules.xml" />
    <xi:include href="gtk4-update-icon-cache.xml" />
    <xi:include href="gtk4-encode-symbolic-svg.xml" />
    <xi:include href="gtk4-builder-tool.xml" />
@@ -382,6 +391,58 @@
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
+  <index id="api-index-3-0" role="3.0">
+    <title>Index of new symbols in 3.0</title>
+    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-2" role="3.2">
+    <title>Index of new symbols in 3.2</title>
+    <xi:include href="xml/api-index-3.2.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-4" role="3.4">
+    <title>Index of new symbols in 3.4</title>
+    <xi:include href="xml/api-index-3.4.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-6" role="3.6">
+    <title>Index of new symbols in 3.6</title>
+    <xi:include href="xml/api-index-3.6.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-8" role="3.8">
+    <title>Index of new symbols in 3.8</title>
+    <xi:include href="xml/api-index-3.8.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-10" role="3.10">
+    <title>Index of new symbols in 3.10</title>
+    <xi:include href="xml/api-index-3.10.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-12" role="3.12">
+    <title>Index of new symbols in 3.12</title>
+    <xi:include href="xml/api-index-3.12.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-14" role="3.14">
+    <title>Index of new symbols in 3.14</title>
+    <xi:include href="xml/api-index-3.14.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-16" role="3.16">
+    <title>Index of new symbols in 3.16</title>
+    <xi:include href="xml/api-index-3.16.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-18" role="3.18">
+    <title>Index of new symbols in 3.18</title>
+    <xi:include href="xml/api-index-3.18.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-20" role="3.20">
+    <title>Index of new symbols in 3.20</title>
+    <xi:include href="xml/api-index-3.20.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-22" role="3.22">
+    <title>Index of new symbols in 3.22</title>
+    <xi:include href="xml/api-index-3.22.xml"><xi:fallback /></xi:include>
+  </index>
+  <index id="api-index-3-90" role="3.90">
+    <title>Index of new symbols in 3.90</title>
+    <xi:include href="xml/api-index-3.90.xml"><xi:fallback /></xi:include>
+  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

--- a/docs/reference/gtk/gtk4-query-immodules.xml
+++ b/docs/reference/gtk/gtk4-query-immodules.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gtk4-query-immodules">
+
+<refentryinfo>
+  <title>gtk4-query-immodules</title>
+  <productname>GTK+</productname>
+  <authorgroup>
+    <author>
+      <contrib>Developer</contrib>
+      <firstname>Matthias</firstname>
+      <surname>Clasen</surname>
+    </author>
+  </authorgroup>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>gtk4-query-immodules</refentrytitle>
+  <manvolnum>1</manvolnum>
+  <refmiscinfo class="manual">User Commands</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+  <refname>gtk4-query-immodules</refname>
+  <refpurpose>Input method module registration utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk4-query-immodules</command>
+<arg choice="opt">--update-cache</arg>
+<arg choice="opt" rep="repeat">MODULE</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk4-query-immodules</command> collects information about loadable
+input method modules for GTK+ and writes it to the default cache file
+location, or to <filename>stdout</filename>.
+</para>
+<para>
+If called without arguments, it looks for modules in the GTK+ input method
+module path.
+</para>
+<para>
+If called with arguments, it looks for the specified modules. The arguments
+may be absolute or relative paths.
+</para>
+
+<para>
+Normally, the output of <command>gtk4-query-immodules</command> is written
+to <filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename>,
+where GTK+ looks for it by default. If it is written to some other location,
+the <envar>GTK_IM_MODULE_FILE</envar> environment variable can be set to point
+GTK+ at the file.
+</para>
+</refsect1>
+
+<refsect1><title>Options</title>
+<variablelist>
+  <varlistentry>
+    <term>--update-cache</term>
+    <listitem><para>Write the output to the default cache location instead of
+                    <filename>stdout</filename></para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1><title>Files</title>
+<variablelist>
+  <varlistentry>
+    <term><filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename></term>
+    <listitem><para>The default im cache file used by GTK+ applications</para></listitem>
+  </varlistentry>
+</variablelist>
+
+</refsect1>
+
+<refsect1><title>Environment</title>
+<variablelist>
+  <varlistentry>
+    <term><link linkend="gtk-path"><envar>GTK_PATH</envar></link></term>
+    <listitem><para>Prepends directories to the input method module path</para></listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link></term>
+    <listitem><para>Specifies an alternative im module cache for GTK+
+    applications</para></listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+</refentry>
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -902,6 +902,8 @@ gtk_entry_set_attributes
 gtk_entry_get_attributes
 gtk_entry_set_completion
 gtk_entry_get_completion
+gtk_entry_set_cursor_hadjustment
+gtk_entry_get_cursor_hadjustment
 gtk_entry_set_progress_fraction
 gtk_entry_get_progress_fraction
 gtk_entry_set_progress_pulse_step
@@ -912,11 +914,11 @@ gtk_entry_reset_im_context
 gtk_entry_set_tabs
 gtk_entry_get_tabs
 GtkEntryIconPosition
-gtk_entry_set_icon_from_paintable
+gtk_entry_set_icon_from_texture
 gtk_entry_set_icon_from_icon_name
 gtk_entry_set_icon_from_gicon
 gtk_entry_get_icon_storage_type
-gtk_entry_get_icon_paintable
+gtk_entry_get_icon_texture
 gtk_entry_get_icon_name
 gtk_entry_get_icon_gicon
 gtk_entry_set_icon_activatable
@@ -1044,6 +1046,8 @@ gtk_expander_set_use_markup
 gtk_expander_get_use_markup
 gtk_expander_set_label_widget
 gtk_expander_get_label_widget
+gtk_expander_set_label_fill
+gtk_expander_get_label_fill
 gtk_expander_set_resize_toplevel
 gtk_expander_get_resize_toplevel
 <SUBSECTION Standard>
@@ -1483,6 +1487,7 @@ GtkIconViewPrivate
 <TITLE>GtkImage</TITLE>
 GtkImage
 GtkImageType
+gtk_image_get_surface
 gtk_image_get_texture
 gtk_image_get_icon_name
 gtk_image_get_gicon
@@ -1492,12 +1497,14 @@ gtk_image_new_from_pixbuf
 gtk_image_new_from_icon_name
 gtk_image_new_from_gicon
 gtk_image_new_from_resource
+gtk_image_new_from_surface
 gtk_image_new_from_texture
 gtk_image_set_from_file
 gtk_image_set_from_pixbuf
 gtk_image_set_from_icon_name
 gtk_image_set_from_gicon
 gtk_image_set_from_resource
+gtk_image_set_from_surface
 gtk_image_set_from_texture
 gtk_image_clear
 gtk_image_new
@@ -1505,10 +1512,6 @@ gtk_image_set_pixel_size
 gtk_image_get_pixel_size
 gtk_image_set_icon_size
 gtk_image_get_icon_size
-gtk_image_set_keep_aspect_ratio
-gtk_image_get_keep_aspect_ratio
-gtk_image_set_can_shrink
-gtk_image_get_can_shrink
 <SUBSECTION Standard>
 GTK_IMAGE
 GTK_IS_IMAGE
@@ -1530,6 +1533,7 @@ GtkImageGIconData
 <TITLE>GtkIMContext</TITLE>
 GtkIMContext
 GtkIMContextClass
+GtkIMContextInfo
 gtk_im_context_get_preedit_string
 gtk_im_context_filter_keypress
 gtk_im_context_focus_in
@@ -2175,6 +2179,143 @@ gtk_range_get_type
 GtkRangePrivate
 </SECTION>

+<SECTION>
+<FILE>gtkrecentchooser</FILE>
+<TITLE>GtkRecentChooser</TITLE>
+GtkRecentChooser
+GtkRecentChooserIface
+GTK_RECENT_CHOOSER_ERROR
+GtkRecentChooserError
+gtk_recent_chooser_set_show_private
+gtk_recent_chooser_get_show_private
+gtk_recent_chooser_set_show_not_found
+gtk_recent_chooser_get_show_not_found
+gtk_recent_chooser_set_show_icons
+gtk_recent_chooser_get_show_icons
+gtk_recent_chooser_set_select_multiple
+gtk_recent_chooser_get_select_multiple
+gtk_recent_chooser_set_local_only
+gtk_recent_chooser_get_local_only
+gtk_recent_chooser_set_limit
+gtk_recent_chooser_get_limit
+gtk_recent_chooser_set_show_tips
+gtk_recent_chooser_get_show_tips
+GtkRecentSortType
+gtk_recent_chooser_set_sort_type
+gtk_recent_chooser_get_sort_type
+GtkRecentSortFunc
+gtk_recent_chooser_set_sort_func
+gtk_recent_chooser_set_current_uri
+gtk_recent_chooser_get_current_uri
+gtk_recent_chooser_get_current_item
+gtk_recent_chooser_select_uri
+gtk_recent_chooser_unselect_uri
+gtk_recent_chooser_select_all
+gtk_recent_chooser_unselect_all
+gtk_recent_chooser_get_items
+gtk_recent_chooser_get_uris
+gtk_recent_chooser_add_filter
+gtk_recent_chooser_remove_filter
+gtk_recent_chooser_list_filters
+gtk_recent_chooser_set_filter
+gtk_recent_chooser_get_filter
+<SUBSECTION Standard>
+GTK_RECENT_CHOOSER
+GTK_IS_RECENT_CHOOSER
+GTK_TYPE_RECENT_CHOOSER
+GTK_RECENT_CHOOSER_GET_IFACE
+<SUBSECTION Private>
+gtk_recent_chooser_get_type
+gtk_recent_chooser_error_quark
+</SECTION>
+
+<SECTION>
+<FILE>gtkrecentchooserdialog</FILE>
+<TITLE>GtkRecentChooserDialog</TITLE>
+GtkRecentChooserDialog
+gtk_recent_chooser_dialog_new
+gtk_recent_chooser_dialog_new_for_manager
+<SUBSECTION Standard>
+GTK_RECENT_CHOOSER_DIALOG
+GTK_IS_RECENT_CHOOSER_DIALOG
+GTK_TYPE_RECENT_CHOOSER_DIALOG
+GTK_RECENT_CHOOSER_DIALOG_CLASS
+GTK_IS_RECENT_CHOOSER_DIALOG_CLASS
+GTK_RECENT_CHOOSER_DIALOG_GET_CLASS
+
+<SUBSECTION Private>
+gtk_recent_chooser_dialog_get_type
+GtkRecentChooserDialogPrivate
+</SECTION>
+
+<SECTION>
+<FILE>gtkrecentchoosermenu</FILE>
+<TITLE>GtkRecentChooserMenu</TITLE>
+GtkRecentChooserMenu
+gtk_recent_chooser_menu_new
+gtk_recent_chooser_menu_new_for_manager
+gtk_recent_chooser_menu_get_show_numbers
+gtk_recent_chooser_menu_set_show_numbers
+<SUBSECTION Standard>
+GTK_RECENT_CHOOSER_MENU
+GTK_IS_RECENT_CHOOSER_MENU
+GTK_TYPE_RECENT_CHOOSER_MENU
+GTK_RECENT_CHOOSER_MENU_CLASS
+GTK_IS_RECENT_CHOOSER_MENU_CLASS
+GTK_RECENT_CHOOSER_MENU_GET_CLASS
+
+<SUBSECTION Private>
+gtk_recent_chooser_menu_get_type
+GtkRecentChooserMenuPrivate
+</SECTION>
+
+<SECTION>
+<FILE>gtkrecentchooserwidget</FILE>
+<TITLE>GtkRecentChooserWidget</TITLE>
+GtkRecentChooserWidget
+gtk_recent_chooser_widget_new
+gtk_recent_chooser_widget_new_for_manager
+<SUBSECTION Standard>
+GTK_RECENT_CHOOSER_WIDGET
+GTK_IS_RECENT_CHOOSER_WIDGET
+GTK_TYPE_RECENT_CHOOSER_WIDGET
+GTK_RECENT_CHOOSER_WIDGET_CLASS
+GTK_IS_RECENT_CHOOSER_WIDGET_CLASS
+GTK_RECENT_CHOOSER_WIDGET_GET_CLASS
+
+<SUBSECTION Private>
+gtk_recent_chooser_widget_get_type
+GtkRecentChooserWidgetPrivate
+</SECTION>
+
+<SECTION>
+<FILE>gtkrecentfilter</FILE>
+<TITLE>GtkRecentFilter</TITLE>
+GtkRecentFilter
+GtkRecentFilterInfo
+GtkRecentFilterFlags
+GtkRecentFilterFunc
+gtk_recent_filter_new
+gtk_recent_filter_get_name
+gtk_recent_filter_set_name
+gtk_recent_filter_add_mime_type
+gtk_recent_filter_add_pattern
+gtk_recent_filter_add_pixbuf_formats
+gtk_recent_filter_add_application
+gtk_recent_filter_add_group
+gtk_recent_filter_add_age
+gtk_recent_filter_add_custom
+gtk_recent_filter_get_needed
+gtk_recent_filter_filter
+<SUBSECTION Standard>
+GTK_RECENT_FILTER
+GTK_IS_RECENT_FILTER
+GTK_TYPE_RECENT_FILTER
+
+<SUBSECTION Private>
+gtk_recent_filter_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkrecentmanager</FILE>
 <TITLE>GtkRecentManager</TITLE>
@@ -2397,8 +2538,6 @@ gtk_search_bar_set_search_mode
 gtk_search_bar_get_show_close_button
 gtk_search_bar_set_show_close_button
 gtk_search_bar_handle_event
-gtk_search_bar_set_key_capture_widget
-gtk_search_bar_get_key_capture_widget
 <SUBSECTION Standard>
 GTK_TYPE_SEARCH_BAR
 GTK_SEARCH_BAR
@@ -2416,8 +2555,6 @@ gtk_search_bar_get_type
 GtkSearchEntry
 gtk_search_entry_new
 gtk_search_entry_handle_event
-gtk_search_entry_set_key_capture_widget
-gtk_search_entry_get_key_capture_widget
 <SUBSECTION Standard>
 GTK_TYPE_SEARCH_ENTRY
 GTK_SEARCH_ENTRY
@@ -2911,7 +3048,7 @@ gtk_text_view_get_line_at_y
 gtk_text_view_get_line_yrange
 gtk_text_view_get_iter_at_location
 gtk_text_view_get_iter_at_position
-gtk_text_view_buffer_to_surface_coords
+gtk_text_view_buffer_to_window_coords
 gtk_text_view_window_to_buffer_coords
 gtk_text_view_set_border_window_size
 gtk_text_view_get_border_window_size
@@ -3227,6 +3364,78 @@ gtk_toggle_tool_button_get_type
 GtkToggleToolButtonPrivate
 </SECTION>

+<SECTION>
+<FILE>gtktoolitemgroup</FILE>
+<TITLE>GtkToolItemGroup</TITLE>
+GtkToolItemGroup
+GtkToolItemGroupClass
+gtk_tool_item_group_get_collapsed
+gtk_tool_item_group_get_drop_item
+gtk_tool_item_group_get_ellipsize
+gtk_tool_item_group_get_item_position
+gtk_tool_item_group_get_n_items
+gtk_tool_item_group_get_label
+gtk_tool_item_group_get_label_widget
+gtk_tool_item_group_get_nth_item
+gtk_tool_item_group_get_header_relief
+gtk_tool_item_group_insert
+gtk_tool_item_group_new
+gtk_tool_item_group_set_collapsed
+gtk_tool_item_group_set_ellipsize
+gtk_tool_item_group_set_item_position
+gtk_tool_item_group_set_label
+gtk_tool_item_group_set_label_widget
+gtk_tool_item_group_set_header_relief
+
+<SUBSECTION Standard>
+GTK_TOOL_ITEM_GROUP
+GTK_IS_TOOL_ITEM_GROUP
+GTK_TYPE_TOOL_ITEM_GROUP
+GTK_TOOL_ITEM_GROUP_CLASS
+GTK_IS_TOOL_ITEM_GROUP_CLASS
+GTK_TOOL_ITEM_GROUP_GET_CLASS
+
+<SUBSECTION Private>
+GtkToolItemGroupPrivate
+gtk_tool_item_group_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtktoolpalette</FILE>
+<TITLE>GtkToolPalette</TITLE>
+GtkToolPalette
+GtkToolPaletteClass
+gtk_tool_palette_new
+gtk_tool_palette_get_exclusive
+gtk_tool_palette_set_exclusive
+gtk_tool_palette_get_expand
+gtk_tool_palette_set_expand
+gtk_tool_palette_get_group_position
+gtk_tool_palette_set_group_position
+gtk_tool_palette_get_style
+gtk_tool_palette_set_style
+gtk_tool_palette_unset_style
+gtk_tool_palette_add_drag_dest
+gtk_tool_palette_get_drag_item
+gtk_tool_palette_get_drag_target_group
+gtk_tool_palette_get_drag_target_item
+gtk_tool_palette_get_drop_group
+gtk_tool_palette_get_drop_item
+GtkToolPaletteDragTargets
+gtk_tool_palette_set_drag_source
+
+<SUBSECTION Standard>
+GTK_TOOL_PALETTE
+GTK_IS_TOOL_PALETTE
+GTK_TYPE_TOOL_PALETTE
+GTK_TOOL_PALETTE_CLASS
+GTK_IS_TOOL_PALETTE_CLASS
+GTK_TOOL_PALETTE_GET_CLASS
+<SUBSECTION Private>
+gtk_tool_palette_get_type
+GtkToolPalettePrivate
+</SECTION>
+
 <SECTION>
 <FILE>gtktooltip</FILE>
 <TITLE>GtkTooltip</TITLE>
@@ -4171,15 +4380,6 @@ gtk_volume_button_get_type
 <FILE>gtksnapshot</FILE>
 <TITLE>GtkSnapshot</TITLE>
 GtkSnapshot
-gtk_snapshot_new
-gtk_snapshot_ref
-gtk_snapshot_unref
-gtk_snapshot_to_node
-gtk_snapshot_to_paintable
-gtk_snapshot_free_to_node
-gtk_snapshot_free_to_paintable
-gtk_snapshot_get_renderer
-gtk_snapshot_get_record_names
 gtk_snapshot_push
 gtk_snapshot_push_transform
 gtk_snapshot_push_opacity
@@ -4196,7 +4396,6 @@ gtk_snapshot_append_node
 gtk_snapshot_append_cairo
 gtk_snapshot_append_texture
 gtk_snapshot_append_color
-gtk_snapshot_append_layout
 gtk_snapshot_clips_rect
 gtk_snapshot_render_background
 gtk_snapshot_render_frame
@@ -4205,24 +4404,6 @@ gtk_snapshot_render_layout
 gtk_snapshot_render_insertion_cursor
 </SECTION>

-<SECTION>
-<FILE>gtkwidgetpaintable</FILE>
-<TITLE>GtkWidgetPaintable</TITLE>
-gtk_widget_paintable_new
-gtk_widget_paintable_get_widget
-gtk_widget_paintable_set_widget
-
-<SUBSECTION Standard>
-GTK_WIDGET_PAINTABLE
-GTK_IS_WIDGET_PAINTABLE
-GTK_TYPE_WIDGET_PAINTABLE
-GTK_WIDGET_PAINTABLE_CLASS
-GTK_IS_WIDGET_PAINTABLE_CLASS
-GTK_WIDGET_PAINTABLE_GET_CLASS
-<SUBSECTION Private>
-gtk_widget_paintable_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkwidget</FILE>
 <TITLE>GtkWidget</TITLE>
@@ -4237,11 +4418,13 @@ gtk_widget_in_destruction
 gtk_widget_destroyed
 gtk_widget_unparent
 gtk_widget_show
+gtk_widget_show_now
 gtk_widget_hide
 gtk_widget_map
 gtk_widget_unmap
 gtk_widget_realize
 gtk_widget_unrealize
+gtk_widget_draw
 gtk_widget_queue_draw
 gtk_widget_queue_resize
 gtk_widget_queue_resize_no_redraw
@@ -4267,8 +4450,8 @@ gtk_widget_set_name
 gtk_widget_get_name
 gtk_widget_set_sensitive
 gtk_widget_set_parent
-gtk_widget_set_parent_surface
-gtk_widget_get_parent_surface
+gtk_widget_set_parent_window
+gtk_widget_get_parent_window
 gtk_widget_get_toplevel
 gtk_widget_get_ancestor
 gtk_widget_is_ancestor
@@ -4278,6 +4461,7 @@ GtkTextDirection
 gtk_widget_get_direction
 gtk_widget_set_default_direction
 gtk_widget_get_default_direction
+gtk_widget_shape_combine_region
 gtk_widget_input_shape_combine_region
 gtk_widget_create_pango_context
 gtk_widget_get_pango_context
@@ -4286,6 +4470,8 @@ gtk_widget_get_font_options
 gtk_widget_set_font_map
 gtk_widget_get_font_map
 gtk_widget_create_pango_layout
+gtk_widget_queue_draw_area
+gtk_widget_queue_draw_region
 gtk_widget_get_cursor
 gtk_widget_set_cursor
 gtk_widget_set_cursor_from_name
@@ -4321,9 +4507,9 @@ gtk_widget_set_tooltip_window
 gtk_widget_get_has_tooltip
 gtk_widget_set_has_tooltip
 gtk_widget_trigger_tooltip_query
-gtk_widget_get_surface
-gtk_widget_register_surface
-gtk_widget_unregister_surface
+gtk_widget_get_window
+gtk_widget_register_window
+gtk_widget_unregister_window
 gtk_widget_get_allocated_width
 gtk_widget_get_allocated_height
 gtk_widget_get_allocation
@@ -4331,7 +4517,7 @@ gtk_widget_get_allocated_baseline
 gtk_widget_get_allocated_size
 gtk_widget_get_width
 gtk_widget_get_height
-gtk_widget_compute_bounds
+gtk_widget_get_clip
 gtk_widget_contains
 gtk_widget_pick
 gtk_widget_get_can_default
@@ -4340,8 +4526,8 @@ gtk_widget_get_can_focus
 gtk_widget_set_can_focus
 gtk_widget_get_focus_on_click
 gtk_widget_set_focus_on_click
-gtk_widget_get_has_surface
-gtk_widget_set_has_surface
+gtk_widget_get_has_window
+gtk_widget_set_has_window
 gtk_widget_get_sensitive
 gtk_widget_is_sensitive
 gtk_widget_get_visible
@@ -4356,11 +4542,12 @@ gtk_widget_has_visible_focus
 gtk_widget_has_grab
 gtk_widget_is_drawable
 gtk_widget_is_toplevel
-gtk_widget_set_surface
+gtk_widget_set_window
 gtk_widget_set_receives_default
 gtk_widget_get_receives_default
 gtk_widget_set_support_multidevice
 gtk_widget_get_support_multidevice
+gtk_widget_set_realized
 gtk_widget_get_realized
 gtk_widget_get_mapped
 gtk_widget_device_is_shadowed
@@ -4623,6 +4810,9 @@ gtk_main_iteration
 gtk_main_iteration_do
 gtk_main_do_event

+GtkModuleInitFunc
+GtkModuleDisplayInitFunc
+
 <SUBSECTION>
 gtk_grab_add
 gtk_grab_get_current
@@ -4960,6 +5150,8 @@ gtk_selection_data_set_text
 gtk_selection_data_get_text
 gtk_selection_data_set_pixbuf
 gtk_selection_data_get_pixbuf
+gtk_selection_data_set_surface
+gtk_selection_data_get_surface
 gtk_selection_data_set_texture
 gtk_selection_data_get_texture
 gtk_selection_data_set_uris
@@ -5011,15 +5203,16 @@ gtk_drag_unhighlight
 gtk_drag_begin_with_coordinates
 gtk_drag_cancel
 gtk_drag_set_icon_widget
-gtk_drag_set_icon_paintable
+gtk_drag_set_icon_surface
+gtk_drag_set_icon_texture
 gtk_drag_set_icon_name
 gtk_drag_set_icon_gicon
 gtk_drag_set_icon_default
 gtk_drag_check_threshold
 gtk_drag_source_set
+gtk_drag_source_set_icon_surface
 gtk_drag_source_set_icon_name
 gtk_drag_source_set_icon_gicon
-gtk_drag_source_set_icon_paintable
 gtk_drag_source_unset
 gtk_drag_source_set_target_list
 gtk_drag_source_get_target_list
@@ -5099,6 +5292,7 @@ gtk_icon_theme_lookup_by_gicon
 gtk_icon_theme_lookup_by_gicon_for_scale
 gtk_icon_theme_load_icon
 gtk_icon_theme_load_icon_for_scale
+gtk_icon_theme_load_surface
 gtk_icon_theme_list_contexts
 gtk_icon_theme_list_icons
 gtk_icon_theme_get_icon_sizes
@@ -5109,6 +5303,7 @@ gtk_icon_info_get_base_size
 gtk_icon_info_get_base_scale
 gtk_icon_info_get_filename
 gtk_icon_info_load_icon
+gtk_icon_info_load_surface
 gtk_icon_info_load_texture
 gtk_icon_info_load_icon_async
 gtk_icon_info_load_icon_finish
@@ -5990,8 +6185,6 @@ gtk_overlay_add_overlay
 gtk_overlay_reorder_overlay
 gtk_overlay_get_overlay_pass_through
 gtk_overlay_set_overlay_pass_through
-gtk_overlay_get_measure_overlay
-gtk_overlay_set_measure_overlay

 <SUBSECTION Standard>
 GTK_TYPE_OVERLAY
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -127,6 +127,10 @@ gtk_radio_button_get_type
 gtk_radio_menu_item_get_type
 gtk_radio_tool_button_get_type
 gtk_range_get_type
+gtk_recent_chooser_get_type
+gtk_recent_chooser_dialog_get_type
+gtk_recent_chooser_menu_get_type
+gtk_recent_chooser_widget_get_type
 gtk_recent_manager_get_type
 gtk_revealer_get_type
 gtk_scale_button_get_type
@@ -146,7 +150,6 @@ gtk_shortcuts_section_get_type
 gtk_shortcuts_group_get_type
 gtk_shortcuts_shortcut_get_type
 gtk_size_group_get_type
-gtk_snapshot_get_type
 gtk_spin_button_get_type
 gtk_spinner_get_type
 gtk_stack_get_type
@@ -169,6 +172,8 @@ gtk_toggle_tool_button_get_type
 gtk_toolbar_get_type
 gtk_tool_button_get_type
 gtk_tool_item_get_type
+gtk_tool_item_group_get_type
+gtk_tool_palette_get_type
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_source_get_type
 gtk_tree_model_filter_get_type
--- a/docs/reference/gtk/images/recentchooserdialog.png
+++ b/docs/reference/gtk/images/recentchooserdialog.png
--- a/docs/reference/gtk/input-handling.xml
+++ b/docs/reference/gtk/input-handling.xml
@@ -91,7 +91,7 @@
    <title>Event propagation</title>

    <para>
-      For widgets which have a #GdkSurface set, events are received from the
+      For widgets which have a #GdkWindow set, events are received from the
      windowing system and passed to gtk_main_do_event(). See its documentation
      for details of what it does: compression of enter/leave events,
      identification of the widget receiving the event, pushing the event onto a
@@ -101,11 +101,11 @@

    <para>
      When a GDK backend produces an input event, it is tied to a #GdkDevice and
-      a #GdkSurface, which in turn represents a windowing system surface in the
+      a #GdkWindow, which in turn represents a windowing system surface in the
      backend. If a widget has grabbed the current input device, or all input
      devices, the event is propagated to that #GtkWidget. Otherwise, it is
-      propagated to the the #GtkWidget which called gtk_widget_register_surface()
-      on the #GdkSurface receiving the event.
+      propagated to the the #GtkWidget which called gtk_widget_register_window()
+      on the #GdkWindow receiving the event.
    </para>

    <para>
@@ -113,7 +113,7 @@
      specific input device (gtk_device_grab_add()), is sent events in
      preference to a global grab (gtk_grab_add()). Input grabs only have effect
      within the #GtkWindowGroup containing the #GtkWidget which registered the
-      event’s #GdkSurface. If this #GtkWidget is a child of the grab widget, the
+      event’s #GdkWindow. If this #GtkWidget is a child of the grab widget, the
      event is propagated to the child — this is the basis for propagating
      events within modal dialogs.
    </para>
@@ -186,15 +186,15 @@
      Each widget instance has a basic event mask and another per input device,
      which determine the types of input event it receives. Each event mask set
      on a widget is added to the corresponding (basic or per-device) event mask
-      for the widget’s #GdkSurface, and all child #GdkSurfaces.
+      for the widget’s #GdkWindow, and all child #GdkWindows.
    </para>

    <para>
-      Filtering events against event masks happens inside #GdkSurface, which
+      Filtering events against event masks happens inside #GdkWindow, which
      exposes event masks to the windowing system to reduce the number of events
      GDK receives from it. On receiving an event, it is filtered against the
-      #GdkSurface’s mask for the input device, if set. Otherwise, it is filtered
-      against the #GdkSurface’s basic event mask.
+      #GdkWindow’s mask for the input device, if set. Otherwise, it is filtered
+      against the #GdkWindow’s basic event mask.
    </para>

    <para>
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -112,6 +112,7 @@ images = [
  'images/printdialog.png',
  'images/progressbar.png',
  'images/radio-group.png',
+  'images/recentchooserdialog.png',
  'images/right-center.png',
  'images/right-end.png',
  'images/right-start.png',
@@ -132,6 +133,7 @@ images = [
  'images/switch.png',
  'images/toggle-button.png',
  'images/toolbar.png',
+  'images/toolpalette.png',
  'images/tree-view-coordinates.png',
  'images/up-center.png',
  'images/up-end.png',
@@ -158,6 +160,7 @@ content_files = [
  'gtk4-encode-symbolic-svg.xml',
  'gtk4-icon-browser.xml',
  'gtk4-launch.xml',
+  'gtk4-query-immodules.xml',
  'gtk4-query-settings.xml',
  'gtk4-update-icon-cache.xml',
  'gtk4-widget-factory.xml',
@@ -260,6 +263,7 @@ if get_option('man-pages') and xsltproc.found()
    [ 'gtk4-encode-symbolic-svg', '1', ],
    [ 'gtk4-icon-browser', '1', ],
    [ 'gtk4-launch', '1', ],
+    [ 'gtk4-query-immodules', '1', ],
    [ 'gtk4-query-settings', '1', ],
    [ 'gtk4-update-icon-cache', '1', ],
    [ 'gtk4-widget-factory', '1', ],
--- a/docs/reference/gtk/migrating-3to4.xml
+++ b/docs/reference/gtk/migrating-3to4.xml
@@ -52,21 +52,6 @@
      </para>
    </section>

-    <section>
-      <title>Enable diagnostic warnings</title>
-      <para>
-        Deprecations of properties and signals cannot be caught at compile
-        time, as both properties and signals are installed and used after
-        types have been instantiated. In order to catch deprecations and
-        changes in the run time components, you should use the
-        <envar>G_ENABLE_DIAGNOSTIC</envar> environment variable when
-        running your application, e.g.:
-        <programlisting>
-          G_ENABLE_DIAGNOSTIC=1 ./your-app
-        </programlisting>
-      </para>
-    </section>
-
    <section>
      <title>Do not use widget style properties</title>
      <para>
@@ -79,13 +64,13 @@
      <title>Review your window creation flags</title>
      <para>
        GTK+ 4 removes the GDK_WA_CURSOR flag. Instead, just use
-        gdk_surface_set_cursor() to set a cursor on the window after
+        gdk_window_set_cursor() to set a cursor on the window after
        creating it.
      </para>
      <para>
        GTK+ 4 also removes the GDK_WA_VISUAL flag, and always uses
        an RGBA visual for windows. To prepare your code for this,
-        use gdk_surface_set_visual (gdk_screen_get_rgba_visual ()) after
+        use gdk_window_set_visual (gdk_screen_get_rgba_visual ()) after
        creating your window.
      </para>
      <para>
@@ -150,25 +135,13 @@
    </section>

    <section>
-      <title>Stop using gdk_pixbuf_get_from_window() and gdk_cairo_set_source_surface()</title>
+      <title>Stop using gdk_pixbuf_get_from_window() and gdk_cairo_set_source_window()</title>
      <para>
        These functions are not supported in GTK+ 4. Instead, either use backend-specific
        APIs, or render your widgets using gtk_widget_render().
      </para>
    </section>

-    <section>
-      <title>Stop using GtkButton's image-related API</title>
-      <para>
-        The functions and properties related to automatically add a GtkImage
-        to a GtkButton, and using a GtkSetting to control its visibility, are
-        not supported in GTK+ 4. Instead, you can just pack a GtkImage inside
-        a GtkButton, and control its visibility like you would for any other
-        widget. If you only want to add a named icon to a GtkButton, you can
-        use gtk_button_set_icon_name().
-      </para>
-    </section>
-
  </section>

  <section>
@@ -194,7 +167,7 @@
      <title>Stop using the root window</title>
      <para>
        The root window is an X11-centric concept that is no longer exposed in the
-        backend-neutral GDK API. gdk_surface_get_parent() will return %NULL for toplevel
+        backend-neutral GDK API. gdk_window_get_parent() will return %NULL for toplevel
        windows. If you need to interact with the X11 root window, you can use
        gdk_x11_display_get_xrootwindow() to get its XID.
      </para>
@@ -217,12 +190,12 @@
    </section>

    <section>
-      <title>Adapt to GdkSurface API changes</title>
+      <title>Adapt to GdkWindow API changes</title>
      <para>
-        The gdk_surface_new() function has been replaced by a number of more
-        specialized constructors: gdk_surface_new_toplevel(), gdk_surface_new_popup(),
-        gdk_surface_new_temp(), gdk_surface_new_child(), gdk_surface_new_input(),
-        gdk_wayland_surface_new_subsurface(). Use the appropriate ones to create
+        The gdk_window_new() function has been replaced by a number of more
+        specialized constructors: gdk_window_new_toplevel(), gdk_window_new_popup(),
+        gdk_window_new_temp(), gdk_window_new_child(), gdk_window_new_input(),
+        gdk_wayland_window_new_subsurface(). Use the appropriate ones to create
        your windows.
      </para>
      <para>
@@ -230,7 +203,7 @@
        complicating the code and could not be supported across backends.
      </para>
      <para>
-        gdk_surface_reparent() is no longer available.
+        gdk_window_reparent() is no longer available.
      </para>
    </section>

@@ -244,7 +217,7 @@
    </section>

    <section>
-      <title>Stop using gdk_surface_set_event_compression</title>
+      <title>Stop using gdk_window_set_event_compression</title>
      <para>
        Event compression is now always enabled. If you need to see the uncoalesced
        motion history, use gdk_event_get_motion_history().
@@ -367,7 +340,7 @@
    </section>

    <section>
-      <title>Stop using APIs to query GdkSurfaces</title>
+      <title>Stop using APIs to query GdkWindows</title>
      <para>
        A number of APIs for querying special-purpose windows have been removed,
        since these windows are no longer publically available:
--- a/docs/reference/gtk/question_index.sgml
+++ b/docs/reference/gtk/question_index.sgml
@@ -391,14 +391,14 @@ This comes up when using bitfields; in C you can write the following
 code:
 <informalexample>
 <programlisting>
-  gdk_surface_set_events (gdk_surface,
+  gdk_window_set_events (gdk_window,
                         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 </programlisting>
 </informalexample>
 while in C++ you must write:
 <informalexample>
 <programlisting>
-  gdk_surface_set_events (gdk_surface,
+  gdk_window_set_events (gdk_window,
                         (GdkEventMask) GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 </programlisting>
 </informalexample>
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -122,13 +122,36 @@ additional environment variables.
  </para>
 </formalpara>

+<formalpara>
+  <title><envar>GTK3_MODULES</envar></title>
+
+  <para>
+    A list of modules to load. Note that GTK+ also allows to specify modules to load via a commandline option (<option>--gtk-module</option>) and with the <literal>gtk-modules</literal> setting.
+  </para>
+</formalpara>
+
+<formalpara>
+  <title><envar>GTK_MODULES</envar></title>
+
+  <para>
+    A list of modules to load in addition to the ones in the <envar>GTK3_MODULES</envar> variable.
+  </para>
+  <warning>
+    Note that this environment variable is read by GTK+ 2.x too,
+    which may not have the same set of modules available for loading.
+    Use <envar>GTK3_MODULES</envar> for modules that are only compatible
+    with GTK+ 3.
+  </warning>
+</formalpara>
+
 <formalpara id="gtk-path">
  <title><envar>GTK_PATH</envar></title>

  <para>
    Specifies a list of directories to search when GTK+ is looking for
-    dynamically loaded objects such as input method
-    modules and print backends. If the path to
+    dynamically loaded objects such as the modules specified by
+    <envar>GTK_MODULES</envar>, theme engines, input method
+    modules, file system backends and print backends. If the path to
    the dynamically loaded object is given as an absolute path name,
    then GTK+ loads it directly.
    Otherwise, GTK+ goes in turn through the directories in <envar>GTK_PATH</envar>,
@@ -183,6 +206,27 @@ additional environment variables.
  </para>
 </formalpara>

+<formalpara id="gtk-im-module-file">
+  <title><envar>GTK_IM_MODULE_FILE</envar></title>
+
+  <para>
+    Specifies the file listing the IM modules to load. This environment
+    variable the default value
+    <filename><replaceable>libdir</replaceable>/gtk-4.0/4.0.0/immodules.cache</filename>
+    (<replaceable>libdir</replaceable> has the same meaning here as explained for <envar>GTK_PATH</envar>).
+  </para>
+  <para>
+    The <filename>immodules.cache</filename> file is generated by the
+    <command>gtk-query-immodules-3.0</command> utility.
+  </para>
+  <warning>
+    Note that this environment variable is read by GTK+ 2.x too, which
+    makes it unsuitable for setting it system-wide (or session-wide),
+    since doing so will cause either GTK+ 2.x applications or GTK+ 3
+    applications to see the wrong list of IM modules.
+  </warning>
+</formalpara>
+
 <formalpara>
  <title><envar>GTK_EXE_PREFIX</envar></title>

--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -168,6 +168,9 @@
    <link linkend="GtkToolbar">
      <inlinegraphic fileref="toolbar.png" format="PNG"></inlinegraphic>
    </link>
+    <link linkend="GtkToolPalette">
+      <inlinegraphic fileref="toolpalette.png" format="PNG"></inlinegraphic>
+    </link>
    <link linkend="GtkPlacesSidebar">
      <inlinegraphic fileref="placessidebar.png" format="PNG"></inlinegraphic>
    </link>
@@ -195,6 +198,9 @@
    <link linkend="GtkFileChooserDialog">
      <inlinegraphic fileref="filechooser.png" format="PNG"></inlinegraphic>
    </link>
+    <link linkend="GtkRecentChooserDialog">
+      <inlinegraphic fileref="recentchooserdialog.png" format="PNG"></inlinegraphic>
+    </link>
    <link linkend="GtkFontChooserDialog">
      <inlinegraphic fileref="fontchooser.png" format="PNG"></inlinegraphic>
    </link>
--- a/docs/tools/shooter.c
+++ b/docs/tools/shooter.c
@@ -211,20 +211,20 @@ static GList *toplevels;
 static guint shot_id;

 static gboolean
-window_is_csd (GdkSurface *window)
+window_is_csd (GdkWindow *window)
 {
  gboolean set;
  GdkWMDecoration decorations = 0;

  /* FIXME: is this accurate? */
-  set = gdk_surface_get_decorations (window, &decorations);
+  set = gdk_window_get_decorations (window, &decorations);
  return (set && (decorations == 0));
 }

 static gboolean
 shoot_one (WidgetInfo *info)
 {
-  GdkSurface *window;
+  GdkWindow *window;
  XID id;
  GdkPixbuf *screenshot = NULL;
  DecorationType decor = DECOR_FRAME;
@@ -235,8 +235,8 @@ shoot_one (WidgetInfo *info)
      gtk_main_quit ();
    }

-  window = gtk_widget_get_surface (info->window);
-  id = gdk_x11_surface_get_xid (window);
+  window = gtk_widget_get_window (info->window);
+  id = gdk_x11_window_get_xid (window);
  if (window_is_csd (window))
    decor = (info->include_decorations) ? DECOR_NONE : DECOR_WINDOW_FRAME;
  screenshot = take_window_shot (id, decor);
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -448,6 +448,25 @@ create_action_bar (void)
  return info;
 }

+static WidgetInfo *
+create_recent_chooser_dialog (void)
+{
+  WidgetInfo *info;
+  GtkWidget *widget;
+
+  widget = gtk_recent_chooser_dialog_new ("Recent Chooser Dialog",
+					  NULL,
+					  "Cancel", GTK_RESPONSE_CANCEL,
+					  "Open", GTK_RESPONSE_ACCEPT,
+					  NULL); 
+  gtk_window_set_default_size (GTK_WINDOW (widget), 505, 305);
+  
+  info = new_widget_info ("recentchooserdialog", widget, ASIS);
+  info->include_decorations = TRUE;
+
+  return info;
+}
+
 static WidgetInfo *
 create_text_view (void)
 {
@@ -800,6 +819,40 @@ create_toolbar (void)
  return new_widget_info ("toolbar", widget, SMALL);
 }

+static WidgetInfo *
+create_toolpalette (void)
+{
+  GtkWidget *widget, *group;
+  GtkToolItem *item;
+
+  widget = gtk_tool_palette_new ();
+  group = gtk_tool_item_group_new ("Tools");
+  gtk_container_add (GTK_CONTAINER (widget), group);
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "help-about");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "document-new");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "folder");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+
+  group = gtk_tool_item_group_new ("More tools");
+  gtk_container_add (GTK_CONTAINER (widget), group);
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "edit-cut");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "edit-find");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+  item = gtk_tool_button_new (NULL, NULL);
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "document-properties");
+  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
+
+  return new_widget_info ("toolpalette", widget, MEDIUM);
+}
+
 static WidgetInfo *
 create_menubar (void)
 {
@@ -1421,6 +1474,7 @@ get_all_widgets (void)
  retval = g_list_prepend (retval, create_headerbar ());
  retval = g_list_prepend (retval, create_stack ());
  retval = g_list_prepend (retval, create_stack_switcher ());
+  retval = g_list_prepend (retval, create_toolpalette ());
  retval = g_list_prepend (retval, create_spinner ());
  retval = g_list_prepend (retval, create_about_dialog ());
  retval = g_list_prepend (retval, create_accel_label ());
@@ -1457,6 +1511,7 @@ get_all_widgets (void)
  retval = g_list_prepend (retval, create_window ());
  retval = g_list_prepend (retval, create_filesel ());
  retval = g_list_prepend (retval, create_assistant ());
+  retval = g_list_prepend (retval, create_recent_chooser_dialog ());
  retval = g_list_prepend (retval, create_page_setup_dialog ());
  retval = g_list_prepend (retval, create_print_dialog ());
  retval = g_list_prepend (retval, create_volume_button ());
--- a/docs/widget_system.txt
+++ b/docs/widget_system.txt
@@ -62,23 +62,23 @@ GtkWidget, public flags:
 GTK_TOPLEVEL:
 	Widgets without a real parent, as there are GtkWindows and
 	GtkMenus have this flag set throughout their lifetime.
-	Toplevel widgets always contain their own GdkSurface.
+	Toplevel widgets always contain their own GdkWindow.
 	
 GTK_NO_WINDOW:
 	This flag is indicative for a widget that does not provide
-	its own GdkSurface. Visible action (e.g. drawing) is performed
-	on the parent's GdkSurface.
+	its own GdkWindow. Visible action (e.g. drawing) is performed
+	on the parent's GdkWindow.

 GTK_REALIZED:
 	Set by gtk_widget_realize, unset by gtk_widget_unrealize.
 	Relies on ((widget->parent && widget->parent->window)
 	           || GTK_WIDGET_TOPLEVEL (widget));
-	Means: widget has an associated GdkSurface (XWindow).
+	Means: widget has an associated GdkWindow (XWindow).

 GTK_MAPPED:
 	Set by gtk_widget_map, unset by gtk_widget_unmap.
 	May only be set if GTK_WIDGET_REALIZED (widget).
-	Means: gdk_surface_show() has been called on the widgets window(s).
+	Means: gdk_window_show() has been called on the widgets window(s).

 GTK_VISIBLE:
 	Set by gtk_widget_show.
@@ -329,7 +329,7 @@ Adding to a container

 When a widget is added to a container, the container:

-  1) calls gtk_widget_set_parent_surface (widget, window) if 
+  1) calls gtk_widget_set_parent_window (widget, window) if 
     the widget is being added to something other than container->window
  2) calls gtk_widget_set_parent (widget, container)

@@ -364,7 +364,7 @@ When a widget receives the "realize" signal it should:

  1) set the realized flag
  2) set widget->window
-      widget->window = gtk_widget_get_parent_surface (widget);
+      widget->window = gtk_widget_get_parent_window (widget);
      g_object_ref (widget->window);
  3) attach the widget's style

@@ -374,7 +374,7 @@ When a widget receives the "realize" signal it should:

  1) set the REALIZED flag
  2) create windows with the parent obtained from
-      gtk_widget_get_parent_surface (widget);
+      gtk_widget_get_parent_window (widget);
  3) attach the widget's style
  4) set the background color for the new window based on the style

@@ -382,7 +382,7 @@ The Map signal
 --------------

  1) Set the MAPPED flag
-  2) If the widget has any windows, gdk_surface_show those windows
+  2) If the widget has any windows, gdk_window_show those windows
  3) call gtk_widget_map for all child widgets that are 
     VISIBLE, CHILD_VISIBLE and !MAPPED. (A widget will only
     be !CHILD_VISIBLE if the container set it that way, so
@@ -395,7 +395,7 @@ The Unmap signal

 When a widget receives the unmap signal, it must:

- 1) If the widget has a window, gdk_surface_hide that window, 
+ 1) If the widget has a window, gdk_window_hide that window, 
 2) If the widget does not have a window, unmap all child widgets
 3) Do any other functions related to taking the widget offscreen
     (for instance, removing popup windows...)
@@ -409,8 +409,8 @@ When a widget receives the unrealize signal, it must

 1) For any windows other than widget->window do:

-    gdk_surface_set_user_data (window, NULL);
-    gdk_surface_destroy (window);
+    gdk_window_set_user_data (window, NULL);
+    gdk_window_destroy (window);

 2) Call the parent's unrealize handler

--- a/Show More
+++ b/Show More