gdk: Remove a leftover GdkScreen

wayland: Drop GdkWaylandDeviceManager
This object had no functionality left.
2017-11-25 08:39:55 -05:00 · 2017-11-25 08:39:55 -05:00 · 2017-11-25 08:39:55 -05:00 · 2017-11-25 08:39:55 -05:00 · 2017-11-25 08:39:55 -05:00 · 2017-11-25 08:39:55 -05:00
1920 changed files with 198830 additions and 212757 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,82 +0,0 @@
-stages:
-  - build
-  - flatpak
-  - deploy
-
-.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.gnome.org/gnome/gnome-runtime-images/gnome:master
-  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
-
-pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v1
-  stage: deploy 
-  script:
-    - meson -Ddocumentation=true _build .
-    - ninja -C _build
-    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-
-    - mkdir -p public/
-    - mv _build/docs/reference/gtk/html/ public/gtk/
-    - mv _build/docs/reference/gdk/html/ public/gdk/
-    - mv _build/docs/reference/gsk/html/ public/gsk/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,81 +0,0 @@
-FROM fedora:28
-
-RUN dnf -y install \
-    hicolor-icon-theme \
-    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 \
-    gtk-doc \
-    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,53 +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 \
-    -Dvulkan=no \
-    _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/8111
+++ b/8111
--- a/NEWS.pre-1-0
+++ b/NEWS.pre-1-0
--- a/NEWS.pre-2.0
+++ b/NEWS.pre-2.0
@@ -1,903 +0,0 @@
-Overview of Changes in GTK+ 2.0.0
-=================================
-
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, Darin Adler]
-* Build fixes [Anders Carlsson, Tor Lillqvist, Manish Singh]
-* Bug fixes. [Thomas Leonard, Owen Taylor]
-
-Overview of Changes in GTK+ 2.0.0 rc1
-=====================================
-
-* GtkTreeView fixes [Kristian Rietveld, Jonathan Blandford, Richard Hult]
-* Text widget fixes [Havoc Pennington]
-* Efficiency fixes when using Xft [Owen Taylor]
-* Key handling fixes and other fixes for Win32 [Hans Breuer, Tor Lillqvist]
-* Try to fix key handling without XKEYBOARD extension [Owen]
-* Documentation fixes and improvements 
-  [Matthias Clasen, Alexey Malyshev, Akira Tagoh, Vitaly Tishkov]
-* Widget drawing improvements [Soeren Sandmann]
-* Allow cycling between multiple menu bars with <Control>Tab [Owen]
-* Try to build libraries with only shared library dependencies on Xft to 
-  deal with transition to Xft2 [Owen]
-* Portability fixes [Owen, Miroslaw Dobrzanski-Neumann]
-* Don't use red as the default cursor color [Owen]
-* Bug fixes, bug fixes, bug fixes.
-
-Other contributors: Darin Adler, Jacob Berkman, Kevin Breit, Hans Breuer, 
-  Anders Carlsson, Damon Chaplin, Finlay Dobbie, Jody Goldberg,
-  Andreas J. Guelzow, Scott Guilbeaux, Vlad Harchev, James Henstridge,
-  Tim Janik, Satyajit Kanungo, Charles Kerr, Sergey Kuzminov, Miles Lane, 
-  Alexander Larsson, Paolo Maggi, Skip Montaro, Jan Mynarik, Sven Neumann, 
-  Padraig O'Briain, Narayani Pattipati, Mark Patton, Havoc Pennington, 
-  Ettore Perazzoli, Guillermo S. Romero, Manish Singh, Morten Welinder
-
-Overview of Changes in GTK+ 1.3.15
-==================================
-
-* New stock and improved icon images
-  [Tuomas Kuosmanen, Jakub Steiner, Anders Carlsson]
-* Widget drawing improvements for check and radio buttons,
-  spinbuttons [Soeren Sandmann]
-* Clean up module search path algorithm, use GTK_PATH [Owen Taylor]
-* Add GtkSetting for font name. [Richard Hestilow]
-* Much improved key matching code, accelerators work independent
-  of group [Owen]
-* Make mnemonics work for embedded GtkPlug widgets [Owen]
-* Keynav improvements for GtkTreeView [Kristian Rietveld]
-* Fix gtk_tree_view_scroll_to_cell() [Jonathan Blandford]
-* Rename gtk_tree_view_get_iter_root() and gtk_tree_path_new_root()
-  to gtk_tree_view_get_iter_first() and gtk_tree_path_new_first(),
-  add compatibility macros.
-* GtkTreeView bug fixes [Kristian, Anders, Damon Chaplin]
-* GtkTextView bug fixes [Havoc Pennington]
-* Pad class structures for future binary compatibility [Owen]
-* Tutorial improvements [Sven Neumann, Matthias Clasen]
-* Fixes for MULTIPLE selection target [Gregory Merchan, Owen]
-* Fix problems with initial widget size [Owen]
-* AIX compilation fixes [Miroslaw Dobrzanski-Neumann]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Miscellaneous bug fixes
-
-Other contributors: David L. Cooper, Eric Fischer, Jody Goldberg, 
-  Satajyit Kanungo, Thomas Leonard, Mark Patton, Manish Singh, 
-  Nicolas Setton
-
-Overview of Changes in GTK+ 1.3.14
-==================================
-
-* Keyboard focus improvements [Owen Taylor]
-* Code cleanup [Matthias Clasen, Manish Singh, Darin Adler]
-* Fix accidentally exported variables [Mark McLoughlin]
-* GtkTreeView fixes [Jonathan Blandford, Kristian Rietveld, John Harper, Darin]
-* Default to yellow tooltips [Owen]
-* RC file fixes for reloading, priorities [Owen, Matthias]
-* GtkMenu behavior improvements and bug fixes [Owen, Arnaud Charlet]
-* GtkTextView fixes [Havoc Pennington, Daniel Elstner, Dennis Bjorklund]
-* Improve keynav for paned widgets, tooltips, spin buttons, notebooks, 
-  scrolled windows [Soeren Sandmann, Padraig, Owen]
-* Add Emacs/Default key themes [Owen]
-* Win32 fixes [Hans Breuer, Tor Lillqvist]
-* Ethiopic input methods [Daniel Yacob]
-* Opaque paned window resizing [Soeren]
-* Tweak table expansion behavior [Tim Janik]
-* Fix GtkCalendar focus drawing [Bill Haneman]
-* Allow themeable cursor thickness [Bill]
-* Start of fixing of tutorial for GTK+-2.0 [Matthias]
-* Add a ::adjust-bounds signal to GtkRange to allow spreadsheet style
-  scrollbars. [Jody Goldberg]
-* Add the ability to turn on multiple selection for GtkFileSel [Manish]
-* Bug fixes
-
-Other contributors: Jacob Berkman, Padraig O'Briain, Anders Carlsson,
- Johan Dahlin, Richard Hult, Stefan Kost, Alex Larsson, Thomas Leonard,
- Paolo Maggi, Alexey Malyshev, Federico Mena Quintero, Skip Montaro,
- Sven Neumann, Havoc Pennington, Laszlo Peter, Christian Rose, Joe Shaw,
- Kevin Vandersloot,  Morten Welinder, Peter Williams
-
-Overview of Changes in GTK+ 1.3.13
-==================================
-
-* Tree view fixes. [Kristian Rietveld, Jonathan Blandford, Anders Carlsson]
-* Tree view support for low-vision themes [Bill Haneman]
-* Text view bug fixes. [Havoc Pennington]
-* Win32 fixes and improvements.  [Tor Lillqvist, Hans Breuer, 
-  Archaeopteryx Software]
-* Documentation improvements [Matthias Clasen, Havoc Pennington]
-* Accelerate alpha compositing using RENDER extension if present,
-  and optimize the non-RENDER case a lot. [Owen Taylor]
-* Add support for "optional keybindings" (action signal returns FALSE) [Owen]
-* Fixed the infamous changing directory deletes filename bug 
-  [Owen and a cast of thousands]
-* Add mouse cursor hiding for text widgets [Anders Carlsson]
-* Simple Hangul input module [Yusuke Tabata]
-* Removed the scary startup warning.
-* GdkPixbuf pixel handling fixes [Owen, Michael Hore, Jim Cape]
-* Converted GtkFileSelection and GtkFontSelection to use GtKTreeView widgets
-  instead of the deprecated GtkCList [Owen]
-* gtkhsv.h was installed by mistake, fixed that. [reported by Ross Burton]
-* gdk_pixbuf_render_to_drawable() now also handles alpha pixbufs.
-* Made Gtkimage draw GtkPixmap, GtkImage, GdkPixbuf insensitive, prelighted,
-  etc. [Havoc, Owen]
-* Marked gtk_item_factory_path_from_widget() G_CONST_RETURN. [Matt Wilson]
-* gtk_image_menu_item_new_from_stock() now falls back to
-  new_with_mnemonic, for consistency with gtk_button_new_from_stock()
-  [Havoc Pennington]
-* GdkModifierType is now consistently used for modifier mask parameters
-  [Mark Patton]
-* gtk_widget_set_accel_path() is now publically exported.
-
-Other contributors: Darin Adler, Jeffrey Baker, Damon Chaplin, Brian Cameron, 
-  Murray Cumming, James Henstridge, Jacob Berkman, Arnaud Charlet, Jeff Franks, 
-  Jeff Garzik, Jody Goldberg, Diego Gonzalez, Melvin Hadasht, Raja Harinath, 
-  Tim Janik, Mike Kestner, Mathieu Lacage, Alex Larsson, Ryan Lovett, 
-  Mark McLoughlin, Sven Neumann, Padraig O'Briain, Xavier Ordoquy, Chris Phelps, 
-  Detlef Reichl, Guillermo S. Romero, Federico Mena Quintero, Manish Singh,
-  HideToshi Tajima, Vitaly Tishkov, Jon Trowbridge, Sergey Vlasov.
-
-Overview of Changes in GTK+ 1.3.12
-==================================
-
-* Fix problems with PNG saving [Michael Natterer]
-* Cleanups of deprecated usages [Sebastian Wilhelmi]
-* Win32 fixes [Tor Lillqvist]
-* Documentation improvements [Matthias Clasen, Havoc Pennington, 
-  Vitaly Tishkov]
-* Frame buffer port fixes [Manish Singh]
-* GtkTextView bug fixes [Havoc Pennington, Chris Phelps]
-* Menu behavior improvements [Kristian Rietveld]
-* Make focus line width configurable, focus color work on 
-  dark themes. [Bill Haneman, Owen Taylor]
-* Add state argument to gtk_paint_focus() [Bill]
-* Added incremental revalidation to tree view, for better apparent speed 
-  [Jonathan Blandford]
-* Remove useless gtk_tree_view_column_cell_event() [Jonathan]
-* Display XIM status in a separate window [HideToshi Tajima]
-* Add GDK_DEBUG=nograbs to disable pointer, keyboard grabs [Jacob Berkman]
-* Add menu of Unicode control characters to GtkEntry, GtkTextView 
-  [Dov Grobgeld, Havoc]
-* Pass key releases along to input methods [Owen]
-* Many bug fixes
-
-Other contributors: Darin Adler, Fabrice Bellet, Chris Blizzard, 
-  Hans Breuer, Anders Carlsson, Damon Chaplin, Murray Cumming, Jeff Franks, 
-  James Henstridge, Tim Janik, Alex Larsson, George Lebl, Kjartan, Maraas, 
-  Sven Neumann, Seth Nickell, Padraig O'Briain, Soeren Sandmann, Manish Singh, 
-  Matt Wilson
-
-Overview of Changes in GTK+ 1.3.11
-==================================
-
-* Massive rework of accelerator API and implementation (Tim Janik)
-* Major fixes to resizing and redrawing to eliminate hysteresis
-  and optimize. (Owen Taylor, Soeren Sandmann)
-* Make many widgets NO_WINDOW to improve appearance and reduce
-  drawing overhead (Owen)
-* Text view fixes (Havoc Pennington)
-* Make child widgets in GtkTextView work (Havoc)
-* GtkTreeModelSort fixage (Jonathan Blandford, Kristian Rietveld)
-* Clean up GtkTreeView drag and drop support (Owen)
-* Misc tree view fixes and improvements (Jonathan, Kristian, Anders, Matt Wilson)
-* Add gtk_window_get/set_focus(), gtk_window_set_default() as public
-  functions (Owen, Damian Ivereigh)
-* Fixes to GtkPlug/GtkSocket (Michael Meeks, Owen)
-* Change button ordering in standard dialogs to correspond to 
-  GNOME usability project proposal (Gregory Merchan)
-* Add support for context sensitivity in input methods (Owen)
-* Hook up gtk_im_context_set_use_preedit() (Hidetoshi Tajima)
-* Fix gdk_window_scroll() and other aspects of big windows (Owen)
-* Remove need for X connection for class initialization (Jacob Berkman)
-* Propagate key events to parents of focused widget (Owen)
-* Don't export normal GTK+ marshalers, export deprecated compat marshalers (Owen)
-* Many Win32 Fixes and improvements (Hans Breuer, Tor Lillqvist)
-* Bug and documentation fixing (Matthias Clasen, Anders Carlsson,
-  Jacob Berkman, others.)
-
-Other Contributors:
-  Darin Adler, Marius Andreiana, Erwann Chenede, Murray Cumming, Janet Davis, 
-  Daniel Egger, Daniel Elstner, Jeff Franks, Alex Larsson, George Lebl, 
-  Sergey Kuzminov, Eric Lemings, Arkadiusz Miskiewicz, Padraig O'Briain, Sven Neumann, 
-  Kristian Rietveld, Nicolas Setton, Manish Singh,  Vitaly Tishkov, Sebastian Wilhelmi, 
-  Michael Natterer
-
-Overview of Changes in GTK+ 1.3.10
-==================================
-
-* GtkTextView fixes [Havoc Pennington]
-* GtkTreeView fixes and improvements [Jonathan Blandford, Kristian,
-  Manish Singh, Joshua Pritikin, Oleg Maiboroda, James Henstridge]
-* gtkdemo improvements [Kristian Rietveld]
-* Drag and drop fixes to generic code and widgets 
-  [Owen Taylor, Damian Ivereigh]
-* Documentation improvement [Havoc Pennington, Matthias Clasen]
-* Spelling fixes [Jacob Berkman]
-* Move signals to the GtkEditable interface [Kristian]
-* Further stock image improvements [Jakub Steiner]
-* Support text chunks for the PGN loader, add gdk_pixbuf_get_option()
-  [Sven Neumann]
-* Rename gdk_pixbuf_new_from_stream back to new_from_inline [Owen]
-* Automatically call setlocale(), unless explicitly disabled [Owen]
-* Property addition to various widgets [Michael Meeks, Owen]
-* Support building with automake-1.4 [James]
-* Make GtkRadioButton groups act as a single focus point [Owen]
-* Move gdk_window_lookup etc. to be cross-platform [Matthias]
-* Draw spinbuttons variably sized [Kristian]
-* Separate GdkAtom out from X atoms for compatibility with future
-  multihead changes [Owen]
-* Require gdk_threads_init() to be explicitly called instead
-  of piggybacking off of g_thread_init(). [Owen]
-* Improvements to text-view/label/entry popup menus [Damian, Jacob, Owen]
-* Bug fixes and cleanup [Matthias, others]
-
-Other Contributors:
-  Mark McLoughin, Mikael Hermansson, Soeren Sandmann, Anders Carlsson,
-  Tim Janik, Murray Cumming, Hidetoshi Tajima, Padraig O'Briain, 
-  Hans Breuer, Vitaly Tishkov, Dov Grobgeld
- 
-
-Overview of Changes in GTK+ 1.3.9
-=================================
-
-* Add editable text cells to GtkTreeView.
-  Keynav, drawing fixes in GtkTreeView [Jonathan Blandford]
-* Text widget no longer always has a \n in it. [Havoc Pennington]
-* Text widget bug fixes [Havoc, Dov Grobgeld, Hidetoshi Tajima]
-* Allow -1 for width/height in gdk_pixbuf_render_*(). [Matthias Clasen]
-* Minor fix for major resizing problems in recent releases [Owen Taylor]
-* Restore ability to set _set properties to TRUE for 
-  GtkCellRendererText, GtkTextTag [Owen]
-* Cursor drawing improvements [Owen]
-* Win32 fixes [Hans Breuer]
-* Mark various functions as deprecated or private.
-* Misc bug fixes, portability fixes, and cleanups.
-
-Other Contributors: 
- Vitaly Tishkov, Christian Rose, Frank Belew, Jeff Franks, Sven Neumann,
- Kristian Rietveld, Vitaly Tishkov, Joshua N. Pritikin, Matt Wilson, 
- James Henstridge, Detlef Reichl
-
-Overview of Changes in GTK+ 1.3.8
-=================================
-
-* GtkTreeView and GtkTreeModel API cleanups/improvements [Jrb]
-* GtkOptionMenu scrollwheel support [Alex]
-* GtkModule search paths [Owen]
-* Documenatation updates [Havoc,Jrb]
-* Major Gdk cleanup [Owen]
-* Miscellaneous other fixes/cleanups
-
-Other Contributors:
-  Joshua N Pritikin, Padraig O'Briain, Jakub Steiner, Matthias Clasen,
-  Matt Wilson, James Henstridge
-
-Overview of Changes in GTK+ 1.3.7
-=================================
-
-* Many Pixbuf (loader) improvements [Matthias Clasen, Soeren Sandmann]
-* Added publically installed utility gdk-pixbuf-csource to generate
-  inlined pixbufs in C source code [Tim Janik]
-* Optional movement of button children on press [Soeren, Owen Taylor]
-* Interactive searching in GtkTreeView [Kristian Rietveld]
-* Sorting/ordering improvements for GtkTreeView [Kris, Jonathan Blandford]
-* Animation of expander motion for GtkTreeView [Anders Carlsson]
-* Lots of misc GtkTreeView fixes and improvements [Jonathan]
-* New/improved stock icons [Jakub Steiner] 
-* Code and API rework for window resizing [Havoc Pennington]
-* Converted accel groups to GObject [James Henstridge]
-* More property support improvements
-* Add facility for "secondary" buttons in 
-  GtkButtonBox/GtkDialog [Gregory Merchan]
-* Disentangled child visability from MAPPED state [Owen]
-* Plug/Socket improvements and port to the XEMBED protocol [Owen]
-* Added priorities for styles in RC files, 
-  support multiple parse contents [Owen]
-* Made GdkVisual and GdkDevice GObjects [Alexander Larsson]
-* Key binding improvements [Havoc]
-* Added GtkWidget::event-after signal since normal event handling
-  is now aborted as soon as a handler returned TRUE [Tim]
-* Dnd fixes and improved icon support [Owen]
-* Removed GtkPacker widget
-* Fixing missing paired getters/setters [Kris]
-* Nuked remaining GtkArg cruft, implemented container/child properties [Tim]
-* Added window grab groups [Owen]
-* Many frame buffer improvements [Alex]
-* Win32 fixes and improvements [Hans Breuer]
-* Warning fixes [Darin Adler]
-* Miscellaneous bug and API fixes [Matthias et. al]
-
-Other Contributors:
-  Joshua N Pritikin, Hidetoshi Tajima, Manish Singh, ERDI Gergo, Jens Finke,
-  Chema Celorio, Lee Mallabone, Vitaly Tishkov, Sebastian Wilhelmi,
-  Nicola Girardi, Sven Neumann, Padraig O'Briain, Michael Natterer,
-  Suresh Chandrasekharan, Jonas Borgström, Jay Cox, Michael Meeks,
-  Mathias Hasselmann, Peter Williams, Thomas Broyer, Kjartan Maraas,
-  Joel Becker, Jeff Franks, Brian Cameron, Skip Montanaro
-
-Overview of Changes in GTK+ 1.3.6
-=================================
-
-* Properly renders strikethrough text
-* win32 fixes
-* Added "scale" property to GtkTextTag and GtkCellRendererText to do 
-  relative font scaling
-* Added "format_value" signal to GtkScale to reformat value text
-* framebuffer fixes
-* Property support added to lots of widgets
-* Many GtkTreeView new features and API/implementation fixes
-* Lots of new_with_mnemonic() convenience functions
-* Change GtkImageMenuItem API to be more consistent/useful
-* Added lots of new stock items/icons
-* Rewrote GtkRange/GtkScale/GtkScrollbar, includes support for
-  enabling/disabling extra scrollbar stepper arrows in gtkrc so NeXT
-  themes won't need broken hacks
-* Convenience API for GtkRange similar to the one added to GtkSpinButton
-  a while back
-* Make menubar/toolbar work properly with xthickness/ythickness of 1 or 0, 
-  and move some attributes from program settings to user settings.
-  Allows nice 1-pixel-bevel themes.
-* Moved ::focus virtual function from GtkContainer to GtkWidget
-* Plenty of bug fixes
-
-Overview of Changes in GTK+ 1.3.5
-=================================
-
-* New default theme based on Raleigh theme for 1.2.x.
-* Dependency on the ATK library added as a step to
-  providing accessibility-enabling interfaces
-* XEMBED-based GtkPlug/GtkSocket now basically works.
-* Drag and drop of column headers in GtkTreeView
-* GtkColorSelector work: hooks for saving and propagating palette, UI tweaks,
-  and API sanitation
-* Key binding fixes
-* Configurable padding/spacing in a lot of places
-* Invisible text in GtkTextView fixed
-* SHM segments now created with a mode of 0600
-* Bug fixes
-
-Overview of Changes in GTK+ 1.3.4
-=================================
-
-* Win32 fixes
-* GtkTreeView improvements and fixes
-* Fix glib-2.0.m4
-* Miscellaneous bug fixes
-
-Overview of Changes in GTK+ 1.3.3
-=================================
-
-[ 5600 lines of ChangeLog ]
-
-* API cleanups
-* Win32 work (Tor, Hans Breuer)
-* Focus improvements (Owen)
-* Frame buffer improvements (Alex)
-* Work on GtkTextView (Havoc)
-* Much work on GtkTreeView (Jonathan)
-* Selectable labels (Havoc)
-* Converted many arguments to properties (Lee Mallabone, John Margaglione)
-* Add exact regions to GdkExposeEvent, propagate it. (Alex)
-* Added ability to have resize grips in status bars (etc.) using
-  _NET_WM_MOVERESIZE protocol. (Havoc)
-* Added mnemnonic mechanism to make setting underline accelerators
-  much easier. (Alex)
-* Add per-style property mechanism to allow themes to change 
-  geometry parameters. (Tim)
-* Added global settings mechanisms for settings such as double-click
-  time. (Tim, Owen)
-* Various support functions for new and old WM properties (Havoc, Alex)
-* Add TRUE-stops-returns for boolean-returning signals (Ron Steinke)
-
-Overview of Changes in GTK+ 1.3.2
-=================================
-
-GTK Core:
-
-* New stock-icon and stock-item system. Use themeable pixbufs in
-  dialogs, buttons, etc. [Havoc]
-* Theme engines reworked to use derivation and new object system. [Owen]
-* Added GtkClipboard object for simple selection handling. [Owen]
-* Make GtkEditable an interface, move implementation to GtkOldEditable for
-  compat. [Owen]
-* Better handling of default directionality. [Robert]
-* Use GSignal as backend for GtkSignal and other GObject stuff. [Tim]
-* Move theme engines to GTypePlugin. [Owen]
-
-GDK:
-
-* Beginning of implementation of client parts of new window manager spec. [Owen]
-* Make gdk_drawable_get_image() work with backing store. [Havoc]
-
-Widgets:
-
-* New text widget [Havoc]
-  - Adjustable tab handling.
-  - Ability to have scrolling side areas in new text widget for tabs/line numbers.
-  - Many cleanups and small improvements.
-* Improvements to submenu navigation [Nils Barth/David Santiago] and
-  scrolling menus. [Alex]
-* Simplification of progress bar API. [Havoc]
-* Make GtkImage a generic image-display widget. [Havoc]
-* New GtkTreeView tree widget. Model/view architecture, flexible rendering,
-  large datasets, etc. [Jonathan]
-* New GtkMessageBox widget for message display. [Havoc]
-* Allow labels to have contents set from XML-like markup language. [Havoc]
-* Make dialogs derive from GtkDialog and use stock buttons. [Havoc]
-
-Internationalization:
-
-* Proper character set conversion for clipboard/selection. [Owen]
-* New input method system via loadable modules; support on-the-spot
-  preedit in GtkEntry and new text widget; allow switching input methods
-  on the fly; include modules for XIM and demo Cyrillic-transliteration 
-  module. [Owen]
-* VIQR, Thai, and Inuktitut input methods. [Robert]
-* Convert po files to UTF-8. [Robert]
-
-gdk-pixbuf:
-
-* Full-alpha compositing for gdk-pixbuf on drawable. [Havoc]
-* Add simple saving to gdk-pixbuf. [David Welton/Havoc]
-* Add improved error handling with GError to gdk-pixbuf. [Havoc]
-
-Ports:
-
-* Much work on Win32 Port. [Tor/Hans]
-* Much work on Linux-FB Port. [Elliot/Alex]
-
-Misc:
-
-* Start of new gtk-demo demo program. [Owen/Jonathan]
-* Bug fixes and more bug fixes.
-
-
-Overview of Changes in GTK+ 1.3.1:
-
-* GTK+ now uses the Pango library for text manipulation. All
-  strings in GTK+ now are in Unicode, languages written
-  from right-to-left, and complex-text languages are now supported.
-* The gdk-pixbuf library for image loading and manipulation is 
-  has been integrated with GTK+.
-* The GTK+ object system has mostly been moved to GLib, separating
-  it from the GUI code. Many significant enhancements have been
-  made as part of this.
-* A new text widget is now included. This started as a port
-  of the Tk text widget, and includes such features of the Tk
-  text widget as tags, marks, and unicode text support. It
-  has been enhanced to support model-view operation and the
-  full power of Pango.
-* The GDK library has been extensively revised to support multiple
-  windowing systems. The only fully functional backend in 1.3.1
-  is the X11 backend, however, ports to Win32, Linux-framebuffer,
-  Nano-X, BeOS, and MacOS exist in various states of completion,
-  and at least some of these will be finished and integrated in 
-  before the final GTK+-2.0 release.
-* 32-bit coordinates are now supported throughout GDK and GTK+
-  (they are emulated where not supported by the windowing system.)
-* Many minor bug fixes and enhancements. Incompatible changes
-  are documented in docs/Changes-2.0.txt
-
-Overview of Changes in GTK+ 1.2.8:
-
-* GNU Make 3.79 bug workaround
-* FAQ and tutorial updates and improvements
-* Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection
-
-Overview of Changes in GTK+ 1.2.7:
-
-* More header cleanups.
-* Fixed activation bug for insensitive widgets.
-* Locale fixes to RC file parsing code.
-* Miscellaneous bugfixes for Item Factory, CList, CTree, X Selections,
-  HScale, VScale, Pixmap, Viewport, OptionMenu, Entry and Notebook.
-* Upgrade to libtool 1.3.4.
-
-Overview of Changes in GTK+ 1.2.6:
-
-* container queue_resize fixes
-* gtk[vh]scale: minor fixups
-* rename idle to idle_id in testgtk to avoid conflicts with 
-  broken libs
-* More consistent naming of gtkrc files
-* Added language support: ro, uk
-
-Overview of Changes in GTK+ 1.2.5:
-
-* more GtkCTree and GtkWindow bug fixes.
-* more redraw/resize queue fixes, better expose event
-  discarding code.
-* more miscellaneous bugs fixed
-* new configure.in option --disable-rebuilds to completely disable
-  rebuilds of autogenerated sources.
-* check for 5.002 now, to avoid failing autogeneration build rules due
-  to old perl versions.
-* fonts (and fontsets) are cached now.
-* more autogeneration make rules and dependency fixups, we should be
-  save with autogeneration up to make -j12 now ;)
-* new window position GTK_WIN_POS_CENTER_ALWAYS, which will recenter the
-  GtkWindow on every size change.
-* major rework of window manager hints handling code, fixed a bunch of
-  races with the new resizing code.
-* the new wm hints and resizing code is absolutely perfect and bug free now,
-  it only lacks testing ;)
-* fixed up various rc style memory problems.
-* gtk_widget_modify_style() now properly changes the style of realized widgets
-  and references the style passed into it. if people worked around this bug,
-  this will introduce a slight memory leak in their code.
-  The code should typically look like:
-            GtkRcStyle *rc_style = gtk_rc_style_new ();
-            [...]
-            gtk_widget_modify_style (widget, rc_style);
-            gtk_rc_style_unref (rc_style);
-* fix problems with positioning menus offscreen.
-* GtkText fixes for some crashes and drawing errors.
-* Better handling for unexpected window destroys in GDK and GTK+.
-  This should make it possible to use a GtkPlug and catch the
-  case where its parent socket is randomly killed.
-* FAQ updates.
-* FileSelection i18n patches, RadioButton fixups.
-* many translation improvements.
-* miscellaneous other bugs fixed.
-
-Overview of Changes in GTK+ 1.2.4:
-
-* DnD improvements (drags can be canceled with Esc now).
-* suppressed configure event reordering in Gdk.
-* rewrite of Gtk's configure event handling.
-* major improvements for the object argument system (Elena Devdariani).
-* major bugfixes for threading, GtkNotebook, GtkItemFactory, GtkCList and
-  GtkCTree.
-* tutorial/FAQ updates, new file generation.txt on autogenerated sources.
-* configure's --with-glib= is "officially" unsupported.
-* upgrade to libtool 1.3.3.
-* various buglets fixed.
-
-Overview of Changes in GTK+ 1.2.3:
-
-* Upgrade to libtool 1.3
-* Check for dgettext (for systems with old versions of GNU Gettext)
-* Many bug fixes (see ChangeLog for details)
-
-Overview of Changes in GTK+ 1.2.2:
-
-* Improved Dnd behaviour with Motif applications.
-* Bug fixes for the Gtk selection code.
-* Minor bug fixes to the Gdk Atom cache and Dnd code (with --display option).
-* Bug fixes and leak plugs for the Gdk IM code.
-* Added gtk_object_get() facility to retrieve object arguments easily.
-  The var args list expects ("arg-name", &value) pairs.
-* Fixed mapping for GdkInputCondition<->GIOCondition, this should fix
-  problems where closed pipes were no longer signaling GDK_INPUT_READ on
-  systems with a native poll().
-* Some cleanups to GtkLabel's memory allocation code (shouldn't leak memory
-  anymore).
-* We don't attempt to lookup xpm color "None" anymore, this should prevent
-  eXodus (commercial X windows server) from popping up a color dialog every
-  time a transparent pixmap is created.
-* Fixed bug where Gtk timeout/idle handlers would execute without the global
-  Gdk lock being held.
-* Other minor bug fixes.
-
-Overview of Changes in GTK+ 1.2.1:
-
-* Many Bug fixes have been applied to the menu and accelerator code.
-* GtkItemFactory can "adopt" foreign menu items now and manage their
-  accelerator installation. This is often required to get GtkItemFactory
-  like accelerator propagation between different windows with the same
-  menu hierarchy and for centralized parsing and saving of accelerators.
-* GtkCList/GtkCTree buttons should always display correctly now.
-* Miscellaneous other bug fixes.
-
-What's New in GTK+ 1.2.0 (since 1.0.x):
-
-* New widgets: GtkFontSelector, GtkPacker, GtkItemFactory, GtkCTree,
-  GtkInvisible, GtkCalendar, GtkLayout, GtkPlug, GtkSocket
-* Many new features and robustness for existing widgets
-* Theme support
-* New DND implementation
-* Internationalization of standard dialogs
-* New key binding system
-* Tearoff menus and menu accelerators
-* Wide character support for entry and text
-* Resizing code has been overhauled
-* Queued redraws of partial areas
-* Far better support for object arguments
-* Speed optimizations
-* Runtime loading of dynamic modules
-* Support for GLib log domains
-* Tutorial improvements
-* A bug fix or two
-
-Overview of Changes in GTK+ 1.1.16:
-
-* Major fixes and improvements for handlebox
-* A change to the way widget->requisition works. Now,
-  widget->requisition is always what the widget requested,
-  unmodified by the usize. See Changes-1.2.txt for details.
-  This correct various bugs with gtk_widget_set_usize().
-* Fixes for XIM on X11R5 systems
-* Don't allow cut-and-paste of text in password-style entries
-* --enable-debug is now on by default for the development release.
-  (When compiling for "production", use --enable-debug=minimum)
-* Handle systems where Helvetica is not present more gracefully
-* Fixes for memory leaks
-* CList and CTree fixes
-* Bug fixes for drawing problems. 
-* Miscellaneous bug fixes to GtkLabel, GtkCList, GtkCTree,
-  GtkColorsel, Focusing, DND
-* Tutorial improvements
-
-Overview of Changes in GTK+ 1.1.15:
-
-* Tutorial Updates
-* Added --libs gthread to gtk-config 
-* Bug fixes
-
-What is new in GTK+ 1.1.14:
-
-* Additions to docs/Changes-1.2.txt
-* Just warn when loading theme engine fails
-* CLAMP GtkScale digits to a meaningful range
-* GTK_LOCALDIR is now defined in a better fashion
-* New functions (feature freeze, we know...):
-    gtk_menu_set_title()
-    gtk_toggle_button_get_active()
-* Some locale fixups in gtkrc code
-* Fixes to make gtk_radio_button_set_group() keep only
-  one radio button in the group active
-* Foreign windows are now always treated as viewable; this fixes
-  a problem where updating didn't occur properly in GtkPlug
-* DND fixes for 64 bit architectures, and for specifying operations 
-  with modifier keys.
-* Major revisions to GtkLayout: avoid having to create window
-  for NO_WINDOW children, adjust allocations of children as 
-  scrolled so queued draws work, and a resize is queued instead
-  of allocating directly in a put() or move()
-
-What is new in GTK+ 1.1.13:
-
-* Dnd and selection bug fixes and memory purification.
-* Widget sensitivity fixups.
-* Tooltips windows are now named "gtk-tooltips" so rc file rules
-  can match tooltips windows. Fixed interaction of tooltips and NO_WINDOW
-  widgets.
-* Spin buttons now update their values upon value retrieval.
-* Overhaul of the resizing vs. redrawing logic to reduce redrawing needs
-  a lot. Gtk makes full use of the draw_area coalescing code now, which
-  got minorly improved as well.
-* Containers map their Gdk windows after their children now to reduce
-  expose event generation.
-* Gdk event queue fixups, this solves the double-click problems people were
-  recently having.
-* Account for the fact that GSource's are only properly reentrant from
-  within dispatch(), thus we don't do Gdk event processing from within
-  check() or prepare() anymore.
-* Rc files feature a bg_pixmap value of "<none>" now.
-* Improved session management support in Gdk.  
-* Automatic disabling of NLS if no gettext is found should work now.
-* Removed deprecated functions, docs/Changes-1.2.txt gives an overview.
-* Gtk+ development now requires GNU autoconf 2.13, GNU automake 1.4
-  and GNU libtool 1.2d.
-* More bug fixes all over the place.
-
-What is new in GTK+ 1.1.12:
-
-* Korean translation added
-* Fixed memory leaks
-* A few other bug fixes
-
-What is new in GTK+ 1.1.11:
-
-* Dutch, Japanese, Swedish, Polish, and Norwegian translations
-* Removed deprecated _interp variants: gtk_container_foreach_interp, 
-  gtk_idle_add_interp, gtk_timeout_add_interp, gtk_signal_connect_interp
-* Lots of cast corrections
-* Many fixes 
-
-What is new in GTK+ 1.1.9:
-
-* Check for broken glibc 2.0 mb functions and avoid them
-* Label and Entry display fixes 
-* Move main thread back to GDK, for locking when translating events
-* Bug fixes
-
-What is new in GTK+ 1.1.8:
-
-* Added support for gettext and the localization of the standard
-  dialogs.
-* Added line-wrapping for the label, and JUSTIFY_FILL
-* Support reordering via drag and drop in  CList and CTree.
-* Replaced GtkDrawWindow widget with a GTK_USER_DRAW flag
-* Extended gtkpaned API to support minimum sizes and proportional
-  resizing.
-* Changed the handling of shared memory segments so as to 
-  remove the need for GTK+ to set up signal handlers.
-* Re-implemented event loop in terms of the event loop
-  that has been added to GLib 1.1.8
-* Added 'grab_focus' signal to allow keyboard accelerators
-  for entries.
-* Load locale specific RC files if present.
-* Bug fixes.
-
-What is new in GTK+ 1.1.7:
-
-* Fixed memory mis-allocation in default files code
-* Various event handling fixes
-* Wide character support for entry and text
-* Destroy widgets _after_ propagating unrealize signals through 
-  widget hierarchy
-* Only build XIM-support if available
-* Tutorial and examples updates
-* Added gtk_drag_source_unset()
-
-What is new in GTK+ 1.1.6:
-
-* The signal system now features emission hooks with special semantics,
-  refer to the ChangeLog for this.
-* Minor? speedups and memory reductions to the emission handling of the
-  signal system.
-* _interp() function variants are deprecated now. the corresponding *_full()
-  variants are provided for a long time now.
-* Dnd abort timeout increased to 10 minutes.
-* GtkScrolledWindow inherits from GtkBin now.
-* GTK_POLICY_NEVER is implemented for scrolled windows now.
-* Lots of API clean ups.
-* Incremental freezing abilities.
-* Integrated widgets from the GNOME tree: GtkLayout, GtkPlug and GtkSocket.
-* New window functions for transient relationship, default size, and 
-  geometry hints
-* Default rc files are now read in (<sysconfdir/etc/gtkrc and ~/.gtkrc)
-  GTK_RC_FILES environment variable and functions are provided to configure
-  this behavior
-* Read doc/Changes-1.2.txt to properly adapt your code.
-* Bug Fixes.
-
-What is new in GTK+ 1.1.5:
-
-* Theme integration
-* Widget style modification is now handled through GtkRcStyles
-* GtkPixmaps now grey out pixmaps when insensitive
-* Notebook enhancements
-* Shadow configurability for menubars and handleboxes
-* DND enhancements
-* gtkfilesel now supports automounters better
-* Implementation of expose compression
-* Queued redraws of partial areas
-* Scrolledwindow (+Viewport) source incompatibilities, children that are added
-  to a scrolled window don't get an automatic viewport anymore. a convenience
-  function gtk_scrolled_window_add_with_viewport() is supplied for this task
-* Deprecated functions will now issue a message, informing the programmer about
-  the use of this function. These functions will get removed in future versions
-* Non-functional functions got removed entirely
-* gtk_widget_new() and gtk_object_new() will now auto-construct new objects.
-  A new function gtk_object_default_construct() is provided now which should
-  be called after every gtk_type_new() to perform the auto-construction
-* Improved argument support of several widgets
-* Bug Fixes
-
-What is new in GTK+ 1.1.3:
-
-* GtkCList/GtkCTree now have the ability to:
-    - hide/show individual columns
-    - disable/enable column resizing
-    - set min and max for column widths
-    - set expander style of the ctree
-    - set/get row and cell styles
-    - set spacing between tree expander and cell contents in ctree
-    - toggle auto_resize for columns
-* Must enhanced DND support, removed old DND code
-* Idle functions are now implemented via GHook, giving a slight speed
-  improvement
-* An environment variable GTK_MODULES which takes a colon separated
-  list of module names GTK+ will now automatically load at gtk_init() startup
-* GtkFontSel now has support for an extra 'base' filter
-* New function gdk_window_set_root_origin to get the real geometry taking
-  into account window manager offsets
-* New function gtk_text_set_line_wrap to toggle line wrapping
-* New function gtk_widget_add_events which safely adds additional
-  events to a widget's event mask
-* New function gdk_event_get_time to get the timestamp from a generic
-  event
-* New widget GtkCalendar
-* New widget GtkInvisible - InputOnly offscreen windows used for reliable
-  pointer grabs and selection handling in DND code
-* New functions gtk_object_remove_no_notify[_by_id] to remove a certain
-  data portion without invocation of its destroy notifier 
-* gtk_spin_button_construct is now deprecated, use gtk_spin_button_configure
-  instead 
-* gtk_clist_set_border is now deprecated, use gtk_clist_set_shadow_type 
-  instead
-* Removed functions gtk_object_set_data_destroy[_by_id] 
-* Documentation additions/updates 
-* HTML and plain text files are now included in the distribution
-* Bug fixes, typeness corrections, and general fixups
-
-What is new in GTK+ 1.1.2:
-
-* Gtk+ is now featuring runtime loading of dynamic modules via the
-  --gtk-modules= command line switch. such modules have to export a
-  G_MODULE_EXPORT void gtk_module_init (gint *argc, gchar ***argv);
-  function which will be invoked to initialize the module. since such
-  modules may create new widget types, they are always resident.
-* The tutorial has been updated again.
-* Changes to menus including tearoff menus and accelerators.
-* Better support for modal dialogs.
-* Removed CAN_FOCUS by default from scrollbars and button children of toolbar.
-* More improvements and fixes for GtkCList and GtkCTree (i.e. row sorting).
-* GtkCTree rows can be unselectable now.
-* The GtkCTree API has undergone major renames (see ChangeLog entry from Lars
-  Hamann on Tue Aug 18 00:29:13 1998).
-* A bunch of varargs functions changed to get va_lists working on systems that
-  implement va_lists as arrays.
-* Improvements to the gdkrgb code.
-* Improvements to Gdk color handling so we greatly reduce server traffic and
-  don't leak colors anymore.
-* Improved internal widget tree iterators (the GtkContainer::foreach signal
-  vanished because of this).
-* Option menus can have the keyboard focus now.
-* More fixups to the text widget.
-* GtkFileSelection should behave much more nicely in combination with AFS now.
-* Support for label underlining.
-* Support for GLib 1.1.3 log domains.
-* Documentation improvements.
-* Configuration fixes on various platforms.
-* Miscellaneous fixes to XInput support.
-* Build with shared library dependencies on Linux
-* Fix for a major bug in the type systems memory allocation code that could
-  cause random crashes.
-* Libtool update to version 1.2b.
-* Lots of bugfixes and cleanups again ;)
-
-
-What is new in GTK+ 1.1.1:
-
-* Tutorial updates and additions.
-* Key binding support for GtkListItems and GtkList.
-* Extended selection mode and autoscrolling for GtkLists.
-* A GtkCtree now operates on GtkCTreeNode* structures rather than GList*.
-* GtkCTreeNodes can now be created from GNode trees.
-* Bug fixes for GtkNotebook, GtkCList, GtkCombo and GdkWindow reparentation.
-
-
-What is new in GTK+ 1.1.0:
-
-* New widget GtkFontSelector.
-* New featureful progress bar.
-* New container widget GtkPacker.
-* New object GtkItemFactory, GtkMenuFactory is deprecated.
-* New key binding system, configurable via rcfiles, similar to styles.
-* New widget GtkCTree with drag selections and keyboard movement and
-  and horizontal scrolling. Features also implemented for GtkCList.
-* Significant speedups to widget creation and destruction through caching
-  colormap and visual queries to the XServer.
-* Speedups for type creation and especially gtk_type_is_a() checks.
-* Speedups in signal lookup, creation and emissions and connection handling.
-* Minor speedups with object data allocation and destruction.
-* Additions to the signal handling API (e.g. *_emitv).
-* Support for rc-file reparsing.
-* Resizing logic is now implemented on container widget basis, rather than
-  for toplevel GtkWindows only.
-* Buttons support relief styles now.
-* Some widgets are now allocated through memchunks to behave more memory wise.
-* Newly included file gtkfeatures.h which defines compatibility macros to
-  test for certain API features upon program compilation.
-* Child arguments support for container widgets.
-* Far better support for object arguments, revamp of the underlying
-  mechanism for speed and reusability. Child/object arguments don't
-  need to be preceded by the "GtkType::" portion anymore.
-* Removed GtkAcceleratorTable in favour of GtkAccelGroup, accelerator display
-  is now performed by a new widget GtkAccelLabel.
-* Overhaul of the resizing code. Resizing behaviour can now be specified
-  on GtkContainer basis, so the underlying algorithm isn't only available
-  for GtkWindows.
-* GtkTables are now fully resizable.
-* The GtkType system now supports an additional base class initialization
-  function.
-* GtkStyles and key bindings can now be looked up depending on the base
-  types of a widget, through a new keyword `class' in rc files.
-* GtkButton derives from GtkBin (finally).  
-* More descriptive error messages on rc parsing.  
-* Runtime information is available to query enum/flag definition values.
-* Upgrade to libtool-1.2
-* Legions of bug fixes, memory leaks, segfaults, of-by-something errors...
-  including those that already went into the 1.0.x branch.
-* A big bunch of features and cosmetic fixups that just got lost in
-  the masses of changesonfigure problem when cross-compiling
--- a/NEWS.pre-3.0
+++ b/NEWS.pre-3.0
--- 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
 -------------------

@@ -31,18 +29,13 @@ Information about mailing lists can be found at

  - http://www.gtk.org/mailing-lists.php

-Nightly documentation can be found at
-  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
-  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk/
-  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk/
-
 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)

@@ -66,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:
@@ -112,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:

@@ -127,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.
@@ -140,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,74 +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-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",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "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,74 +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-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",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "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

@@ -286,10 +280,6 @@
 /* Define to 1 if linux/memfd.h exists */
 #mesondefine HAVE_LINUX_MEMFD_H

-#mesondefine HAVE_LINUX_INPUT_H
-
-#mesondefine HAVE_DEV_EVDEV_INPUT_H
-
 #mesondefine GTK_SYSCONFDIR

 #mesondefine GTK_LOCALEDIR
@@ -299,19 +289,3 @@
 #mesondefine GTK_LIBDIR

 #mesondefine GTK_PRINT_BACKENDS
-
-#mesondefine HAVE_HARFBUZZ
-
-#mesondefine HAVE_PANGOFT
-
-#mesondefine ISO_CODES_PREFIX
-
-#mesondefine MALLOC_IS_ALIGNED16
-
-#mesondefine HAVE_POSIX_MEMALIGN
-
-#mesondefine HAVE_MEMALIGN
-
-#mesondefine HAVE_ALIGNED_ALLOC
-
-#mesondefine HAVE__ALIGNED_MALLOC
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -457,44 +457,34 @@ 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)
+static gboolean
+demo_application_window_state_event (GtkWidget           *widget,
+                                     GdkEventWindowState *event)
 {
  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
-  GdkSurfaceState new_state;
+  gboolean res = GDK_EVENT_PROPAGATE;
+  GdkWindowState changed, 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;
-}
+  if (GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event)
+    res = GTK_WIDGET_CLASS (demo_application_window_parent_class)->window_state_event (widget, event);

-static void
-demo_application_window_realize (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->realize (widget);
+  gdk_event_get_window_state ((GdkEvent *)event, &changed, &new_state);
+  window->maximized = (new_state & GDK_WINDOW_STATE_MAXIMIZED) != 0;
+  window->fullscreen = (new_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;

-  g_signal_connect_swapped (gtk_widget_get_surface (widget), "notify::state",
-                            G_CALLBACK (surface_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);
-
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->unrealize (widget);
+  return res;
 }

 static void
@@ -516,8 +506,7 @@ demo_application_window_class_init (DemoApplicationWindowClass *class)
  object_class->constructed = demo_application_window_constructed;

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

  gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");
--- 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,33 +68,32 @@ 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;
    }

  return widget ? gtk_widget_get_toplevel (widget) : NULL;
 }

-static void
-released_cb (GtkGestureMultiPress *gesture,
-             guint                 n_press,
-             gdouble               x,
-             gdouble               y,
-             gboolean             *clicked)
+static gboolean
+button_release_event_cb (GtkWidget       *widget,
+                         GdkEventButton  *event,
+                         gboolean        *clicked)
 {
  *clicked = TRUE;
+  return TRUE;
 }

 /* Asks the user to click on a window, then waits for them click
@@ -128,26 +127,22 @@ 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)
    {
-      GtkGesture *gesture = gtk_gesture_multi_press_new ();
      gboolean clicked = FALSE;

-      g_signal_connect (gesture, "released",
-                        G_CALLBACK (released_cb), &clicked);
-      gtk_widget_add_controller (popup, GTK_EVENT_CONTROLLER (gesture));
+      g_signal_connect (popup, "button-release-event",
+                        G_CALLBACK (button_release_event_cb), &clicked);

-      /* Process events until clicked is set by our button release event handler.
+      /* Process events until clicked is set by button_release_event_cb.
       * We pass in may_block=TRUE since we want to wait if there
       * are no events currently.
       */
      while (!clicked)
        g_main_context_iteration (NULL, TRUE);

-      gdk_seat_ungrab (gdk_device_get_seat (device));
-
      toplevel = find_toplevel_at_pointer (display);
      if (toplevel == popup)
        toplevel = NULL;
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -1,6 +1,6 @@
 /* Clipboard
 *
- * GdkClipboard is used for clipboard handling. This demo shows how to
+ * GtkClipboard is used for clipboard handling. This demo shows how to
 * copy and paste text to and from the clipboard.
 *
 * It also shows how to transfer images via the clipboard or via
@@ -13,104 +13,71 @@
 #include <gtk/gtk.h>
 #include <string.h>

-static GtkWidget *window = NULL;
-
 void
 copy_button_clicked (GtkWidget *button,
                     gpointer   user_data)
 {
  GtkWidget *entry;
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;

  entry = GTK_WIDGET (user_data);

  /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry);
+  clipboard = gtk_widget_get_clipboard (entry,
+                                        GDK_SELECTION_CLIPBOARD);

  /* Set clipboard text */
-  gdk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)));
+  gtk_clipboard_set_text (clipboard, gtk_entry_get_text (GTK_ENTRY (entry)), -1);
 }

 void
-paste_received (GObject      *source_object,
-                GAsyncResult *result,
+paste_received (GtkClipboard *clipboard,
+                const gchar  *text,
                gpointer      user_data)
 {
-  GdkClipboard *clipboard;
  GtkWidget *entry;
-  char *text;
-  GError *error = NULL;

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

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

 void
 paste_button_clicked (GtkWidget *button,
-                      gpointer   user_data)
+                     gpointer   user_data)
 {
  GtkWidget *entry;
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;

  entry = GTK_WIDGET (user_data);

  /* Get the clipboard object */
-  clipboard = gtk_widget_get_clipboard (entry);
+  clipboard = gtk_widget_get_clipboard (entry,
+                                        GDK_SELECTION_CLIPBOARD);

  /* Request the contents of the clipboard, contents_received will be
     called when we do get the contents.
   */
-  gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
+  gtk_clipboard_request_text (clipboard,
+                              paste_received, entry);
 }

-static GdkPaintable *
-get_image_paintable (GtkImage *image)
+static cairo_surface_t *
+get_image_surface (GtkImage *image)
 {
  const gchar *icon_name;
  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;

  switch (gtk_image_get_storage_type (image))
    {
-    case GTK_IMAGE_PAINTABLE:
-      return g_object_ref (gtk_image_get_paintable (image));
+    case GTK_IMAGE_SURFACE:
+      return cairo_surface_reference (gtk_image_get_surface (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_theme_load_surface (icon_theme, icon_name, 48, 1, NULL, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
    default:
      g_warning ("Image storage type %d not handled",
                 gtk_image_get_storage_type (image));
@@ -120,46 +87,50 @@ get_image_paintable (GtkImage *image)

 static void
 drag_begin (GtkWidget      *widget,
-            GdkDrag        *drag,
+            GdkDragContext *context,
            gpointer        data)
 {
-  GdkPaintable *paintable;
+  cairo_surface_t *surface;

-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (paintable)
+  surface = get_image_surface (GTK_IMAGE (widget));
+  if (surface)
    {
-      gtk_drag_set_icon_paintable (drag, paintable, -2, -2);
-      g_object_unref (paintable);
+      cairo_surface_set_device_offset (surface, -2, -2);
+      gtk_drag_set_icon_surface (context, surface);
    }
 }

 void
 drag_data_get (GtkWidget        *widget,
-               GdkDrag          *drag,
+               GdkDragContext   *context,
               GtkSelectionData *selection_data,
               guint             info,
+               guint             time,
               gpointer          data)
 {
-  GdkPaintable *paintable;
+  cairo_surface_t *surface;

-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (GDK_IS_TEXTURE (paintable))
-    gtk_selection_data_set_texture (selection_data, GDK_TEXTURE (paintable));
+  surface = get_image_surface (GTK_IMAGE (data));
+  if (surface)
+    gtk_selection_data_set_surface (selection_data, surface);
 }

 static void
 drag_data_received (GtkWidget        *widget,
-                    GdkDrop          *drop,
+                    GdkDragContext   *context,
+                    gint              x,
+                    gint              y,
                    GtkSelectionData *selection_data,
+                    guint32           time,
                    gpointer          data)
 {
  if (gtk_selection_data_get_length (selection_data) > 0)
    {
-      GdkTexture *texture;
+      cairo_surface_t *surface;

-      texture = gtk_selection_data_get_texture (selection_data);
-      gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
-      g_object_unref (texture);
+      surface = gtk_selection_data_get_surface (selection_data);
+      gtk_image_set_from_surface (GTK_IMAGE (data), surface);
+      cairo_surface_destroy (surface);
    }
 }

@@ -167,82 +138,78 @@ static void
 copy_image (GtkMenuItem *item,
            gpointer     data)
 {
-  GdkClipboard *clipboard;
-  GdkPaintable *paintable;
+  GtkClipboard *clipboard;
+  cairo_surface_t *surface;

-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  paintable = get_image_paintable (GTK_IMAGE (data));
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  surface = get_image_surface (GTK_IMAGE (data));

-  if (GDK_IS_TEXTURE (paintable))
-    gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
-
-  if (paintable)
-    g_object_unref (paintable);
-}
-
-static void
-paste_image_received (GObject      *source,
-                      GAsyncResult *result,
-                      gpointer      data)
-{
-  GdkTexture *texture;
-
-  texture = gdk_clipboard_read_texture_finish (GDK_CLIPBOARD (source), result, NULL);
-  if (texture == NULL)
-    return;
-    
-  gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
+  if (surface)
+    {
+      gtk_clipboard_set_surface (clipboard, surface);
+      cairo_surface_destroy (surface);
+    }
 }

 static void
 paste_image (GtkMenuItem *item,
             gpointer     data)
 {
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
+  cairo_surface_t *surface;

-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  gdk_clipboard_read_texture_async (clipboard,
-                                    NULL,
-                                    paste_image_received,
-                                    data);
+  clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  surface = gtk_clipboard_wait_for_surface (clipboard);
+
+  if (surface)
+    {
+      gtk_image_set_from_surface (GTK_IMAGE (data), surface);
+      cairo_surface_destroy (surface);
+    }
 }

-static void
-pressed_cb (GtkGesture *gesture,
-            int         n_press,
-            double      x,
-            double      y,
-            GtkWidget  *image)
+static gboolean
+button_press (GtkWidget      *widget,
+              GdkEventButton *event,
+              gpointer        data)
 {
  GtkWidget *menu;
  GtkWidget *item;
+  guint button;
+
+  gdk_event_get_button ((GdkEvent *)event, &button);
+
+  if (button != GDK_BUTTON_SECONDARY)
+    return FALSE;

  menu = gtk_menu_new ();

  item = gtk_menu_item_new_with_mnemonic (_("_Copy"));
-  g_signal_connect (item, "activate", G_CALLBACK (copy_image), image);
+  g_signal_connect (item, "activate", G_CALLBACK (copy_image), data);
  gtk_widget_show (item);
  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);

  item = gtk_menu_item_new_with_mnemonic (_("_Paste"));
-  g_signal_connect (item, "activate", G_CALLBACK (paste_image), image);
+  g_signal_connect (item, "activate", G_CALLBACK (paste_image), data);
  gtk_widget_show (item);
  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);

-  gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+  gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) event);
+  return TRUE;
 }

 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
+  static GtkWidget *window = NULL;
+
  if (!window)
    {
      GtkWidget *vbox, *hbox;
      GtkWidget *label;
      GtkWidget *entry, *button;
      GtkWidget *image;
-      GtkGesture *gesture;
+      GtkClipboard *clipboard;

      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_display (GTK_WINDOW (window),
@@ -319,10 +286,8 @@ do_clipboard (GtkWidget *do_widget)
                        G_CALLBACK (drag_data_received), image);

      /* context menu on image */
-      gesture = gtk_gesture_multi_press_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
-      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
+      g_signal_connect (image, "button-press-event",
+                        G_CALLBACK (button_press), image);

      /* Create the second image */
      image = gtk_image_new_from_icon_name ("process-stop");
@@ -344,10 +309,12 @@ do_clipboard (GtkWidget *do_widget)
                        G_CALLBACK (drag_data_received), image);

      /* context menu on image */
-      gesture = gtk_gesture_multi_press_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
-      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
+      g_signal_connect (image, "button-press-event",
+                        G_CALLBACK (button_press), image);
+
+      /* tell the clipboard manager to make the data persistent */
+      clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+      gtk_clipboard_set_can_store (clipboard, NULL);
    }

  if (!gtk_widget_get_visible (window))
--- 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
@@ -105,6 +105,9 @@
    <file>gnome-fs-directory.png</file>
    <file>gnome-fs-regular.png</file>
  </gresource>
+  <gresource prefix="/stack">
+    <file>stack.ui</file>
+  </gresource>
  <gresource prefix="/shortcuts">
    <file>shortcuts.ui</file>
    <file>shortcuts-builder.ui</file>
@@ -112,21 +115,12 @@
    <file>shortcuts-clocks.ui</file>
    <file>shortcuts-boxes.ui</file>
  </gresource>
-  <gresource prefix="/sliding_puzzle">
-    <file>puzzlepiece.c</file>
-    <file>puzzlepiece.h</file>
-    <file>portland-rose.jpg</file>
-  </gresource>
-  <gresource prefix="/stack">
-    <file>stack.ui</file>
-  </gresource>
  <gresource prefix="/revealer">
    <file>revealer.ui</file>
  </gresource>
  <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>
@@ -157,17 +151,17 @@
    <file>cursors.c</file>
    <file>dialog.c</file>
    <file>drawingarea.c</file>
-    <file>dnd.c</file>
    <file>editable_cells.c</file>
    <file>entry_buffer.c</file>
    <file>entry_completion.c</file>
+    <file>event_axes.c</file>
    <file>expander.c</file>
    <file>filtermodel.c</file>
    <file>fishbowl.c</file>
+    <file>widgetbowl.c</file>
    <file>flowbox.c</file>
    <file>foreigndrawing.c</file>
    <file>font_features.c</file>
-    <file>fontplane.c</file>
    <file>gestures.c</file>
    <file>glarea.c</file>
    <file>headerbar.c</file>
@@ -184,11 +178,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>
@@ -202,7 +192,6 @@
    <file>shortcuts.c</file>
    <file>sizegroup.c</file>
    <file>sidebar.c</file>
-    <file>sliding_puzzle.c</file>
    <file>stack.c</file>
    <file>spinbutton.c</file>
    <file>spinner.c</file>
@@ -210,10 +199,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>
@@ -234,7 +223,6 @@
  </gresource>
  <gresource prefix="/font_features">
    <file>font-features.ui</file>
-    <file>fontplane.c</file>
  </gresource>
  <gresource prefix="/spinbutton">
    <file>spinbutton.ui</file>
@@ -258,7 +246,4 @@
  <gresource prefix="/modelbutton">
    <file>modelbutton.ui</file>
  </gresource>
-  <gresource prefix="/dnd">
-    <file>dnd.css</file>
-  </gresource>
 </gresources>
--- 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
@@ -1,378 +0,0 @@
-/* Drag-and-Drop
- *
- * I can't believe its not glade!
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <string.h>
-
-typedef struct _GtkDemoWidget GtkDemoWidget;
-struct _GtkDemoWidget
-{
-  GType type;
-  union {
-    char *text;
-    gboolean active;
-  };
-};
-
-static gpointer
-copy_demo_widget (gpointer data)
-{
-  GtkDemoWidget *demo = g_memdup (data, sizeof (GtkDemoWidget));
-
-  if (demo->type == GTK_TYPE_LABEL)
-    demo->text = g_strdup (demo->text);
-
-  return demo;
-}
-
-static void
-free_demo_widget (gpointer data)
-{
-  GtkDemoWidget *demo = data;
-
-  if (demo->type == GTK_TYPE_LABEL)
-    g_free (demo->text);
-
-  g_free (demo);
-}
-
-#define GTK_TYPE_DEMO_WIDGET (gtk_demo_widget_get_type ())
-
-G_DEFINE_BOXED_TYPE (GtkDemoWidget, gtk_demo_widget, copy_demo_widget, free_demo_widget)
-
-static GtkDemoWidget *
-serialize_widget (GtkWidget *widget)
-{
-  GtkDemoWidget *demo;
-
-  demo = g_new0 (GtkDemoWidget, 1);
-  demo->type = G_OBJECT_TYPE (widget);
-
-  if (GTK_IS_LABEL (widget))
-    {
-      demo->text = g_strdup (gtk_label_get_text (GTK_LABEL (widget)));
-    }
-  else if (GTK_IS_SPINNER (widget))
-    {
-      g_object_get (widget, "active", &demo->active, NULL);
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
-
-  return demo;
-}
-
-static GtkWidget *
-deserialize_widget (GtkDemoWidget *demo)
-{
-  GtkWidget *widget = NULL;
-
-  if (demo->type == GTK_TYPE_LABEL)
-    {
-      widget = gtk_label_new (demo->text);
-    }
-  else if (demo->type == GTK_TYPE_SPINNER)
-    {
-      widget = g_object_new (demo->type, "active", demo->active, NULL);
-      gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
-
-  return widget;
-}
-
-static double pos_x, pos_y;
-
-static void
-new_label_cb (GtkMenuItem *item,
-              gpointer     data)
-{
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
-
-  widget = gtk_label_new ("Label");
-  gtk_fixed_put (fixed, widget, pos_x, pos_y);
-}
-
-static void
-new_spinner_cb (GtkMenuItem *item,
-                gpointer     data)
-{
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
-
-  widget = gtk_spinner_new ();
-  gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
-  gtk_spinner_start (GTK_SPINNER (widget));
-  gtk_fixed_put (fixed, widget, pos_x, pos_y);
-}
-
-static void
-copy_cb (GtkWidget *child)
-{
-  GdkClipboard *clipboard;
-  GtkDemoWidget *demo;
-
-  g_print ("Copy %s\n", G_OBJECT_TYPE_NAME (child));
-
-  demo = serialize_widget (child);
-
-  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-  gdk_clipboard_set (clipboard, GTK_TYPE_DEMO_WIDGET, demo);
-}
-
-static void
-delete_cb (GtkWidget *child)
-{
-  gtk_widget_destroy (child);
-}
-
-static void
-cut_cb (GtkWidget *child)
-{
-  copy_cb (child);
-  delete_cb (child);
-}
-
-static void
-value_read (GObject      *source,
-            GAsyncResult *res,
-            gpointer      data)
-{
-  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
-  GError *error = NULL;
-  const GValue *value;
-  GtkDemoWidget *demo;
-  GtkWidget *widget = NULL;
-
-  value = gdk_clipboard_read_value_finish (clipboard, res, &error);
-
-  if (value == NULL)
-    {
-      g_print ("error: %s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  if (!G_VALUE_HOLDS (value, GTK_TYPE_DEMO_WIDGET))
-    {
-      g_print ("can't handle clipboard contents\n");
-      return;
-    }
-
-  demo = g_value_get_boxed (value);
-  widget = deserialize_widget (demo);
-
-  gtk_fixed_put (GTK_FIXED (data), widget, pos_x, pos_y);
-}
-
-static void
-paste_cb (GtkWidget *fixed)
-{
-  GdkClipboard *clipboard;
-
-  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-  if (gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET))
-    {
-      g_print ("Paste %s\n", g_type_name (GTK_TYPE_DEMO_WIDGET));
-      gdk_clipboard_read_value_async (clipboard, GTK_TYPE_DEMO_WIDGET, 0, NULL, value_read, fixed);
-    }
-  else
-    g_print ("Don't know how to handle clipboard contents\n");
-}
-
-static void
-edit_label_done (GtkWidget *entry, gpointer data)
-{
-  GtkWidget *fixed = gtk_widget_get_parent (entry);
-  GtkWidget *label;
-  int x, y;
-
-  gtk_container_child_get (GTK_CONTAINER (fixed), entry, "x", &x, "y", &y, NULL);
-
-  label = GTK_WIDGET (g_object_get_data (G_OBJECT (entry), "label"));
-  gtk_label_set_text (GTK_LABEL (label), gtk_entry_get_text (GTK_ENTRY (entry)));
-
-  gtk_widget_destroy (entry);
-}
-
-static void
-edit_cb (GtkWidget *child)
-{
-  GtkWidget *fixed = gtk_widget_get_parent (child);
-  int x, y;
-
-  gtk_container_child_get (GTK_CONTAINER (fixed), child, "x", &x, "y", &y, NULL);
-
-  if (GTK_IS_LABEL (child))
-    {
-      GtkWidget *entry = gtk_entry_new ();
-
-      g_object_set_data (G_OBJECT (entry), "label", child);
-
-      gtk_entry_set_text (GTK_ENTRY (entry), gtk_label_get_text (GTK_LABEL (child)));
-      g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
-      gtk_fixed_put (GTK_FIXED (fixed), entry, x, y);
-      gtk_widget_grab_focus (entry);
-    }
-  else if (GTK_IS_SPINNER (child))
-    {
-      gboolean active;
-
-      g_object_get (child, "active", &active, NULL);
-      g_object_set (child, "active", !active, NULL);
-    }
-}
-
-static void
-pressed_cb (GtkGesture *gesture,
-            int         n_press,
-            double      x,
-            double      y,
-            gpointer    data)
-{
-  GtkWidget *widget;
-  GtkWidget *child;
-
-  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y);
-
-  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
-    {
-      GdkRectangle rect;
-      GtkWidget *menu;
-      GtkWidget *item;
-      GdkClipboard *clipboard;
-
-      pos_x = x;
-      pos_y = y;
-
-      menu = gtk_menu_new ();
-      item = gtk_menu_item_new_with_label ("New Label");
-      g_signal_connect (item, "activate", G_CALLBACK (new_label_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("New Spinner");
-      g_signal_connect (item, "activate", G_CALLBACK (new_spinner_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_separator_menu_item_new ();
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_menu_item_new_with_label ("Edit");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (edit_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_separator_menu_item_new ();
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      item = gtk_menu_item_new_with_label ("Cut");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (cut_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Copy");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (copy_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Paste");
-      clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-      gtk_widget_set_sensitive (item,
-                                gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET));
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (paste_cb), widget);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-      item = gtk_menu_item_new_with_label ("Delete");
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect_swapped (item, "activate", G_CALLBACK (delete_cb), child);
-      gtk_container_add (GTK_CONTAINER (menu), item);
-
-      rect.x = x;
-      rect.y = y;
-      rect.width = 0;
-      rect.height = 0;
-
-      gtk_menu_popup_at_rect (GTK_MENU (menu),
-                              gtk_widget_get_surface (widget),
-                              &rect,
-                              GDK_GRAVITY_NORTH_WEST,
-                              GDK_GRAVITY_NORTH_WEST,
-                              NULL);
-
-      return;
-    }
-}
-
-static void
-released_cb (GtkGesture *gesture,
-             int         n_press,
-             double      x,
-             double      y,
-             gpointer    data)
-{
-  GtkWidget *widget;
-  GtkWidget *child;
-
-  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y);
-
-  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
-    {
-      if (child != NULL && child != widget)
-        edit_cb (child);
-    }
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_dnd (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *vbox, *fixed;
-      GtkGesture *multipress;
-      GtkCssProvider *provider;
-
-      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), "Drag-and-drop");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      fixed = gtk_fixed_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), fixed);
-      gtk_widget_set_hexpand (fixed, TRUE);
-      gtk_widget_set_vexpand (fixed, TRUE);
-
-      multipress = gtk_gesture_multi_press_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (multipress), 0);
-      g_signal_connect (multipress, "pressed", G_CALLBACK (pressed_cb), NULL);
-      g_signal_connect (multipress, "released", G_CALLBACK (released_cb), NULL);
-      gtk_widget_add_controller (fixed, GTK_EVENT_CONTROLLER (multipress));
-
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_resource (provider, "/dnd/dnd.css");
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  800);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/dnd.css
+++ b/demos/gtk-demo/dnd.css
@@ -1,3 +0,0 @@
-spinner.demo {
-  opacity: 1;
-}
--- 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,41 +86,45 @@ 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;
-static double start_y;
-
-static void
-drag_begin (GtkGestureDrag *gesture,
-            double          x,
-            double          y,
-            GtkWidget      *area)
+static gboolean
+scribble_button_press_event (GtkWidget      *widget,
+                             GdkEventButton *event,
+                             gpointer        data)
 {
-  start_x = x;
-  start_y = y;
+  double x, y;
+  guint button;

-  draw_brush (area, x, y);
+  gdk_event_get_button ((GdkEvent *)event, &button);
+  gdk_event_get_coords ((GdkEvent *)event, &x, &y);
+
+  if (button == GDK_BUTTON_PRIMARY)
+    draw_brush (widget, x, y);
+
+  /* We've handled the event, stop processing */
+  return TRUE;
 }

-static void
-drag_update (GtkGestureDrag *gesture,
-             double          x,
-             double          y,
-             GtkWidget      *area)
+static gboolean
+scribble_motion_notify_event (GtkWidget      *widget,
+                              GdkEventMotion *event,
+                              gpointer        data)
 {
-  draw_brush (area, start_x + x, start_y + y);
+  double x, y;
+  GdkModifierType state;
+
+  gdk_event_get_state ((GdkEvent *)event, &state);
+  gdk_event_get_coords ((GdkEvent *)event, &x, &y);
+
+  if (state & GDK_BUTTON1_MASK)
+    draw_brush (widget, x, y);
+
+  /* We've handled it, stop processing */
+  return TRUE;
 }

-static void
-drag_end (GtkGestureDrag *gesture,
-          double          x,
-          double          y,
-          GtkWidget      *area)
-{
-  draw_brush (area, start_x + x, start_y + y);
-}

 static void
 checkerboard_draw (GtkDrawingArea *da,
@@ -137,7 +141,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.
   */

@@ -185,7 +189,6 @@ do_drawingarea (GtkWidget *do_widget)
  GtkWidget *vbox;
  GtkWidget *da;
  GtkWidget *label;
-  GtkGesture *drag;

  if (!window)
    {
@@ -244,14 +247,11 @@ do_drawingarea (GtkWidget *do_widget)
      g_signal_connect (da, "size-allocate",
                        G_CALLBACK (scribble_size_allocate), NULL);

-      drag = gtk_gesture_drag_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
-      gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
-
-      g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);
-      g_signal_connect (drag, "drag-update", G_CALLBACK (drag_update), da);
-      g_signal_connect (drag, "drag-end", G_CALLBACK (drag_end), da);
-
+      /* Event signals */
+      g_signal_connect (da, "motion-notify-event",
+                        G_CALLBACK (scribble_motion_notify_event), NULL);
+      g_signal_connect (da, "button-press-event",
+                        G_CALLBACK (scribble_button_press_event), NULL);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/event_axes.c
+++ b/demos/gtk-demo/event_axes.c
@@ -0,0 +1,668 @@
+/* Touch and Drawing Tablets
+ *
+ * Demonstrates advanced handling of event information from exotic
+ * input devices.
+ *
+ * On one hand, this snippet demonstrates management of drawing tablets,
+ * those contain additional information for the pointer other than
+ * X/Y coordinates. Tablet pads events are mapped to actions, which
+ * are both defined and interpreted by the application.
+ *
+ * Input axes are dependent on hardware devices, on linux/unix you
+ * can see the device axes through xinput list <device>. Each time
+ * a different hardware device is used to move the pointer, the
+ * master device will be updated to match the axes it provides,
+ * these changes can be tracked through GdkDevice::changed, or
+ * checking gdk_event_get_source_device().
+ *
+ * On the other hand, this demo handles basic multitouch events,
+ * each event coming from an specific touchpoint will contain a
+ * GdkEventSequence that's unique for its lifetime, so multiple
+ * touchpoints can be tracked.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+typedef struct {
+  GdkDevice *last_source;
+  GdkDeviceTool *last_tool;
+  gdouble *axes;
+  GdkRGBA color;
+  gdouble x;
+  gdouble y;
+} AxesInfo;
+
+typedef struct {
+  GHashTable *pointer_info; /* GdkDevice -> AxesInfo */
+  GHashTable *touch_info; /* GdkEventSequence -> AxesInfo */
+} EventData;
+
+const gchar *colors[] = {
+  "black",
+  "orchid",
+  "fuchsia",
+  "indigo",
+  "thistle",
+  "sienna",
+  "azure",
+  "plum",
+  "lime",
+  "navy",
+  "maroon",
+  "burlywood"
+};
+
+static GtkPadActionEntry pad_actions[] = {
+  { GTK_PAD_ACTION_BUTTON, 1, -1, N_("Nuclear strike"), "pad.nuke" },
+  { GTK_PAD_ACTION_BUTTON, 2, -1, N_("Release siberian methane reserves"), "pad.heat" },
+  { GTK_PAD_ACTION_BUTTON, 3, -1, N_("Release solar flare"), "pad.fry" },
+  { GTK_PAD_ACTION_BUTTON, 4, -1, N_("De-stabilize Oort cloud"), "pad.fall" },
+  { GTK_PAD_ACTION_BUTTON, 5, -1, N_("Ignite WR-104"), "pad.burst" },
+  { GTK_PAD_ACTION_BUTTON, 6, -1, N_("Lart whoever asks about this button"), "pad.lart" },
+  { GTK_PAD_ACTION_RING, -1, -1, N_("Earth axial tilt"), "pad.tilt" },
+  { GTK_PAD_ACTION_STRIP, -1, -1, N_("Extent of weak nuclear force"), "pad.dissolve" },
+};
+
+static const gchar *pad_action_results[] = {
+  "☢",
+  "♨",
+  "☼",
+  "☄",
+  "⚡",
+  "💫",
+  "◑",
+  "⚛"
+};
+
+static guint cur_color = 0;
+static guint pad_action_timeout_id = 0;
+
+static AxesInfo *
+axes_info_new (void)
+{
+  AxesInfo *info;
+
+  info = g_new0 (AxesInfo, 1);
+  gdk_rgba_parse (&info->color, colors[cur_color]);
+
+  cur_color = (cur_color + 1) % G_N_ELEMENTS (colors);
+
+  return info;
+}
+
+static EventData *
+event_data_new (void)
+{
+  EventData *data;
+
+  data = g_new0 (EventData, 1);
+  data->pointer_info = g_hash_table_new_full (NULL, NULL, NULL,
+                                              (GDestroyNotify) g_free);
+  data->touch_info = g_hash_table_new_full (NULL, NULL, NULL,
+                                            (GDestroyNotify) g_free);
+
+  return data;
+}
+
+static void
+event_data_free (EventData *data)
+{
+  g_hash_table_destroy (data->pointer_info);
+  g_hash_table_destroy (data->touch_info);
+  g_free (data);
+}
+
+static void
+update_axes_from_event (GdkEvent  *event,
+                        EventData *data)
+{
+  GdkDevice *device, *source_device;
+  GdkEventSequence *sequence;
+  GdkDeviceTool *tool;
+  GdkEventType type;
+  gdouble x, y;
+  AxesInfo *info;
+
+  device = gdk_event_get_device (event);
+  source_device = gdk_event_get_source_device (event);
+  sequence = gdk_event_get_event_sequence (event);
+  tool = gdk_event_get_device_tool (event);
+  type = gdk_event_get_event_type (event);
+
+  if (type == GDK_TOUCH_END ||
+      type == GDK_TOUCH_CANCEL)
+    {
+      g_hash_table_remove (data->touch_info, sequence);
+      return;
+    }
+  else if (type == GDK_LEAVE_NOTIFY)
+    {
+      g_hash_table_remove (data->pointer_info, device);
+      return;
+    }
+
+  if (!source_device)
+    return;
+
+  if (!sequence)
+    {
+      info = g_hash_table_lookup (data->pointer_info, device);
+
+      if (!info)
+        {
+          info = axes_info_new ();
+          g_hash_table_insert (data->pointer_info, device, info);
+        }
+    }
+  else
+    {
+      info = g_hash_table_lookup (data->touch_info, sequence);
+
+      if (!info)
+        {
+          info = axes_info_new ();
+          g_hash_table_insert (data->touch_info, sequence, info);
+        }
+    }
+
+  if (info->last_source != source_device)
+    info->last_source = source_device;
+
+  if (info->last_tool != tool)
+    info->last_tool = tool;
+
+  g_clear_pointer (&info->axes, g_free);
+
+  if (type == GDK_TOUCH_BEGIN ||
+      type == GDK_TOUCH_UPDATE)
+    {
+      gboolean emulating_pointer;
+
+      gdk_event_get_touch_emulating_pointer (event, &emulating_pointer);
+      if (sequence && emulating_pointer)
+        g_hash_table_remove (data->pointer_info, device);
+    }
+  if (type == GDK_MOTION_NOTIFY ||
+      type == GDK_BUTTON_PRESS ||
+      type == GDK_BUTTON_RELEASE)
+    {
+      gdouble *axes;
+      guint n_axes;
+
+      gdk_event_get_axes (event, &axes, &n_axes);
+      info->axes = g_memdup (axes, sizeof (double) * n_axes);
+    }
+
+  if (gdk_event_get_coords (event, &x, &y))
+    {
+      info->x = x;
+      info->y = y;
+    }
+}
+
+static gboolean
+event_cb (GtkWidget *widget,
+          GdkEvent  *event,
+          gpointer   user_data)
+{
+  update_axes_from_event (event, user_data);
+  gtk_widget_queue_draw (widget);
+  return FALSE;
+}
+
+static void
+render_arrow (cairo_t     *cr,
+              gdouble      x_diff,
+              gdouble      y_diff,
+              const gchar *label)
+{
+  cairo_save (cr);
+
+  cairo_set_source_rgb (cr, 0, 0, 0);
+  cairo_new_path (cr);
+  cairo_move_to (cr, 0, 0);
+  cairo_line_to (cr, x_diff, y_diff);
+  cairo_stroke (cr);
+
+  cairo_move_to (cr, x_diff, y_diff);
+  cairo_show_text (cr, label);
+
+  cairo_restore (cr);
+}
+
+static void
+draw_axes_info (cairo_t       *cr,
+                AxesInfo      *info,
+                int            width,
+                int            height)
+{
+  gdouble pressure, tilt_x, tilt_y, distance, wheel, rotation, slider;
+  GdkAxisFlags axes = gdk_device_get_axes (info->last_source);
+
+  cairo_save (cr);
+
+  cairo_set_line_width (cr, 1);
+  gdk_cairo_set_source_rgba (cr, &info->color);
+
+  cairo_move_to (cr, 0, info->y);
+  cairo_line_to (cr, width, info->y);
+  cairo_move_to (cr, info->x, 0);
+  cairo_line_to (cr, info->x, height);
+  cairo_stroke (cr);
+
+  cairo_translate (cr, info->x, info->y);
+
+  if (!info->axes)
+    {
+      cairo_restore (cr);
+      return;
+    }
+
+  if (axes & GDK_AXIS_FLAG_PRESSURE)
+    {
+      cairo_pattern_t *pattern;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_PRESSURE,
+                           &pressure);
+
+      pattern = cairo_pattern_create_radial (0, 0, 0, 0, 0, 100);
+      cairo_pattern_add_color_stop_rgba (pattern, pressure, 1, 0, 0, pressure);
+      cairo_pattern_add_color_stop_rgba (pattern, 1, 0, 0, 1, 0);
+
+      cairo_set_source (cr, pattern);
+
+      cairo_arc (cr, 0, 0, 100, 0, 2 * G_PI);
+      cairo_fill (cr);
+
+      cairo_pattern_destroy (pattern);
+    }
+
+  if (axes & GDK_AXIS_FLAG_XTILT &&
+      axes & GDK_AXIS_FLAG_YTILT)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_XTILT,
+                           &tilt_x);
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_YTILT,
+                           &tilt_y);
+
+      render_arrow (cr, tilt_x * 100, tilt_y * 100, "Tilt");
+    }
+
+  if (axes & GDK_AXIS_FLAG_DISTANCE)
+    {
+      double dashes[] = { 5.0, 5.0 };
+      cairo_text_extents_t extents;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_DISTANCE,
+                           &distance);
+
+      cairo_save (cr);
+
+      cairo_move_to (cr, distance * 100, 0);
+
+      cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+      cairo_set_dash (cr, dashes, 2, 0.0);
+      cairo_arc (cr, 0, 0, distance * 100, 0, 2 * G_PI);
+      cairo_stroke (cr);
+
+      cairo_move_to (cr, 0, -distance * 100);
+      cairo_text_extents (cr, "Distance", &extents);
+      cairo_rel_move_to (cr, -extents.width / 2, 0);
+      cairo_show_text (cr, "Distance");
+
+      cairo_move_to (cr, 0, 0);
+
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_WHEEL)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_WHEEL,
+                           &wheel);
+
+      cairo_save (cr);
+      cairo_set_line_width (cr, 10);
+      cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
+
+      cairo_new_sub_path (cr);
+      cairo_arc (cr, 0, 0, 100, 0, wheel * 2 * G_PI);
+      cairo_stroke (cr);
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_ROTATION)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_ROTATION,
+                           &rotation);
+      rotation *= 2 * G_PI;
+
+      cairo_save (cr);
+      cairo_rotate (cr, - G_PI / 2);
+      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+      cairo_set_line_width (cr, 5);
+
+      cairo_new_sub_path (cr);
+      cairo_arc (cr, 0, 0, 100, 0, rotation);
+      cairo_stroke (cr);
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_SLIDER)
+    {
+      cairo_pattern_t *pattern, *mask;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_SLIDER,
+                           &slider);
+
+      cairo_save (cr);
+
+      cairo_move_to (cr, 0, -10);
+      cairo_rel_line_to (cr, 0, -50);
+      cairo_rel_line_to (cr, 10, 0);
+      cairo_rel_line_to (cr, -5, 50);
+      cairo_close_path (cr);
+
+      cairo_clip_preserve (cr);
+
+      pattern = cairo_pattern_create_linear (0, -10, 0, -60);
+      cairo_pattern_add_color_stop_rgb (pattern, 0, 0, 1, 0);
+      cairo_pattern_add_color_stop_rgb (pattern, 1, 1, 0, 0);
+      cairo_set_source (cr, pattern);
+      cairo_pattern_destroy (pattern);
+
+      mask = cairo_pattern_create_linear (0, -10, 0, -60);
+      cairo_pattern_add_color_stop_rgba (mask, 0, 0, 0, 0, 1);
+      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 1);
+      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 0);
+      cairo_pattern_add_color_stop_rgba (mask, 1, 0, 0, 0, 0);
+      cairo_mask (cr, mask);
+      cairo_pattern_destroy (mask);
+
+      cairo_set_source_rgb (cr, 0, 0, 0);
+      cairo_stroke (cr);
+
+      cairo_restore (cr);
+    }
+
+  cairo_restore (cr);
+}
+
+static const gchar *
+tool_type_to_string (GdkDeviceToolType tool_type)
+{
+  switch (tool_type)
+    {
+    case GDK_DEVICE_TOOL_TYPE_PEN:
+      return "Pen";
+    case GDK_DEVICE_TOOL_TYPE_ERASER:
+      return "Eraser";
+    case GDK_DEVICE_TOOL_TYPE_BRUSH:
+      return "Brush";
+    case GDK_DEVICE_TOOL_TYPE_PENCIL:
+      return "Pencil";
+    case GDK_DEVICE_TOOL_TYPE_AIRBRUSH:
+      return "Airbrush";
+    case GDK_DEVICE_TOOL_TYPE_MOUSE:
+      return "Mouse";
+    case GDK_DEVICE_TOOL_TYPE_LENS:
+      return "Lens cursor";
+    case GDK_DEVICE_TOOL_TYPE_UNKNOWN:
+    default:
+      return "Unknown";
+    }
+}
+
+static void
+draw_device_info (GtkWidget        *widget,
+                  cairo_t          *cr,
+                  GdkEventSequence *sequence,
+                  gint             *y,
+                  AxesInfo         *info)
+{
+  PangoLayout *layout;
+  GString *string;
+  gint height;
+
+  cairo_save (cr);
+
+  string = g_string_new (NULL);
+  g_string_append_printf (string, "Source: %s",
+                          gdk_device_get_name (info->last_source));
+
+  if (sequence)
+    g_string_append_printf (string, "\nSequence: %d",
+                            GPOINTER_TO_UINT (sequence));
+
+  if (info->last_tool)
+    {
+      const gchar *tool_type;
+      guint64 serial;
+
+      tool_type = tool_type_to_string (gdk_device_tool_get_tool_type (info->last_tool));
+      serial = gdk_device_tool_get_serial (info->last_tool);
+      g_string_append_printf (string, "\nTool: %s", tool_type);
+
+      if (serial != 0)
+        g_string_append_printf (string, ", Serial: %lx", serial);
+    }
+
+  cairo_move_to (cr, 10, *y);
+  layout = gtk_widget_create_pango_layout (widget, string->str);
+  pango_cairo_show_layout (cr, layout);
+  cairo_stroke (cr);
+
+  pango_layout_get_pixel_size (layout, NULL, &height);
+
+  gdk_cairo_set_source_rgba (cr, &info->color);
+  cairo_set_line_width (cr, 10);
+  cairo_move_to (cr, 0, *y);
+
+  *y = *y + height;
+  cairo_line_to (cr, 0, *y);
+  cairo_stroke (cr);
+
+  cairo_restore (cr);
+
+  g_object_unref (layout);
+  g_string_free (string, TRUE);
+}
+
+static void
+draw_cb (GtkDrawingArea *da,
+         cairo_t        *cr,
+         int             width,
+         int             height,
+         gpointer        user_data)
+{
+  GtkWidget *widget = GTK_WIDGET (da);
+  EventData *data = user_data;
+  AxesInfo *info;
+  GHashTableIter iter;
+  gpointer key, value;
+  gint y = 0;
+
+  /* Draw Abs info */
+  g_hash_table_iter_init (&iter, data->pointer_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_axes_info (cr, info, width, height);
+    }
+
+  g_hash_table_iter_init (&iter, data->touch_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_axes_info (cr, info, width, height);
+    }
+
+  /* Draw name, color legend and misc data */
+  g_hash_table_iter_init (&iter, data->pointer_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_device_info (widget, cr, NULL, &y, info);
+    }
+
+  g_hash_table_iter_init (&iter, data->touch_info);
+
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      info = value;
+      draw_device_info (widget, cr, key, &y, info);
+    }
+}
+
+static void
+update_label_text (GtkWidget   *label,
+                   const gchar *text)
+{
+  gchar *markup = NULL;
+
+  if (text)
+    markup = g_strdup_printf ("<span font='48.0'>%s</span>", text);
+  gtk_label_set_markup (GTK_LABEL (label), markup);
+  g_free (markup);
+}
+
+static gboolean
+reset_label_text_timeout_cb (gpointer user_data)
+{
+  GtkWidget *label = user_data;
+
+  update_label_text (label, NULL);
+  pad_action_timeout_id = 0;
+  return G_SOURCE_REMOVE;
+}
+
+static void
+update_label_and_timeout (GtkWidget   *label,
+                          const gchar *text)
+{
+  if (pad_action_timeout_id)
+    g_source_remove (pad_action_timeout_id);
+
+  update_label_text (label, text);
+  pad_action_timeout_id = g_timeout_add (200, reset_label_text_timeout_cb, label);
+}
+
+static void
+on_action_activate (GSimpleAction *action,
+                    GVariant      *parameter,
+                    gpointer       user_data)
+{
+  GtkWidget *label = user_data;
+  const gchar *result;
+  gchar *str;
+
+  result = g_object_get_data (G_OBJECT (action), "action-result");
+
+  if (!parameter)
+    update_label_and_timeout (label, result);
+  else
+    {
+      str = g_strdup_printf ("%s %.2f", result, g_variant_get_double (parameter));
+      update_label_and_timeout (label, str);
+      g_free (str);
+    }
+}
+
+static void
+init_pad_controller (GtkWidget *window,
+                     GtkWidget *label)
+{
+  GtkPadController *pad_controller;
+  GSimpleActionGroup *action_group;
+  GSimpleAction *action;
+  gint i;
+
+  action_group = g_simple_action_group_new ();
+  pad_controller = gtk_pad_controller_new (GTK_WINDOW (window),
+                                           G_ACTION_GROUP (action_group),
+                                           NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (pad_actions); i++)
+    {
+      if (pad_actions[i].type == GTK_PAD_ACTION_BUTTON)
+        {
+          action = g_simple_action_new (pad_actions[i].action_name, NULL);
+        }
+      else
+        {
+          action = g_simple_action_new_stateful (pad_actions[i].action_name,
+                                                 G_VARIANT_TYPE_DOUBLE, NULL);
+        }
+
+      g_signal_connect (action, "activate",
+                        G_CALLBACK (on_action_activate), label);
+      g_object_set_data (G_OBJECT (action), "action-result",
+                         (gpointer) pad_action_results[i]);
+      g_action_map_add_action (G_ACTION_MAP (action_group), G_ACTION (action));
+      g_object_unref (action);
+    }
+
+  gtk_pad_controller_set_action_entries (pad_controller, pad_actions,
+                                         G_N_ELEMENTS (pad_actions));
+  g_object_set_data_full (G_OBJECT (window), "pad-controller",
+                          pad_controller, g_object_unref);
+
+  g_object_unref (action_group);
+}
+
+GtkWidget *
+do_event_axes (GtkWidget *toplevel)
+{
+  static GtkWidget *window = NULL;
+  EventData *event_data;
+  GtkWidget *label;
+  GtkWidget *overlay;
+  GtkWidget *da;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Touch and Drawing Tablets");
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_widget_set_support_multidevice (window, TRUE);
+
+      event_data = event_data_new ();
+      g_object_set_data_full (G_OBJECT (window), "gtk-demo-event-data",
+                              event_data, (GDestroyNotify) event_data_free);
+
+      da = gtk_drawing_area_new ();
+      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 400);
+      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 400);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_cb, event_data, NULL);
+      gtk_widget_set_can_focus (da, TRUE);
+      gtk_widget_grab_focus (da);
+
+      g_signal_connect (da, "event",
+                        G_CALLBACK (event_cb), event_data);
+
+      label = gtk_label_new ("");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
+      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+
+      overlay = gtk_overlay_new ();
+      gtk_container_add (GTK_CONTAINER (window), overlay);
+      gtk_container_add (GTK_CONTAINER (overlay), da);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+
+      init_pad_controller (da, label);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
--- 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
@@ -8,268 +8,165 @@
 #include <gtk/gtk.h>

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

-const char *const css =
-".blurred-button {"
-"  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
-"}"
-"";
+GtkWidget *allow_changes;

-char **icon_names = NULL;
-gsize n_icon_names = 0;
+#define N_STATS 5

-static void
-init_icon_names (GtkIconTheme *theme)
-{
-  GPtrArray *icons;
-  GList *l, *icon_list;
+#define STATS_UPDATE_TIME G_USEC_PER_SEC

-  if (icon_names)
-    return;
+typedef struct _Stats Stats;
+struct _Stats {
+  gint64 last_stats;
+  gint64 last_frame;
+  gint last_suggestion;
+  guint frame_counter_max;

-  icon_list = gtk_icon_theme_list_icons (theme, NULL);
-  icons = g_ptr_array_new ();
-
-  for (l = icon_list; l; l = l->next)
-    {
-      if (g_str_has_suffix (l->data, "symbolic"))
-        continue;
-
-      g_ptr_array_add (icons, g_strdup (l->data));
-    }
-
-  n_icon_names = icons->len;
-  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
-  icon_names = (char **) g_ptr_array_free (icons, FALSE);
-
-  /* don't free strings, we assigned them to the array */
-  g_list_free_full (icon_list, g_free);
-}
-
-static const char *
-get_random_icon_name (GtkIconTheme *theme)
-{
-  init_icon_names (theme);
-
-  return icon_names[g_random_int_range(0, n_icon_names)];
-}
-
-GtkWidget *
-create_icon (void)
-{
-  GtkWidget *image;
-
-  image = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()));
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-
-  return image;
-}
-
-static GtkWidget *
-create_button (void)
-{
-  return gtk_button_new_with_label ("Button");
-}
-
-static GtkWidget *
-create_blurred_button (void)
-{
-  GtkWidget *w = gtk_button_new ();
-
-  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");
-
-  return w;
-}
-
-static GtkWidget *
-create_font_button (void)
-{
-  return gtk_font_button_new ();
-}
-
-static GtkWidget *
-create_level_bar (void)
-{
-  GtkWidget *w = gtk_level_bar_new_for_interval (0, 100);
-
-  gtk_level_bar_set_value (GTK_LEVEL_BAR (w), 50);
-
-  /* Force them to be a bit larger */
-  gtk_widget_set_size_request (w, 200, -1);
-
-  return w;
-}
-
-static GtkWidget *
-create_spinner (void)
-{
-  GtkWidget *w = gtk_spinner_new ();
-
-  gtk_spinner_start (GTK_SPINNER (w));
-
-  return w;
-}
-
-static GtkWidget *
-create_spinbutton (void)
-{
-  GtkWidget *w = gtk_spin_button_new_with_range (0, 10, 1);
-
-  return w;
-}
-
-static GtkWidget *
-create_label (void)
-{
-  GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
-
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
-
-  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);
-} widget_types[] = {
-  { "Icon",       create_icon           },
-  { "Button",     create_button         },
-  { "Blurbutton", create_blurred_button },
-  { "Fontbutton", create_font_button    },
-  { "Levelbar",   create_level_bar      },
-  { "Label",      create_label          },
-  { "Spinner",    create_spinner        },
-  { "Spinbutton", create_spinbutton     },
-  { "Video",      create_video          },
-  { "Gears",      create_gears          },
-  { "Switch",     create_switch         },
+  guint stats_index;
+  guint frame_counter[N_STATS];
+  guint item_counter[N_STATS];
 };

-static int selected_widget_type = -1;
-static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
+static Stats *
+get_stats (GtkWidget *widget)
+{
+  static GQuark stats_quark = 0;
+  Stats *stats;
+
+  if (G_UNLIKELY (stats_quark == 0))
+    stats_quark = g_quark_from_static_string ("stats");
+
+  stats = g_object_get_qdata (G_OBJECT (widget), stats_quark);
+  if (stats == NULL)
+    {
+      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 void
-set_widget_type (GtkFishbowl *fishbowl,
-                 int          widget_type_index)
+do_stats (GtkWidget *widget,
+          GtkWidget *info_label,
+          gint      *suggested_change)
 {
-  GtkWidget *window, *headerbar;
+  Stats *stats;
+  gint64 frame_time;

-  if (widget_type_index == selected_widget_type)
-    return;
+  stats = get_stats (widget);
+  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));

-  selected_widget_type = widget_type_index;
+  if (stats->last_stats + STATS_UPDATE_TIME < frame_time)
+    {
+      char *new_label;
+      guint i, n_frames;

-  gtk_fishbowl_set_creation_func (fishbowl,
-                                  widget_types[selected_widget_type].create_func);
+      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);

-  window = gtk_widget_get_toplevel (GTK_WIDGET (fishbowl));
-  headerbar = gtk_window_get_titlebar (GTK_WINDOW (window));
-  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
-                            widget_types[selected_widget_type].name);
-}
+      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]);
+        }

-void
-next_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
-
-  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
-    new_index = 0;
+      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
-    new_index = selected_widget_type + 1;
+    {
+      if (suggested_change)
+        *suggested_change = 0;
+    }

-  set_widget_type (fishbowl, new_index);
+  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]);
 }

-void
-prev_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
+static void
+stats_update (GtkWidget *widget)
 {
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
+  Stats *stats;

-  if (selected_widget_type - 1 < 0)
-    new_index = N_WIDGET_TYPES - 1;
-  else
-    new_index = selected_widget_type - 1;
+  stats = get_stats (widget);

-  set_widget_type (fishbowl, new_index);
+  stats->item_counter[stats->stats_index] = gtk_fishbowl_get_count (GTK_FISHBOWL (widget));
 }

+static gboolean
+move_fish (GtkWidget     *bowl,
+           GdkFrameClock *frame_clock,
+           gpointer       info_label)
+{
+  gint suggested_change = 0;
+  
+  do_stats (bowl,
+            info_label,
+            !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);
+
+  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl),
+                          gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change);
+  stats_update (bowl);
+
+  return G_SOURCE_CONTINUE;
+}

 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
-  static GtkCssProvider *provider = NULL;
-
-  if (provider == NULL)
-    {
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css, -1);
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }

  if (!window)
    {
      GtkBuilder *builder;
-      GtkWidget *bowl;
+      GtkWidget *bowl, *info_label;

      g_type_ensure (GTK_TYPE_FISHBOWL);

      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
-      gtk_builder_add_callback_symbols (builder,
-                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
-                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
-                                        NULL);
      gtk_builder_connect_signals (builder, NULL);
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
-      set_widget_type (GTK_FISHBOWL (bowl), 0);
+      gtk_fishbowl_set_use_icons (GTK_FISHBOWL (bowl), TRUE);
+      info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
+      allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_widget_realize (window);
+      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,66 +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-close-button">True</property>
        <child>
-          <object class="GtkBox">
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="prev_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="next_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">fps</property>
+          <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="framerate"/>
+            <property name="visible">True</property>
+            <property name="label" bind-source="bowl" bind-property="count">0</property>
          </object>
          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Icons, </property>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label" bind-source="bowl" bind-property="count"/>
-          </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>
@@ -75,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>
@@ -84,7 +52,6 @@
      <object class="GtkFishbowl" id="bowl">
        <property name="visible">True</property>
        <property name="animating">True</property>
-        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
      </object>
    </child>
  </object>
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
--- a/demos/gtk-demo/fontplane.c
+++ b/demos/gtk-demo/fontplane.c
@@ -1,315 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "fontplane.h"
-
-#include "gtk.h"
-
-enum {
-  PROP_0,
-  PROP_WEIGHT_ADJUSTMENT,
-  PROP_WIDTH_ADJUSTMENT
-};
-
-G_DEFINE_TYPE (GtkFontPlane, gtk_font_plane, GTK_TYPE_WIDGET)
-
-static double
-adjustment_get_normalized_value (GtkAdjustment *adj)
-{
-  return (gtk_adjustment_get_value (adj) - gtk_adjustment_get_lower (adj)) /
-        (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj));
-}
-
-static void
-val_to_xy (GtkFontPlane *plane,
-           gint          *x,
-           gint          *y)
-{
-  gdouble u, v;
-  gint width, height;
-
-  width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
-  height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
-
-  u = adjustment_get_normalized_value (plane->width_adj);
-  v = adjustment_get_normalized_value (plane->weight_adj);
-
-  *x = CLAMP (width * u, 0, width - 1);
-  *y = CLAMP (height * (1 - v), 0, height - 1);
-}
-
-static void
-plane_snapshot (GtkWidget   *widget,
-                GtkSnapshot *snapshot)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (widget);
-  gint x, y;
-  gint width, height;
-  cairo_t *cr;
-
-  val_to_xy (plane, &x, &y);
-  width = gtk_widget_get_allocated_width (widget);
-  height = gtk_widget_get_allocated_height (widget);
-
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT (0, 0, width, height));
-
-  cairo_set_source_rgb (cr, 0, 0, 0);
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_paint (cr);
-
-  cairo_move_to (cr, 0,     y + 0.5);
-  cairo_line_to (cr, width, y + 0.5);
-
-  cairo_move_to (cr, x + 0.5, 0);
-  cairo_line_to (cr, x + 0.5, height);
-
-  if (gtk_widget_has_visible_focus (widget))
-    {
-      cairo_set_line_width (cr, 3.0);
-      cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.6);
-      cairo_stroke_preserve (cr);
-
-      cairo_set_line_width (cr, 1.0);
-      cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.8);
-      cairo_stroke (cr);
-    }
-  else
-    {
-      cairo_set_line_width (cr, 1.0);
-      cairo_set_source_rgba (cr, 0.8, 0.8, 0.8, 0.8);
-      cairo_stroke (cr);
-    }
-
-  cairo_destroy (cr);
-}
-
-static void
-set_cross_cursor (GtkWidget *widget,
-                  gboolean   enabled)
-{
-  if (enabled)
-    gtk_widget_set_cursor_from_name (widget, "crosshair");
-  else
-    gtk_widget_set_cursor (widget, NULL);
-}
-
-static void
-adj_changed (GtkFontPlane *plane)
-{
-  gtk_widget_queue_draw (GTK_WIDGET (plane));
-}
-
-static void
-adjustment_set_normalized_value (GtkAdjustment *adj,
-                                 double         val)
-{
-  gtk_adjustment_set_value (adj,
-      gtk_adjustment_get_lower (adj) +
-          val * (gtk_adjustment_get_upper (adj) - gtk_adjustment_get_lower (adj)));
-}
-
-static void
-update_value (GtkFontPlane *plane,
-              gint           x,
-              gint           y)
-{
-  GtkWidget *widget = GTK_WIDGET (plane);
-  gdouble u, v;
-
-  u = CLAMP (x * (1.0 / gtk_widget_get_allocated_width (widget)), 0, 1);
-  v = CLAMP (1 - y * (1.0 / gtk_widget_get_allocated_height (widget)), 0, 1);
-
-  adjustment_set_normalized_value (plane->width_adj, u);
-  adjustment_set_normalized_value (plane->weight_adj, v);
-
-  gtk_widget_queue_draw (widget);
-}
-
-static void
-hold_action (GtkGestureLongPress *gesture,
-             gdouble              x,
-             gdouble              y,
-             GtkFontPlane       *plane)
-{
-  gboolean handled;
-
-  g_signal_emit_by_name (plane, "popup-menu", &handled);
-}
-
-static void
-plane_drag_gesture_begin (GtkGestureDrag *gesture,
-                          gdouble         start_x,
-                          gdouble         start_y,
-                          GtkFontPlane  *plane)
-{
-  guint button;
-
-  button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
-
-  if (button == GDK_BUTTON_SECONDARY)
-    {
-      gboolean handled;
-
-      g_signal_emit_by_name (plane, "popup-menu", &handled);
-    }
-
-  if (button != GDK_BUTTON_PRIMARY)
-    {
-      gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
-      return;
-    }
-
-  set_cross_cursor (GTK_WIDGET (plane), TRUE);
-  update_value (plane, start_x, start_y);
-  gtk_widget_grab_focus (GTK_WIDGET (plane));
-  gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
-}
-
-static void
-plane_drag_gesture_update (GtkGestureDrag *gesture,
-                           gdouble         offset_x,
-                           gdouble         offset_y,
-                           GtkFontPlane  *plane)
-{
-  gdouble start_x, start_y;
-
-  gtk_gesture_drag_get_start_point (GTK_GESTURE_DRAG (gesture),
-                                    &start_x, &start_y);
-  update_value (plane, start_x + offset_x, start_y + offset_y);
-}
-
-static void
-plane_drag_gesture_end (GtkGestureDrag *gesture,
-                        gdouble         offset_x,
-                        gdouble         offset_y,
-                        GtkFontPlane  *plane)
-{
-  set_cross_cursor (GTK_WIDGET (plane), FALSE);
-}
-
-static void
-gtk_font_plane_init (GtkFontPlane *plane)
-{
-  GtkGesture *gesture;
-
-  gtk_widget_set_has_surface (GTK_WIDGET (plane), FALSE);
-  gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
-
-  gesture = gtk_gesture_drag_new ();
-  g_signal_connect (gesture, "drag-begin",
-		    G_CALLBACK (plane_drag_gesture_begin), plane);
-  g_signal_connect (gesture, "drag-update",
-		    G_CALLBACK (plane_drag_gesture_update), plane);
-  g_signal_connect (gesture, "drag-end",
-		    G_CALLBACK (plane_drag_gesture_end), plane);
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0);
-  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
-
-  gesture = gtk_gesture_long_press_new ();
-  g_signal_connect (gesture, "pressed",
-                    G_CALLBACK (hold_action), plane);
-  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture),
-                                     TRUE);
-  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
-}
-
-static void
-plane_finalize (GObject *object)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (object);
-
-  g_clear_object (&plane->weight_adj);
-  g_clear_object (&plane->width_adj);
-
-  G_OBJECT_CLASS (gtk_font_plane_parent_class)->finalize (object);
-}
-
-static void
-plane_set_property (GObject      *object,
-		    guint         prop_id,
-		    const GValue *value,
-		    GParamSpec   *pspec)
-{
-  GtkFontPlane *plane = GTK_FONT_PLANE (object);
-  GtkAdjustment *adjustment;
-
-  switch (prop_id)
-    {
-    case PROP_WEIGHT_ADJUSTMENT:
-      adjustment = GTK_ADJUSTMENT (g_value_get_object (value));
-      if (adjustment)
-	{
-	  plane->weight_adj = g_object_ref_sink (adjustment);
-	  g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (adj_changed), plane);
-	}
-      break;
-    case PROP_WIDTH_ADJUSTMENT:
-      adjustment = GTK_ADJUSTMENT (g_value_get_object (value));
-      if (adjustment)
-	{
-	  plane->width_adj = g_object_ref_sink (adjustment);
-	  g_signal_connect_swapped (adjustment, "value-changed", G_CALLBACK (adj_changed), plane);
-	}
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_font_plane_class_init (GtkFontPlaneClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->finalize = plane_finalize;
-  object_class->set_property = plane_set_property;
-
-  widget_class->snapshot = plane_snapshot;
-
-  g_object_class_install_property (object_class,
-                                   PROP_WEIGHT_ADJUSTMENT,
-                                   g_param_spec_object ("weight-adjustment",
-                                                        NULL,
-                                                        NULL,
-							GTK_TYPE_ADJUSTMENT,
-							G_PARAM_WRITABLE |
-							G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class,
-                                   PROP_WIDTH_ADJUSTMENT,
-                                   g_param_spec_object ("width-adjustment",
-                                                        NULL,
-                                                        NULL,
-							GTK_TYPE_ADJUSTMENT,
-							G_PARAM_WRITABLE |
-							G_PARAM_CONSTRUCT_ONLY));
-}
-
-GtkWidget *
-gtk_font_plane_new (GtkAdjustment *weight_adj,
-                     GtkAdjustment *width_adj)
-{
-  return g_object_new (GTK_TYPE_FONT_PLANE,
-                       "weight-adjustment", weight_adj,
-                       "width-adjustment", width_adj,
-                       NULL);
-}
--- a/demos/gtk-demo/fontplane.h
+++ b/demos/gtk-demo/fontplane.h
@@ -1,64 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2012 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_FONT_PLANE_H__
-#define __GTK_FONT_PLANE_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_FONT_PLANE            (gtk_font_plane_get_type ())
-#define GTK_FONT_PLANE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_PLANE, GtkFontPlane))
-#define GTK_FONT_PLANE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FONT_PLANE, GtkFontPlaneClass))
-#define GTK_IS_FONT_PLANE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_COLOR_PLANE))
-#define GTK_IS_FONT_PLANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_COLOR_PLANE))
-#define GTK_FONT_PLANE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FONT_PLANE, GtkFontPlaneClass))
-
-
-typedef struct _GtkFontPlane         GtkFontPlane;
-typedef struct _GtkFontPlaneClass    GtkFontPlaneClass;
-
-struct _GtkFontPlane
-{
-  GtkWidget parent_instance;
-
-  GtkAdjustment *weight_adj;
-  GtkAdjustment *width_adj;
-
-  GtkGesture *drag_gesture;
-};
-
-struct _GtkFontPlaneClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-
-GType       gtk_font_plane_get_type (void) G_GNUC_CONST;
-GtkWidget * gtk_font_plane_new      (GtkAdjustment *width_adj,
-                                     GtkAdjustment *weight_adj);
-
-G_END_DECLS
-
-#endif /* __GTK_FONT_PLANE_H__ */
--- a/demos/gtk-demo/foreigndrawing.c
+++ b/demos/gtk-demo/foreigndrawing.c
@@ -830,7 +830,6 @@ draw_spinbutton (GtkWidget *widget,
  GtkIconTheme *icon_theme;
  GtkIconInfo *icon_info;
  GdkPixbuf *pixbuf;
-  GdkTexture *texture;
  gint icon_width, icon_height, icon_size;
  gint button_width;
  gint contents_x, contents_y, contents_width, contents_height;
@@ -858,26 +857,23 @@ draw_spinbutton (GtkWidget *widget,
  icon_size = MIN (icon_width, icon_height);
  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-add-symbolic", icon_size, 0);
  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL);
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
  g_object_unref (icon_info);
  draw_style_common (up_context, cr, x + width - button_width, y, button_width, *height,
                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_icon (up_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  gtk_render_icon (up_context, cr, pixbuf, contents_x, contents_y + (contents_height - icon_size) / 2);
  g_object_unref (pixbuf);
-  g_object_unref (texture);
+

  gtk_style_context_get (down_context,
                         "min-width", &icon_width, "min-height", &icon_height, NULL);
  icon_size = MIN (icon_width, icon_height);
  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-remove-symbolic", icon_size, 0);
  pixbuf = gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL);
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
  g_object_unref (icon_info);
  draw_style_common (down_context, cr, x + width - 2 * button_width, y, button_width, *height,
                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_icon (down_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
+  gtk_render_icon (down_context, cr, pixbuf, contents_x, contents_y + (contents_height - icon_size) / 2);
  g_object_unref (pixbuf);
-  g_object_unref (texture);

  g_object_unref (down_context);
  g_object_unref (up_context);
--- 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/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -157,15 +157,16 @@ do_gestures (GtkWidget *do_widget)
                                      NULL, NULL);

      /* Swipe */
-      gesture = gtk_gesture_swipe_new ();
+      gesture = gtk_gesture_swipe_new (drawing_area);
      g_signal_connect (gesture, "swipe",
                        G_CALLBACK (swipe_gesture_swept), drawing_area);
      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                  GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);

      /* 3fg swipe for touchpads */
      gesture = g_object_new (GTK_TYPE_GESTURE_SWIPE,
+                              "widget", drawing_area,
                              "n-points", 3,
                              NULL);
      g_signal_connect (gesture, "begin",
@@ -174,34 +175,33 @@ do_gestures (GtkWidget *do_widget)
                        G_CALLBACK (swipe_gesture_swept), drawing_area);
      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                  GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
-
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);

      /* Long press */
-      gesture = gtk_gesture_long_press_new ();
+      gesture = gtk_gesture_long_press_new (drawing_area);
      g_signal_connect (gesture, "pressed",
                        G_CALLBACK (long_press_gesture_pressed), drawing_area);
      g_signal_connect (gesture, "end",
                        G_CALLBACK (long_press_gesture_end), drawing_area);
      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                  GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);

      /* Rotate */
-      rotate = gesture = gtk_gesture_rotate_new ();
+      rotate = gesture = gtk_gesture_rotate_new (drawing_area);
      g_signal_connect (gesture, "angle-changed",
                        G_CALLBACK (rotation_angle_changed), drawing_area);
      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                  GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);

      /* Zoom */
-      zoom = gesture = gtk_gesture_zoom_new ();
+      zoom = gesture = gtk_gesture_zoom_new (drawing_area);
      g_signal_connect (gesture, "scale-changed",
                        G_CALLBACK (zoom_scale_changed), drawing_area);
      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                  GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/gtk-logo.webm
+++ b/demos/gtk-demo/gtk-logo.webm
--- a/demos/gtk-demo/org.gtk.Demo.desktop
+++ b/demos/gtk-demo/org.gtk.Demo.desktop
--- a/demos/gtk-demo/gtkfishbowl.c
+++ b/demos/gtk-demo/gtkfishbowl.c
@@ -24,18 +24,13 @@ typedef struct _GtkFishbowlChild         GtkFishbowlChild;

 struct _GtkFishbowlPrivate
 {
-  GtkFishCreationFunc creation_func;
  GList *children;
  guint count;

  gint64 last_frame_time;
-  gint64 update_delay;
  guint tick_id;

-  double framerate;
-  int last_benchmark_change;
-
-  guint benchmark : 1;
+  guint use_icons: 1;
 };

 struct _GtkFishbowlChild
@@ -50,25 +45,18 @@ struct _GtkFishbowlChild
 enum {
   PROP_0,
   PROP_ANIMATING,
-   PROP_BENCHMARK,
   PROP_COUNT,
-   PROP_FRAMERATE,
-   PROP_UPDATE_DELAY,
   NUM_PROPERTIES
 };

 static GParamSpec *props[NUM_PROPERTIES] = { NULL, };

-G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_CONTAINER)

 static void
 gtk_fishbowl_init (GtkFishbowl *fishbowl)
 {
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  gtk_widget_set_has_surface (GTK_WIDGET (fishbowl), FALSE);
-
-  priv->update_delay = G_USEC_PER_SEC;
+  gtk_widget_set_has_window (GTK_WIDGET (fishbowl), FALSE);
 }

 /**
@@ -84,6 +72,15 @@ gtk_fishbowl_new (void)
  return g_object_new (GTK_TYPE_FISHBOWL, NULL);
 }

+void
+gtk_fishbowl_set_use_icons (GtkFishbowl *fishbowl,
+                            gboolean     use_icons)
+{
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+
+  priv->use_icons = use_icons;
+}
+
 static void
 gtk_fishbowl_measure (GtkWidget      *widget,
                      GtkOrientation  orientation,
@@ -109,18 +106,7 @@ gtk_fishbowl_measure (GtkWidget      *widget,
      if (!gtk_widget_get_visible (child->widget))
        continue;

-
-      if (orientation == GTK_ORIENTATION_HORIZONTAL)
-        {
-          gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);
-        }
-      else
-        {
-          int min_width;
-
-          gtk_widget_measure (child->widget, GTK_ORIENTATION_HORIZONTAL, -1, &min_width, NULL, NULL, NULL);
-          gtk_widget_measure (child->widget, orientation, min_width, &child_min, &child_nat, NULL, NULL);
-        }
+      gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);

      *minimum = MAX (*minimum, child_min);
      *natural = MAX (*natural, child_nat);
@@ -130,7 +116,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);
@@ -141,6 +128,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))
@@ -152,7 +141,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);
    }
 }

@@ -164,9 +153,10 @@ new_speed (void)
 }

 static void
-gtk_fishbowl_add (GtkFishbowl *fishbowl,
-                  GtkWidget   *widget)
+gtk_fishbowl_add (GtkContainer *container,
+                  GtkWidget    *widget)
 {
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
  GtkFishbowlChild *child_info;

@@ -188,12 +178,13 @@ gtk_fishbowl_add (GtkFishbowl *fishbowl,
 }

 static void
-gtk_fishbowl_remove (GtkFishbowl *fishbowl,
-                     GtkWidget   *widget)
+gtk_fishbowl_remove (GtkContainer *container,
+                     GtkWidget    *widget)
 {
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
  GtkFishbowlChild *child;
-  GtkWidget *widget_bowl = GTK_WIDGET (fishbowl);
+  GtkWidget *widget_container = GTK_WIDGET (container);
  GList *children;

  for (children = priv->children; children; children = children->next)
@@ -210,8 +201,8 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
          g_list_free (children);
          g_free (child);

-          if (was_visible && gtk_widget_get_visible (widget_bowl))
-            gtk_widget_queue_resize (widget_bowl);
+          if (was_visible && gtk_widget_get_visible (widget_container))
+            gtk_widget_queue_resize (widget_container);

          priv->count--;
          g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
@@ -220,6 +211,26 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
    }
 }

+static void
+gtk_fishbowl_forall (GtkContainer *container,
+                     GtkCallback   callback,
+                     gpointer      callback_data)
+{
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+  GtkFishbowlChild *child;
+  GList *children;
+
+  children = priv->children;
+  while (children)
+    {
+      child = children->data;
+      children = children->next;
+
+      (* callback) (child->widget, callback_data);
+    }
+}
+
 static void
 gtk_fishbowl_dispose (GObject *object)
 {
@@ -245,18 +256,10 @@ gtk_fishbowl_set_property (GObject         *object,
      gtk_fishbowl_set_animating (fishbowl, g_value_get_boolean (value));
      break;

-    case PROP_BENCHMARK:
-      gtk_fishbowl_set_benchmark (fishbowl, g_value_get_boolean (value));
-      break;
-
    case PROP_COUNT:
      gtk_fishbowl_set_count (fishbowl, g_value_get_uint (value));
      break;

-    case PROP_UPDATE_DELAY:
-      gtk_fishbowl_set_update_delay (fishbowl, g_value_get_int64 (value));
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -277,22 +280,10 @@ gtk_fishbowl_get_property (GObject         *object,
      g_value_set_boolean (value, gtk_fishbowl_get_animating (fishbowl));
      break;

-    case PROP_BENCHMARK:
-      g_value_set_boolean (value, gtk_fishbowl_get_benchmark (fishbowl));
-      break;
-
    case PROP_COUNT:
      g_value_set_uint (value, gtk_fishbowl_get_count (fishbowl));
      break;

-    case PROP_FRAMERATE:
-      g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
-      break;
-
-    case PROP_UPDATE_DELAY:
-      g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -304,6 +295,7 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);

  object_class->dispose = gtk_fishbowl_dispose;
  object_class->set_property = gtk_fishbowl_set_property;
@@ -312,6 +304,10 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
  widget_class->measure = gtk_fishbowl_measure;
  widget_class->size_allocate = gtk_fishbowl_size_allocate;

+  container_class->add = gtk_fishbowl_add;
+  container_class->remove = gtk_fishbowl_remove;
+  container_class->forall = gtk_fishbowl_forall;
+
  props[PROP_ANIMATING] =
      g_param_spec_boolean ("animating",
                            "animating",
@@ -319,36 +315,13 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                            FALSE,
                            G_PARAM_READWRITE);

-  props[PROP_BENCHMARK] =
-      g_param_spec_boolean ("benchmark",
-                            "Benchmark",
-                            "Adapt the count property to hit the maximum framerate",
-                            FALSE,
-                            G_PARAM_READWRITE);
-
  props[PROP_COUNT] =
      g_param_spec_uint ("count",
                         "Count",
                         "Number of widgets",
                         0, G_MAXUINT,
                         0,
-                         G_PARAM_READWRITE);
-
-  props[PROP_FRAMERATE] =
-      g_param_spec_double ("framerate",
-                           "Framerate",
-                           "Framerate of this widget in frames per second",
-                           0, G_MAXDOUBLE,
-                           0,
-                           G_PARAM_READABLE);
-
-  props[PROP_UPDATE_DELAY] =
-      g_param_spec_int64 ("update-delay",
-                          "Update delay",
-                          "Number of usecs between updates",
-                          0, G_MAXINT64,
-                          G_USEC_PER_SEC,
-                          G_PARAM_READWRITE);
+                         G_PARAM_READABLE);

  g_object_class_install_properties (object_class, NUM_PROPERTIES, props);
 }
@@ -361,58 +334,96 @@ gtk_fishbowl_get_count (GtkFishbowl *fishbowl)
  return priv->count;
 }

+char **icon_names = NULL;
+gsize n_icon_names = 0;
+
+static void
+init_icon_names (GtkIconTheme *theme)
+{
+  GPtrArray *icons;
+  GList *l, *icon_list;
+
+  if (icon_names)
+    return;
+
+  icon_list = gtk_icon_theme_list_icons (theme, NULL);
+  icons = g_ptr_array_new ();
+
+  for (l = icon_list; l; l = l->next)
+    {
+      if (g_str_has_suffix (l->data, "symbolic"))
+        continue;
+
+      g_ptr_array_add (icons, g_strdup (l->data));
+    }
+
+  n_icon_names = icons->len;
+  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
+  icon_names = (char **) g_ptr_array_free (icons, FALSE);
+
+  /* don't free strings, we assigned them to the array */
+  g_list_free_full (icon_list, g_free);
+}
+
+static const char *
+get_random_icon_name (GtkIconTheme *theme)
+{
+  init_icon_names (theme);
+
+  return icon_names[g_random_int_range(0, n_icon_names)];
+}
+
+static GType
+get_random_widget_type ()
+{
+  GType types[] = {
+    GTK_TYPE_SWITCH,
+    GTK_TYPE_BUTTON,
+    GTK_TYPE_ENTRY,
+    GTK_TYPE_SPIN_BUTTON,
+    GTK_TYPE_FONT_BUTTON,
+    GTK_TYPE_SCROLLBAR,
+    GTK_TYPE_SCALE,
+    GTK_TYPE_LEVEL_BAR,
+    GTK_TYPE_PROGRESS_BAR,
+    GTK_TYPE_RADIO_BUTTON,
+    GTK_TYPE_CHECK_BUTTON
+  };
+  return types[g_random_int_range (0, G_N_ELEMENTS (types))];
+}
+
 void
 gtk_fishbowl_set_count (GtkFishbowl *fishbowl,
                        guint        count)
 {
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);

-  if (priv->count == count)
-    return;
-
  g_object_freeze_notify (G_OBJECT (fishbowl));

  while (priv->count > count)
    {
-      gtk_fishbowl_remove (fishbowl, gtk_widget_get_first_child (GTK_WIDGET (fishbowl)));
+      gtk_container_remove (GTK_CONTAINER (fishbowl),
+                            ((GtkFishbowlChild *) priv->children->data)->widget);
    }

  while (priv->count < count)
    {
      GtkWidget *new_widget;

-      new_widget = priv->creation_func ();
+      if (priv->use_icons)
+        {
+          new_widget = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()));
+          gtk_image_set_icon_size (GTK_IMAGE (new_widget), GTK_ICON_SIZE_LARGE);
+        }
+      else
+        new_widget = g_object_new (get_random_widget_type (), NULL);

-      gtk_fishbowl_add (fishbowl, new_widget);
+      gtk_container_add (GTK_CONTAINER (fishbowl), new_widget);
    }

  g_object_thaw_notify (G_OBJECT (fishbowl));
 }

-gboolean
-gtk_fishbowl_get_benchmark (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->benchmark;
-}
-
-void
-gtk_fishbowl_set_benchmark (GtkFishbowl *fishbowl,
-                            gboolean     benchmark)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (priv->benchmark == benchmark)
-    return;
-
-  priv->benchmark = benchmark;
-  if (!benchmark)
-    priv->last_benchmark_change = 0;
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_BENCHMARK]);
-}
-
 gboolean
 gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
 {
@@ -421,111 +432,6 @@ gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
  return priv->tick_id != 0;
 }

-static gint64
-guess_refresh_interval (GdkFrameClock *frame_clock)
-{
-  gint64 interval;
-  gint64 i;
-
-  interval = G_MAXINT64;
-
-  for (i = gdk_frame_clock_get_history_start (frame_clock);
-       i < gdk_frame_clock_get_frame_counter (frame_clock);
-       i++)
-    {
-      GdkFrameTimings *t, *before;
-      gint64 ts, before_ts;
-
-      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;
-
-      ts = gdk_frame_timings_get_frame_time (t);
-      before_ts = gdk_frame_timings_get_frame_time (before);
-      if (ts == 0 || before_ts == 0)
-        continue;
-
-      interval = MIN (interval, ts - before_ts);
-    }
-
-  if (interval == G_MAXINT64)
-    return 0;
-
-  return interval;
-}
-
-static void
-gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GdkFrameClock *frame_clock;
-  GdkFrameTimings *start, *end;
-  gint64 start_counter, end_counter;
-  gint64 n_frames, expected_frames;
-  gint64 start_timestamp, end_timestamp;
-  gint64 interval;
-
-  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (fishbowl));
-  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);
-    }
-
-  n_frames = end_counter - start_counter;
-  priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
-
-  if (!priv->benchmark)
-    return;
-
-  interval = gdk_frame_timings_get_refresh_interval (end);
-  if (interval == 0)
-    {
-      interval = guess_refresh_interval (frame_clock);
-      if (interval == 0)
-        return;
-    }
-  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
-
-  if (n_frames >= expected_frames)
-    {
-      if (priv->last_benchmark_change > 0)
-        priv->last_benchmark_change *= 2;
-      else
-        priv->last_benchmark_change = 1;
-    }
-  else if (n_frames + 1 < expected_frames)
-    {
-      if (priv->last_benchmark_change < 0)
-        priv->last_benchmark_change--;
-      else
-        priv->last_benchmark_change = -1;
-    }
-  else
-    {
-      priv->last_benchmark_change = 0;
-    }
-
-  gtk_fishbowl_set_count (fishbowl, MAX (1, (int) priv->count + priv->last_benchmark_change));
-}
-
 static gboolean
 gtk_fishbowl_tick (GtkWidget     *widget,
                   GdkFrameClock *frame_clock,
@@ -536,11 +442,9 @@ gtk_fishbowl_tick (GtkWidget     *widget,
  GtkFishbowlChild *child;
  GList *l;
  gint64 frame_time, elapsed;
-  gboolean do_update;

  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
  elapsed = frame_time - priv->last_frame_time;
-  do_update = frame_time / priv->update_delay != priv->last_frame_time / priv->update_delay;
  priv->last_frame_time = frame_time;

  /* last frame was 0, so we're just starting to animate */
@@ -579,9 +483,6 @@ gtk_fishbowl_tick (GtkWidget     *widget,

  gtk_widget_queue_allocate (widget);

-  if (do_update)
-    gtk_fishbowl_do_update (fishbowl);
-
  return G_SOURCE_CONTINUE;
 }

@@ -606,57 +507,8 @@ gtk_fishbowl_set_animating (GtkFishbowl *fishbowl,
      priv->last_frame_time = 0;
      gtk_widget_remove_tick_callback (GTK_WIDGET (fishbowl), priv->tick_id);
      priv->tick_id = 0;
-      priv->framerate = 0;
-      g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
    }

  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_ANIMATING]);
 }

-double
-gtk_fishbowl_get_framerate (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->framerate;
-}
-
-gint64
-gtk_fishbowl_get_update_delay (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->update_delay;
-}
-
-void
-gtk_fishbowl_set_update_delay (GtkFishbowl *fishbowl,
-                               gint64       update_delay)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (priv->update_delay == update_delay)
-    return;
-
-  priv->update_delay = update_delay;
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_UPDATE_DELAY]);
-}
-
-void
-gtk_fishbowl_set_creation_func (GtkFishbowl         *fishbowl,
-                                GtkFishCreationFunc  creation_func)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  g_object_freeze_notify (G_OBJECT (fishbowl));
-
-  gtk_fishbowl_set_count (fishbowl, 0);
-  priv->last_benchmark_change = 0;
-
-  priv->creation_func = creation_func;
-
-  gtk_fishbowl_set_count (fishbowl, 1);
-
-  g_object_thaw_notify (G_OBJECT (fishbowl));
-}
--- a/demos/gtk-demo/gtkfishbowl.h
+++ b/demos/gtk-demo/gtkfishbowl.h
@@ -32,37 +32,29 @@ G_BEGIN_DECLS
 typedef struct _GtkFishbowl              GtkFishbowl;
 typedef struct _GtkFishbowlClass         GtkFishbowlClass;

-typedef GtkWidget * (* GtkFishCreationFunc) (void);
-
 struct _GtkFishbowl
 {
-  GtkWidget parent;
+  GtkContainer container;
 };

 struct _GtkFishbowlClass
 {
-  GtkWidgetClass parent_class;
+  GtkContainerClass parent_class;
 };

 GType      gtk_fishbowl_get_type          (void) G_GNUC_CONST;

 GtkWidget* gtk_fishbowl_new               (void);

+void       gtk_fishbowl_set_use_icons     (GtkFishbowl       *fishbowl,
+                                           gboolean           use_icons);
+
 guint      gtk_fishbowl_get_count         (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_count         (GtkFishbowl       *fishbowl,
                                           guint              count);
 gboolean   gtk_fishbowl_get_animating     (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_animating     (GtkFishbowl       *fishbowl,
                                           gboolean           animating);
-gboolean   gtk_fishbowl_get_benchmark     (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_benchmark     (GtkFishbowl       *fishbowl,
-                                           gboolean           animating);
-double     gtk_fishbowl_get_framerate     (GtkFishbowl       *fishbowl);
-gint64     gtk_fishbowl_get_update_delay  (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_update_delay  (GtkFishbowl       *fishbowl,
-                                           gint64             update_delay);
-void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
-                                           GtkFishCreationFunc creation_func);

 G_END_DECLS

--- 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/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -30,7 +30,7 @@ do_headerbar (GtkWidget *do_widget)
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);

      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Welcome to Facebook - Log in, sign up or learn more");
      gtk_header_bar_set_has_subtitle (GTK_HEADER_BAR (header), FALSE);

--- 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,49 +128,54 @@ key_pressed (GtkEventController *controller,
        break;
    }

-  return GDK_EVENT_PROPAGATE;
+  return FALSE;
 }

-static void set_cursor_if_appropriate (GtkTextView *text_view,
-                                       gint         x,
-                                       gint         y);
-
-static void
-released_cb (GtkGestureMultiPress *gesture,
-             guint                 n_press,
-             gdouble               x,
-             gdouble               y,
-             GtkWidget            *text_view)
+/* Links can also be activated by clicking or tapping.
+ */
+static gboolean
+event_after (GtkWidget *text_view,
+             GdkEvent  *ev)
 {
  GtkTextIter start, end, iter;
  GtkTextBuffer *buffer;
-  int tx, ty;
+  gdouble ex, ey;
+  int x, y;
+  GdkEventType type;

-  if (gtk_gesture_single_get_button (GTK_GESTURE_SINGLE (gesture)) > 1)
-    return;
+  type = gdk_event_get_event_type (ev);

-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
-                                         GTK_TEXT_WINDOW_WIDGET,
-                                         x, y, &tx, &ty);
+  if (type == GDK_BUTTON_RELEASE)
+    {
+      guint button;
+
+      gdk_event_get_button (ev, &button);
+      if (button != GDK_BUTTON_PRIMARY)
+        return FALSE;
+    }
+  else if (type == GDK_TOUCH_END)
+    {
+    }
+  else
+    return FALSE;
+
+  gdk_event_get_coords (ev, &ex, &ey);

  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));

  /* we shouldn't follow a link if the user has selected something */
  gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
  if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end))
-    return;
+    return FALSE;
+
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         ex, ey, &x, &y);

  if (gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y))
    follow_if_link (text_view, &iter);
-}

-static void
-motion_cb (GtkEventControllerMotion *controller,
-           gdouble                   x,
-           gdouble                   y,
-           GtkTextView              *text_view)
-{
-  set_cursor_if_appropriate (text_view, x, y);
+  return TRUE;
 }

 static gboolean hovering_over_link = FALSE;
@@ -218,6 +223,25 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
    g_slist_free (tags);
 }

+/* Update the cursor image if the pointer moved.
+ */
+static gboolean
+motion_notify_event (GtkWidget      *text_view,
+                     GdkEventMotion *event)
+{
+  gdouble ex, ey;
+  gint x, y;
+
+  gdk_event_get_coords ((GdkEvent *)event, &ex, &ey);
+  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
+                                         GTK_TEXT_WINDOW_WIDGET,
+                                         ex, ey, &x, &y);
+
+  set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
+
+  return FALSE;
+}
+
 GtkWidget *
 do_hypertext (GtkWidget *do_widget)
 {
@@ -228,7 +252,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");
@@ -243,19 +266,12 @@ 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 ();
-      g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), view);
-      gtk_widget_add_controller (view, controller);
-
-      controller = GTK_EVENT_CONTROLLER (gtk_gesture_multi_press_new ());
-      g_signal_connect (controller, "released",
-                        G_CALLBACK (released_cb), view);
-      gtk_widget_add_controller (view, controller);
-
-      controller = gtk_event_controller_motion_new ();
-      g_signal_connect (controller, "motion",
-                        G_CALLBACK (motion_cb), view);
-      gtk_widget_add_controller (view, controller);
+      g_signal_connect (view, "key-press-event",
+                        G_CALLBACK (key_press_event), NULL);
+      g_signal_connect (view, "event-after",
+                        G_CALLBACK (event_after), NULL);
+      g_signal_connect (view, "motion-notify-event",
+                        G_CALLBACK (motion_notify_event), NULL);

      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));

--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -1,15 +1,15 @@
 /* Images
 *
- * GtkImage and GtkPicture are used to display an image; the image can be
- * in a number of formats.
- *
- * GtkImage is the widget used to display icons or images that should be
- * sized and styled like an icon, while GtkPicture is used for images
- * that should be displayed as-is.
+ * GtkImage is used to display an image; the image can be in a number of formats.
+ * Typically, you load an image into a GdkPixbuf, then display the pixbuf.
 *
 * This demo code shows some of the more obscure cases, in the simple
- * case a call to gtk_picture_new_for_file() or
- * gtk_image_new_from_icon_name() is all you need.
+ * case a call to gtk_image_new_from_file() is all you need.
+ *
+ * If you want to put image data in your program as a C variable,
+ * use the make-inline-pixbuf program that comes with GTK+.
+ * This way you won't need to depend on loading external files, your
+ * application binary can be self-contained.
 */

 #include <gtk/gtk.h>
@@ -27,9 +27,9 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
                               gpointer         data)
 {
  GdkPixbuf *pixbuf;
-  GtkWidget *picture;
+  GtkWidget *image;

-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);

  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);

@@ -38,7 +38,7 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
   */
  gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);

-  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 }

 static void
@@ -49,21 +49,21 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                              gint                 height,
                              gpointer     data)
 {
-  GtkWidget *picture;
+  GtkWidget *image;
  GdkPixbuf *pixbuf;

-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);

  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 }

 static gint
 progressive_timeout (gpointer data)
 {
-  GtkWidget *picture;
+  GtkWidget *image;

-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);

  /* This shows off fully-paranoid error handling, so looks scary.
   * You could factor out the error handling code into a nice separate
@@ -241,10 +241,10 @@ progressive_timeout (gpointer data)
      pixbuf_loader = gdk_pixbuf_loader_new ();

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

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

  /* leave timeout installed */
@@ -252,7 +252,7 @@ progressive_timeout (gpointer data)
 }

 static void
-start_progressive_loading (GtkWidget *picture)
+start_progressive_loading (GtkWidget *image)
 {
  /* This is obviously totally contrived (we slow down loading
   * on purpose to show how incremental loading works).
@@ -261,7 +261,9 @@ start_progressive_loading (GtkWidget *picture)
   * The timeout simply simulates a slow data source by inserting
   * pauses in the reading process.
   */
-  load_timeout = g_timeout_add (150, progressive_timeout, picture);
+  load_timeout = gdk_threads_add_timeout (150,
+                                progressive_timeout,
+                                image);
  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
 }

@@ -317,17 +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 *picture;
  GtkWidget *label;
  GtkWidget *button;
-  GdkPaintable *paintable;
-  GIcon *gicon;
+  GIcon     *gicon;

  if (!window)
    {
@@ -341,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),
@@ -381,9 +372,9 @@ do_images (GtkWidget *do_widget)
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
      gtk_box_pack_start (GTK_BOX (vbox), frame);

-      picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");
+      image = gtk_image_new_from_resource ("/images/floppybuddy.gif");

-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      gtk_container_add (GTK_CONTAINER (frame), image);

      /* Symbolic icon */

@@ -406,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),
@@ -423,52 +412,18 @@ do_images (GtkWidget *do_widget)
      /* Create an empty image for now; the progressive loader
       * will create the pixbuf and fill it in.
       */
-      picture = gtk_picture_new ();
-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      image = gtk_image_new_from_pixbuf (NULL);
+      gtk_container_add (GTK_CONTAINER (frame), image);

-      start_progressive_loading (picture);
-
-      /* 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);
-      picture = gtk_picture_new_for_paintable (paintable);
-      gtk_widget_set_size_request (picture, 100, 100);
-      gtk_widget_set_valign (picture, GTK_ALIGN_START);
-      gtk_container_add (GTK_CONTAINER (vbox), picture);
+      start_progressive_loading (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
@@ -1,239 +0,0 @@
-#include "config.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <string.h>
-#include <errno.h>
-#include <locale.h>
-#include <sys/stat.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib/gstdio.h>
-#include <hb-ot.h>
-
-#include "language-names.h"
-
-#define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
-#define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
-
-static GHashTable *language_map;
-
-static char *
-get_first_item_in_semicolon_list (const char *list)
-{
-  char **items;
-  char  *item;
-
-  items = g_strsplit (list, "; ", 2);
-
-  item = g_strdup (items[0]);
-  g_strfreev (items);
-
-  return item;
-}
-
-static char *
-capitalize_utf8_string (const char *str)
-{
-  char first[8] = { 0 };
-
-  if (!str)
-    return NULL;
-
-  g_unichar_to_utf8 (g_unichar_totitle (g_utf8_get_char (str)), first);
-
-  return g_strconcat (first, g_utf8_offset_to_pointer (str, 1), NULL);
-}
-
-static char *
-get_display_name (const char *language)
-{
-  const char  *translated;
-  char *tmp;
-  char *name;
-
-  translated = dgettext ("iso_639", language);
-
-  tmp = get_first_item_in_semicolon_list (translated);
-  name = capitalize_utf8_string (tmp);
-  g_free (tmp);
-
-  return name;
-}
-
-static void
-languages_parse_start_tag (GMarkupParseContext  *ctx,
-                           const char           *element_name,
-                           const char          **attr_names,
-                           const char          **attr_values,
-                           gpointer              user_data,
-                           GError              **error)
-{
-  const char *ccode_longB;
-  const char *ccode_longT;
-  const char *ccode;
-  const char *ccode_id;
-  const char *lang_name;
-  char *display_name;
-
-  if (!(g_str_equal (element_name, "iso_639_entry") ||
-        g_str_equal (element_name, "iso_639_3_entry")) ||
-        attr_names == NULL ||
-        attr_values == NULL)
-    return;
-
-  ccode = NULL;
-  ccode_longB = NULL;
-  ccode_longT = NULL;
-  ccode_id = NULL;
-  lang_name = NULL;
-
-  while (*attr_names && *attr_values)
-    {
-      if (g_str_equal (*attr_names, "iso_639_1_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 2)
-                return;
-              ccode = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "iso_639_2B_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 3)
-                return;
-              ccode_longB = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "iso_639_2T_code"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 3)
-                return;
-              ccode_longT = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "id"))
-        {
-          if (**attr_values)
-            {
-              if (strlen (*attr_values) != 2 &&
-                  strlen (*attr_values) != 3)
-                return;
-              ccode_id = *attr_values;
-            }
-        }
-      else if (g_str_equal (*attr_names, "name"))
-        {
-          lang_name = *attr_values;
-        }
-
-      ++attr_names;
-      ++attr_values;
-    }
-
-  if (lang_name == NULL)
-    return;
-
-  display_name = get_display_name (lang_name);
-
-  if (ccode != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode),
-                         g_strdup (display_name));
-
-  if (ccode_longB != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_longB),
-                         g_strdup (display_name));
-
-  if (ccode_longT != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_longT),
-                         g_strdup (display_name));
-
-  if (ccode_id != NULL)
-    g_hash_table_insert (language_map,
-                         pango_language_from_string (ccode_id),
-                         g_strdup (display_name));
-
-  g_free (display_name);
-}
-
-static void
-languages_variant_init (const char *variant)
-{
-  gboolean res;
-  gsize    buf_len;
-  char *buf = NULL;
-  char *filename = NULL;
-  GError *error = NULL;
-
-  bindtextdomain (variant, ISO_CODES_LOCALESDIR);
-  bind_textdomain_codeset (variant, "UTF-8");
-
-  error = NULL;
-  filename = g_strconcat (ISO_CODES_DATADIR, "/", variant, ".xml", NULL);
-  res = g_file_get_contents (filename, &buf, &buf_len, &error);
-  if (res)
-    {
-      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
-languages_init (void)
-{
-  if (language_map)
-    return;
-
-  language_map = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-  languages_variant_init ("iso_639");
-  languages_variant_init ("iso_639_3");
-}
-
-const char *
-get_language_name (PangoLanguage *language)
-{
-  languages_init ();
-
-  return (const char *) g_hash_table_lookup (language_map, language);
-}
-
-const char *
-get_language_name_for_tag (guint32 tag)
-{
-  hb_language_t lang;
-  const char *s;
-
-  lang = hb_ot_tag_to_language (tag);
-  s = hb_language_to_string (lang);
-
-  return get_language_name (pango_language_from_string (s));
-}
--- a/demos/gtk-demo/language-names.h
+++ b/demos/gtk-demo/language-names.h
@@ -1,13 +0,0 @@
-#ifndef LANGUAGE_NAMES_H
-#define LANGUAGE_NAMES_H
-
-#include <pango/pango.h>
-
-G_BEGIN_DECLS
-
-const char * get_language_name (PangoLanguage *language);
-const char * get_language_name_for_tag (guint32 tag);
-
-G_END_DECLS
-
-#endif
--- 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" },
@@ -296,7 +296,8 @@ do_list_store (GtkWidget *do_widget)

      /* finish & show */
      gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
-      g_signal_connect (window, "destroy", G_CALLBACK (window_closed), NULL);
+      g_signal_connect (window, "delete-event",
+                        G_CALLBACK (window_closed), NULL);
    }

  if (!gtk_widget_get_visible (window))
--- 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,39 +147,42 @@
            </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>
            </child>
            <child>
              <object class="GtkBox" id="extra_buttons_box">
-                <property name="visible">0</property>
                <property name="spacing">6</property>
                <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>
@@ -179,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>
@@ -190,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>
@@ -211,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>
@@ -261,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"/>
@@ -272,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"/>
@@ -292,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,13 +250,13 @@ static gchar *types[] =
  "GtkTreeSelection ",
  "GdkDisplay ",
  "GdkScreen ",
-  "GdkSurface ",
+  "GdkWindow ",
  "GdkEventButton ",
  "GdkCursor ",
  "GtkTreeIter ",
  "GtkTreeViewColumn ",
  "GdkDisplayManager ",
-  "GdkClipboard ",
+  "GtkClipboard ",
  "GtkIconSize ",
  "GtkImage ",
  "GdkDragContext ",
@@ -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
@@ -19,20 +19,24 @@
    <property name="default-width">800</property>
    <property name="default-height">600</property>
    <property name="title">GTK+ Demo</property>
+    <signal name="delete-event" handler="gtk_false" swapped="no"/>
    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="headerbar">
-        <property name="show-title-buttons">1</property>
+        <property name="visible">1</property>
+        <property name="show-close-button">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 +46,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 +92,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/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -68,7 +68,7 @@ do_markup (GtkWidget *do_widget)
      g_signal_connect (show_source, "toggled", G_CALLBACK (source_toggled), stack);

      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (header), TRUE);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), show_source);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);

--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -18,13 +18,14 @@ demos = files([
  'cursors.c',
  'dialog.c',
  'drawingarea.c',
-  'dnd.c',
  'editable_cells.c',
  'entry_buffer.c',
  'entry_completion.c',
+  'event_axes.c',
  'expander.c',
  'filtermodel.c',
  'fishbowl.c',
+  'widgetbowl.c',
  'foreigndrawing.c',
  'gestures.c',
  'glarea.c',
@@ -43,10 +44,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',
@@ -60,7 +57,6 @@ demos = files([
  'shortcuts.c',
  'sidebar.c',
  'sizegroup.c',
-  'sliding_puzzle.c',
  'spinbutton.c',
  'spinner.c',
  'stack.c',
@@ -69,18 +65,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', 'puzzlepiece.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

@@ -100,12 +93,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', 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',
@@ -114,7 +106,6 @@ executable('gtk4-demo-application',
           dependencies: gtkdemo_deps,
           include_directories: confinc,
           gui_app: true,
-           link_args: extra_demo_ldflags,
           install: true)

 # icons
@@ -129,11 +120,8 @@ foreach icon_size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
 endforeach

 # desktop file
-install_data('org.gtk.Demo.desktop', install_dir: gtk_applicationsdir)
+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="show-title-buttons">1</property>
+        <property name="visible">1</property>
+        <property name="show-close-button">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,10 +59,12 @@
  <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>
@@ -63,6 +73,7 @@
        </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>
@@ -71,6 +82,7 @@
        </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>
@@ -83,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>
@@ -114,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"/>
@@ -126,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"/>
@@ -133,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,411 +0,0 @@
-/* Paint
- *
- * Demonstrates practical handling of drawing tablets in a real world
- * usecase.
- */
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-enum {
-  COLOR_SET,
-  N_SIGNALS
-};
-
-static guint area_signals[N_SIGNALS] = { 0, };
-
-typedef struct
-{
-  GtkWidget parent_instance;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  GdkRGBA draw_color;
-  GtkPadController *pad_controller;
-  gdouble brush_size;
-} DrawingArea;
-
-typedef struct
-{
-  GtkWidgetClass parent_class;
-} DrawingAreaClass;
-
-static GtkPadActionEntry pad_actions[] = {
-  { GTK_PAD_ACTION_BUTTON, 1, -1, N_("Black"), "pad.black" },
-  { GTK_PAD_ACTION_BUTTON, 2, -1, N_("Pink"), "pad.pink" },
-  { GTK_PAD_ACTION_BUTTON, 3, -1, N_("Green"), "pad.green" },
-  { GTK_PAD_ACTION_BUTTON, 4, -1, N_("Red"), "pad.red" },
-  { GTK_PAD_ACTION_BUTTON, 5, -1, N_("Purple"), "pad.purple" },
-  { GTK_PAD_ACTION_BUTTON, 6, -1, N_("Orange"), "pad.orange" },
-  { GTK_PAD_ACTION_STRIP, -1, -1, N_("Brush size"), "pad.brush_size" },
-};
-
-static const gchar *pad_colors[] = {
-  "black",
-  "pink",
-  "green",
-  "red",
-  "purple",
-  "orange"
-};
-
-G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_WIDGET)
-
-static void drawing_area_set_color (DrawingArea *area,
-                                    GdkRGBA     *color);
-
-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
-                                  ));
-
-  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
-on_pad_button_activate (GSimpleAction *action,
-                        GVariant      *parameter,
-                        DrawingArea   *area)
-{
-  const gchar *color = g_object_get_data (G_OBJECT (action), "color");
-  GdkRGBA rgba;
-
-  gdk_rgba_parse (&rgba, color);
-  drawing_area_set_color (area, &rgba);
-}
-
-static void
-on_pad_knob_change (GSimpleAction *action,
-                    GVariant      *parameter,
-                    DrawingArea   *area)
-{
-  gdouble value = g_variant_get_double (parameter);
-
-  area->brush_size = value;
-}
-
-static void
-drawing_area_hierarchy_changed (GtkWidget *widget,
-                                GtkWidget *previous_toplevel)
-{
-  DrawingArea *area = (DrawingArea *) widget;
-  GSimpleActionGroup *action_group;
-  GSimpleAction *action;
-  GtkWidget *toplevel;
-  gint i;
-
-  if (previous_toplevel && area->pad_controller)
-    {
-      gtk_widget_remove_controller (previous_toplevel,
-                                    GTK_EVENT_CONTROLLER (area->pad_controller));
-      area->pad_controller = NULL;
-    }
-
-  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (area));
-  if (!GTK_IS_WINDOW (toplevel))
-    return;
-
-  action_group = g_simple_action_group_new ();
-  area->pad_controller = gtk_pad_controller_new (G_ACTION_GROUP (action_group),
-                                                 NULL);
-
-  for (i = 0; i < G_N_ELEMENTS (pad_actions); i++)
-    {
-      if (pad_actions[i].type == GTK_PAD_ACTION_BUTTON)
-        {
-          action = g_simple_action_new (pad_actions[i].action_name, NULL);
-          g_object_set_data (G_OBJECT (action), "color",
-                             (gpointer) pad_colors[i]);
-          g_signal_connect (action, "activate",
-                            G_CALLBACK (on_pad_button_activate), area);
-        }
-      else
-        {
-          action = g_simple_action_new_stateful (pad_actions[i].action_name,
-                                                 G_VARIANT_TYPE_DOUBLE, NULL);
-          g_signal_connect (action, "activate",
-                            G_CALLBACK (on_pad_knob_change), area);
-        }
-
-      g_action_map_add_action (G_ACTION_MAP (action_group), G_ACTION (action));
-      g_object_unref (action);
-    }
-
-  gtk_pad_controller_set_action_entries (area->pad_controller, pad_actions,
-                                         G_N_ELEMENTS (pad_actions));
-
-  gtk_widget_add_controller (toplevel,
-                             GTK_EVENT_CONTROLLER (area->pad_controller));
-}
-
-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;
-  widget_class->hierarchy_changed = drawing_area_hierarchy_changed;
-
-  area_signals[COLOR_SET] =
-    g_signal_new ("color-set",
-                  G_TYPE_FROM_CLASS (widget_class),
-                  G_SIGNAL_RUN_FIRST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, GDK_TYPE_RGBA);
-}
-
-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 * area->brush_size);
-      cairo_set_operator (area->cr, CAIRO_OPERATOR_DEST_OUT);
-    }
-  else
-    {
-      cairo_set_line_width (area->cr, 4 * pressure * area->brush_size);
-      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_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)
-{
-  GtkGesture *gesture;
-
-  gtk_widget_set_has_surface (GTK_WIDGET (area), FALSE);
-
-  gesture = gtk_gesture_stylus_new ();
-  g_signal_connect (gesture, "down",
-                    G_CALLBACK (stylus_gesture_down), area);
-  g_signal_connect (gesture, "motion",
-                    G_CALLBACK (stylus_gesture_motion), area);
-  gtk_widget_add_controller (GTK_WIDGET (area), GTK_EVENT_CONTROLLER (gesture));
-
-  area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
-}
-
-GtkWidget *
-drawing_area_new (void)
-{
-  return g_object_new (drawing_area_get_type (), NULL);
-}
-
-static void
-drawing_area_set_color (DrawingArea *area,
-                        GdkRGBA     *color)
-{
-  if (gdk_rgba_equal (&area->draw_color, color))
-    return;
-
-  area->draw_color = *color;
-  g_signal_emit (area, area_signals[COLOR_SET], 0, &area->draw_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);
-}
-
-static void
-drawing_area_color_set (DrawingArea    *area,
-                        GdkRGBA        *color,
-                        GtkColorButton *button)
-{
-  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (button), 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);
-      g_signal_connect (draw_area, "color-set",
-                        G_CALLBACK (drawing_area_color_set), colorbutton);
-      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,177 +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));
-
-  size = MIN (width, height);
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT ((width - size) / 2.0,
-                                                       (height - size) / 2.0,
-                                                       size, size));
-  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;
@@ -77,6 +78,7 @@ entry_size_allocate_cb (GtkEntry            *entry,
 static void
 entry_icon_press_cb (GtkEntry             *entry,
                     GtkEntryIconPosition  icon_pos,
+                     GdkEvent             *event,
                     gpointer              user_data)
 {
  GtkWidget *popover = user_data;
@@ -118,7 +120,7 @@ day_selected_cb (GtkCalendar *calendar,

  gtk_widget_show (popover);

-  g_object_unref (event);
+  gdk_event_free (event);
 }

 GtkWidget *
--- 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/puzzlepiece.c
+++ b/demos/gtk-demo/puzzlepiece.c
@@ -1,220 +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 "puzzlepiece.h"
-
-/* Declare the struct. */
-struct _GtkPuzzlePiece
-{
-  GObject parent_instance;
-
-  GdkPaintable *puzzle;
-  guint x;
-  guint y;
-  guint width;
-  guint height;
-};
-
-struct _GtkPuzzlePieceClass
-{
-  GObjectClass parent_class;
-};
-
-/* This is the function that draws the puzzle piece.
- * It just draws a rectangular cutout of the puzzle by clipping
- * away the rest.
- */
-static void
-gtk_puzzle_piece_snapshot (GdkPaintable *paintable,
-                           GdkSnapshot  *snapshot,
-                           double        width,
-                           double        height)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  gtk_snapshot_push_clip (snapshot,
-                          &GRAPHENE_RECT_INIT (0, 0, width, height));
-
-  gtk_snapshot_offset (snapshot,
-                       - width * self->x,
-                       - height * self->y);
-  gdk_paintable_snapshot (self->puzzle,
-                          snapshot,
-                          width * self->width,
-                          height * self->height);
-
-  gtk_snapshot_pop (snapshot);
-}
-
-static GdkPaintableFlags
-gtk_puzzle_piece_get_flags (GdkPaintable *paintable)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  /* The flags are the same as the ones of the puzzle.
-   * If the puzzle changes in some way, so do the pieces.
-   */
-  return gdk_paintable_get_flags (self->puzzle);
-}
-
-static int
-gtk_puzzle_piece_get_intrinsic_width (GdkPaintable *paintable)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  /* We can compute our width relative to the puzzle.
-   * This logic even works for the case where the puzzle
-   * has no width, because the 0 return value is unchanged.
-   * Round up the value.
-   */
-  return (gdk_paintable_get_intrinsic_width (self->puzzle) + self->width - 1) / self->width;
-}
-
-static int
-gtk_puzzle_piece_get_intrinsic_height (GdkPaintable *paintable)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  /* Do the same thing we did for the width with the height.
-   */
-  return (gdk_paintable_get_intrinsic_height (self->puzzle) + self->height - 1) / self->height;
-}
-
-static double
-gtk_puzzle_piece_get_intrinsic_aspect_ratio (GdkPaintable *paintable)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  /* We can compute our aspect ratio relative to the puzzle.
-   * This logic again works for the case where the puzzle
-   * has no aspect ratio, because the 0 return value is unchanged.
-   */
-  return gdk_paintable_get_intrinsic_aspect_ratio (self->puzzle) * self->height / self->width;
-}
-
-static void
-gtk_puzzle_piece_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_puzzle_piece_snapshot;
-  iface->get_flags = gtk_puzzle_piece_get_flags;
-  iface->get_intrinsic_width = gtk_puzzle_piece_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_puzzle_piece_get_intrinsic_height;
-  iface->get_intrinsic_aspect_ratio = gtk_puzzle_piece_get_intrinsic_aspect_ratio;
-}
-
-/* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkPuzzlePiece, gtk_puzzle_piece, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_puzzle_piece_paintable_init))
-
-/* We need to declare a destructor to release our reference to the
- * puzzle paintable and disconnect our signal handlers.
- */
-static void
-gtk_puzzle_piece_dispose (GObject *object)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (object);
-
-  if (self->puzzle)
-    {
-      g_signal_handlers_disconnect_by_func (self->puzzle, gdk_paintable_invalidate_contents, self);
-      g_signal_handlers_disconnect_by_func (self->puzzle, gdk_paintable_invalidate_size, self);
-      g_clear_object (&self->puzzle);
-    }
-
-  G_OBJECT_CLASS (gtk_puzzle_piece_parent_class)->dispose (object);
-}
-
-/* Here's the boilerplate for the GObject declaration.
- */
-static void
-gtk_puzzle_piece_class_init (GtkPuzzlePieceClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->dispose = gtk_puzzle_piece_dispose;
-}
-
-static void
-gtk_puzzle_piece_init (GtkPuzzlePiece *self)
-{
-}
-
-/* And finally, we add a constructor.
- * It is declared in the header so that the other examples
- * can use it.
- */
-GdkPaintable *
-gtk_puzzle_piece_new (GdkPaintable *puzzle,
-                      guint         x,
-                      guint         y,
-                      guint         width,
-                      guint         height)
-{
-  GtkPuzzlePiece *self;
-
-  /* These are sanity checks, so that we get warnings if we accidentally
-   * do anything stupid. */
-  g_return_val_if_fail (GDK_IS_PAINTABLE (puzzle), NULL);
-  g_return_val_if_fail (width > 0, NULL);
-  g_return_val_if_fail (height > 0, NULL);
-  g_return_val_if_fail (x < width, NULL);
-  g_return_val_if_fail (y < height, NULL);
-
-  self = g_object_new (GTK_TYPE_PUZZLE_PIECE, NULL);
-
-  self->puzzle = g_object_ref (puzzle);
-  g_signal_connect_swapped (puzzle, "invalidate-contents", G_CALLBACK (gdk_paintable_invalidate_contents), self);
-  g_signal_connect_swapped (puzzle, "invalidate-size", G_CALLBACK (gdk_paintable_invalidate_size), self);
-  self->x = x;
-  self->y = y;
-  self->width = width;
-  self->height = height;
-
-  return GDK_PAINTABLE (self);
-}
-
-/* Here are the accessors that we need to inspect the puzzle
- * pieces in other code.
- */
-GdkPaintable *
-gtk_puzzle_piece_get_puzzle (GtkPuzzlePiece *self)
-{
-  /* Add sanity checks here, too.
-   * If you make a habit out of this, you can always rely
-   * on your code having sanity checks, which makes it
-   * way easier to debug.
-   */
-  g_return_val_if_fail (GTK_IS_PUZZLE_PIECE (self), NULL);
-
-  return self->puzzle;
-}
-
-guint
-gtk_puzzle_piece_get_x (GtkPuzzlePiece *self)
-{
-  g_return_val_if_fail (GTK_IS_PUZZLE_PIECE (self), 0);
-
-  return self->x;
-}
-
-guint
-gtk_puzzle_piece_get_y (GtkPuzzlePiece *self)
-{
-  g_return_val_if_fail (GTK_IS_PUZZLE_PIECE (self), 0);
-
-  return self->y;
-}
-
--- a/demos/gtk-demo/puzzlepiece.h
+++ b/demos/gtk-demo/puzzlepiece.h
@@ -1,23 +0,0 @@
-#ifndef __PUZZLE_PIECE_H__
-#define __PUZZLE_PIECE_H__
-
-#include <gtk/gtk.h>
-
-/* First, add the boilerplate for the object itself.
- */
-#define GTK_TYPE_PUZZLE_PIECE (gtk_puzzle_piece_get_type ())
-G_DECLARE_FINAL_TYPE (GtkPuzzlePiece, gtk_puzzle_piece, GTK, PUZZLE_PIECE, GObject)
-
-/* Then, declare all constructors */
-GdkPaintable *  gtk_puzzle_piece_new            (GdkPaintable           *puzzle,
-                                                 guint                   x,
-                                                 guint                   y,
-                                                 guint                   width,
-                                                 guint                   height);
-
-/* Next, add the getters and setters for object properties */
-GdkPaintable *  gtk_puzzle_piece_get_puzzle     (GtkPuzzlePiece         *self);
-guint           gtk_puzzle_piece_get_x          (GtkPuzzlePiece         *self);
-guint           gtk_puzzle_piece_get_y          (GtkPuzzlePiece         *self);
-
-#endif /* __PUZZLE_PIECE_H__ */
--- 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/script-names.c
+++ b/demos/gtk-demo/script-names.c
@@ -1,184 +0,0 @@
-#include "config.h"
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <hb-ot.h>
-
-#include "script-names.h"
-
-static struct {
-  GUnicodeScript script;
-  hb_script_t hb_script;
-  const char *name;
-} scripts[] =
-{
-  { G_UNICODE_SCRIPT_COMMON, HB_SCRIPT_COMMON,  NULL },
-  { G_UNICODE_SCRIPT_INHERITED, HB_SCRIPT_INHERITED,  NULL },
-  { G_UNICODE_SCRIPT_ARABIC, HB_SCRIPT_ARABIC,  NC_("Script", "Arabic") },
-  { G_UNICODE_SCRIPT_ARMENIAN, HB_SCRIPT_ARMENIAN,  NC_("Script", "Armenian") },
-  { G_UNICODE_SCRIPT_BENGALI, HB_SCRIPT_BENGALI,  NC_("Script", "Bengali") },
-  { G_UNICODE_SCRIPT_BOPOMOFO, HB_SCRIPT_BOPOMOFO,  NC_("Script", "Bopomofo") },
-  { G_UNICODE_SCRIPT_CHEROKEE, HB_SCRIPT_CHEROKEE,  NC_("Script", "Cherokee") },
-  { G_UNICODE_SCRIPT_COPTIC, HB_SCRIPT_COPTIC,  NC_("Script", "Coptic") },
-  { G_UNICODE_SCRIPT_CYRILLIC, HB_SCRIPT_CYRILLIC,  NC_("Script", "Cyrillic") },
-  { G_UNICODE_SCRIPT_DESERET, HB_SCRIPT_DESERET,  NC_("Script", "Deseret") },
-  { G_UNICODE_SCRIPT_DEVANAGARI, HB_SCRIPT_DEVANAGARI,  NC_("Script", "Devanagari") },
-  { G_UNICODE_SCRIPT_ETHIOPIC, HB_SCRIPT_ETHIOPIC,  NC_("Script", "Ethiopic") },
-  { G_UNICODE_SCRIPT_GEORGIAN, HB_SCRIPT_GEORGIAN,  NC_("Script", "Georgian") },
-  { G_UNICODE_SCRIPT_GOTHIC, HB_SCRIPT_GOTHIC,  NC_("Script", "Gothic") },
-  { G_UNICODE_SCRIPT_GREEK, HB_SCRIPT_GREEK,  NC_("Script", "Greek") },
-  { G_UNICODE_SCRIPT_GUJARATI, HB_SCRIPT_GUJARATI,  NC_("Script", "Gujarati") },
-  { G_UNICODE_SCRIPT_GURMUKHI, HB_SCRIPT_GURMUKHI,  NC_("Script", "Gurmukhi") },
-  { G_UNICODE_SCRIPT_HAN, HB_SCRIPT_HAN,  NC_("Script", "Han") },
-  { G_UNICODE_SCRIPT_HANGUL, HB_SCRIPT_HANGUL,  NC_("Script", "Hangul") },
-  { G_UNICODE_SCRIPT_HEBREW, HB_SCRIPT_HEBREW,  NC_("Script", "Hebrew") },
-  { G_UNICODE_SCRIPT_HIRAGANA, HB_SCRIPT_HIRAGANA,  NC_("Script", "Hiragana") },
-  { G_UNICODE_SCRIPT_KANNADA, HB_SCRIPT_KANNADA,  NC_("Script", "Kannada") },
-  { G_UNICODE_SCRIPT_KATAKANA, HB_SCRIPT_KATAKANA,  NC_("Script", "Katakana") },
-  { G_UNICODE_SCRIPT_KHMER, HB_SCRIPT_KHMER,  NC_("Script", "Khmer") },
-  { G_UNICODE_SCRIPT_LAO, HB_SCRIPT_LAO,  NC_("Script", "Lao") },
-  { G_UNICODE_SCRIPT_LATIN, HB_SCRIPT_LATIN,  NC_("Script", "Latin") },
-  { G_UNICODE_SCRIPT_MALAYALAM, HB_SCRIPT_MALAYALAM,  NC_("Script", "Malayalam") },
-  { G_UNICODE_SCRIPT_MONGOLIAN, HB_SCRIPT_MONGOLIAN,  NC_("Script", "Mongolian") },
-  { G_UNICODE_SCRIPT_MYANMAR, HB_SCRIPT_MYANMAR,  NC_("Script", "Myanmar") },
-  { G_UNICODE_SCRIPT_OGHAM, HB_SCRIPT_OGHAM,  NC_("Script", "Ogham") },
-  { G_UNICODE_SCRIPT_OLD_ITALIC, HB_SCRIPT_OLD_ITALIC,  NC_("Script", "Old Italic") },
-  { G_UNICODE_SCRIPT_ORIYA, HB_SCRIPT_ORIYA,  NC_("Script", "Oriya") },
-  { G_UNICODE_SCRIPT_RUNIC, HB_SCRIPT_RUNIC,  NC_("Script", "Runic") },
-  { G_UNICODE_SCRIPT_SINHALA, HB_SCRIPT_SINHALA,  NC_("Script", "Sinhala") },
-  { G_UNICODE_SCRIPT_SYRIAC, HB_SCRIPT_SYRIAC,  NC_("Script", "Syriac") },
-  { G_UNICODE_SCRIPT_TAMIL, HB_SCRIPT_TAMIL,  NC_("Script", "Tamil") },
-  { G_UNICODE_SCRIPT_TELUGU, HB_SCRIPT_TELUGU,  NC_("Script", "Telugu") },
-  { G_UNICODE_SCRIPT_THAANA, HB_SCRIPT_THAANA,  NC_("Script", "Thaana") },
-  { G_UNICODE_SCRIPT_THAI, HB_SCRIPT_THAI,  NC_("Script", "Thai") },
-  { G_UNICODE_SCRIPT_TIBETAN, HB_SCRIPT_TIBETAN,  NC_("Script", "Tibetan") },
-  { G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL, HB_SCRIPT_CANADIAN_ABORIGINAL,  NC_("Script", "Canadian Aboriginal") },
-  { G_UNICODE_SCRIPT_YI, HB_SCRIPT_YI,  NC_("Script", "Yi") },
-  { G_UNICODE_SCRIPT_TAGALOG, HB_SCRIPT_TAGALOG,  NC_("Script", "Tagalog") },
-  { G_UNICODE_SCRIPT_HANUNOO, HB_SCRIPT_HANUNOO,  NC_("Script", "Hanunoo") },
-  { G_UNICODE_SCRIPT_BUHID, HB_SCRIPT_BUHID,  NC_("Script", "Buhid") },
-  { G_UNICODE_SCRIPT_TAGBANWA, HB_SCRIPT_TAGBANWA,  NC_("Script", "Tagbanwa") },
-  { G_UNICODE_SCRIPT_BRAILLE, HB_SCRIPT_BRAILLE,  NC_("Script", "Braille") },
-  { G_UNICODE_SCRIPT_CYPRIOT, HB_SCRIPT_CYPRIOT,  NC_("Script", "Cypriot") },
-  { G_UNICODE_SCRIPT_LIMBU, HB_SCRIPT_LIMBU,  NC_("Script", "Limbu") },
-  { G_UNICODE_SCRIPT_OSMANYA, HB_SCRIPT_OSMANYA,  NC_("Script", "Osmanya") },
-  { G_UNICODE_SCRIPT_SHAVIAN, HB_SCRIPT_SHAVIAN,  NC_("Script", "Shavian") },
-  { G_UNICODE_SCRIPT_LINEAR_B, HB_SCRIPT_LINEAR_B,  NC_("Script", "Linear B") },
-  { G_UNICODE_SCRIPT_TAI_LE, HB_SCRIPT_TAI_LE,  NC_("Script", "Tai Le") },
-  { G_UNICODE_SCRIPT_UGARITIC, HB_SCRIPT_UGARITIC,  NC_("Script", "Ugaritic") },
-  { G_UNICODE_SCRIPT_NEW_TAI_LUE, HB_SCRIPT_NEW_TAI_LUE,  NC_("Script", "New Tai Lue") },
-  { G_UNICODE_SCRIPT_BUGINESE, HB_SCRIPT_BUGINESE,  NC_("Script", "Buginese") },
-  { G_UNICODE_SCRIPT_GLAGOLITIC, HB_SCRIPT_GLAGOLITIC,  NC_("Script", "Glagolitic") },
-  { G_UNICODE_SCRIPT_TIFINAGH, HB_SCRIPT_TIFINAGH,  NC_("Script", "Tifinagh") },
-  { G_UNICODE_SCRIPT_SYLOTI_NAGRI, HB_SCRIPT_SYLOTI_NAGRI,  NC_("Script", "Syloti Nagri") },
-  { G_UNICODE_SCRIPT_OLD_PERSIAN, HB_SCRIPT_OLD_PERSIAN,  NC_("Script", "Old Persian") },
-  { G_UNICODE_SCRIPT_KHAROSHTHI, HB_SCRIPT_KHAROSHTHI,  NC_("Script", "Kharoshthi") },
-  { G_UNICODE_SCRIPT_UNKNOWN, HB_SCRIPT_UNKNOWN,  NC_("Script", "Unknown") },
-  { G_UNICODE_SCRIPT_BALINESE, HB_SCRIPT_BALINESE,  NC_("Script", "Balinese") },
-  { G_UNICODE_SCRIPT_CUNEIFORM, HB_SCRIPT_CUNEIFORM,  NC_("Script", "Cuneiform") },
-  { G_UNICODE_SCRIPT_PHOENICIAN, HB_SCRIPT_PHOENICIAN,  NC_("Script", "Phoenician") },
-  { G_UNICODE_SCRIPT_PHAGS_PA, HB_SCRIPT_PHAGS_PA,  NC_("Script", "Phags-pa") },
-  { G_UNICODE_SCRIPT_NKO, HB_SCRIPT_NKO,  NC_("Script", "N'Ko") },
-  { G_UNICODE_SCRIPT_KAYAH_LI, HB_SCRIPT_KAYAH_LI,  NC_("Script", "Kayah Li") },
-  { G_UNICODE_SCRIPT_LEPCHA, HB_SCRIPT_LEPCHA,  NC_("Script", "Lepcha") },
-  { G_UNICODE_SCRIPT_REJANG, HB_SCRIPT_REJANG,  NC_("Script", "Rejang") },
-  { G_UNICODE_SCRIPT_SUNDANESE, HB_SCRIPT_SUNDANESE,  NC_("Script", "Sundanese") },
-  { G_UNICODE_SCRIPT_SAURASHTRA, HB_SCRIPT_SAURASHTRA,  NC_("Script", "Saurashtra") },
-  { G_UNICODE_SCRIPT_CHAM, HB_SCRIPT_CHAM,  NC_("Script", "Cham") },
-  { G_UNICODE_SCRIPT_OL_CHIKI, HB_SCRIPT_OL_CHIKI,  NC_("Script", "Ol Chiki") },
-  { G_UNICODE_SCRIPT_VAI, HB_SCRIPT_VAI,  NC_("Script", "Vai") },
-  { G_UNICODE_SCRIPT_CARIAN, HB_SCRIPT_CARIAN,  NC_("Script", "Carian") },
-  { G_UNICODE_SCRIPT_LYCIAN, HB_SCRIPT_LYCIAN,  NC_("Script", "Lycian") },
-  { G_UNICODE_SCRIPT_LYDIAN, HB_SCRIPT_LYDIAN,  NC_("Script", "Lydian") },
-  { G_UNICODE_SCRIPT_AVESTAN, HB_SCRIPT_AVESTAN,  NC_("Script", "Avestan") },
-  { G_UNICODE_SCRIPT_BAMUM, HB_SCRIPT_BAMUM,  NC_("Script", "Bamum") },
-  { G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS, HB_SCRIPT_EGYPTIAN_HIEROGLYPHS,  NC_("Script", "Egyptian Hieroglpyhs") },
-  { G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC, HB_SCRIPT_IMPERIAL_ARAMAIC,  NC_("Script", "Imperial Aramaic") },
-  { G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI, HB_SCRIPT_INSCRIPTIONAL_PAHLAVI,  NC_("Script", "Inscriptional Pahlavi") },
-  { G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN, HB_SCRIPT_INSCRIPTIONAL_PARTHIAN,  NC_("Script", "Inscriptional Parthian") },
-  { G_UNICODE_SCRIPT_JAVANESE, HB_SCRIPT_JAVANESE,  NC_("Script", "Javanese") },
-  { G_UNICODE_SCRIPT_KAITHI, HB_SCRIPT_KAITHI,  NC_("Script", "Kaithi") },
-  { G_UNICODE_SCRIPT_LISU, HB_SCRIPT_LISU,  NC_("Script", "Lisu") },
-  { G_UNICODE_SCRIPT_MEETEI_MAYEK, HB_SCRIPT_MEETEI_MAYEK,  NC_("Script", "Meetei Mayek") },
-  { G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN, HB_SCRIPT_OLD_SOUTH_ARABIAN,  NC_("Script", "Old South Arabian") },
-  { G_UNICODE_SCRIPT_OLD_TURKIC, HB_SCRIPT_OLD_TURKIC,  NC_("Script", "Old Turkic") },
-  { G_UNICODE_SCRIPT_SAMARITAN, HB_SCRIPT_SAMARITAN,  NC_("Script", "Samaritan") },
-  { G_UNICODE_SCRIPT_TAI_THAM, HB_SCRIPT_TAI_THAM,  NC_("Script", "Tai Tham") },
-  { G_UNICODE_SCRIPT_TAI_VIET, HB_SCRIPT_TAI_VIET,  NC_("Script", "Tai Viet") },
-  { G_UNICODE_SCRIPT_BATAK, HB_SCRIPT_BATAK,  NC_("Script", "Batak") },
-  { G_UNICODE_SCRIPT_BRAHMI, HB_SCRIPT_BRAHMI,  NC_("Script", "Brahmi") },
-  { G_UNICODE_SCRIPT_MANDAIC, HB_SCRIPT_MANDAIC,  NC_("Script", "Mandaic") },
-  { G_UNICODE_SCRIPT_CHAKMA, HB_SCRIPT_CHAKMA,  NC_("Script", "Chakma") },
-  { G_UNICODE_SCRIPT_MEROITIC_CURSIVE, HB_SCRIPT_MEROITIC_CURSIVE,  NC_("Script", "Meroitic Cursive") },
-  { G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS, HB_SCRIPT_MEROITIC_HIEROGLYPHS,  NC_("Script", "Meroitic Hieroglyphs") },
-  { G_UNICODE_SCRIPT_MIAO, HB_SCRIPT_MIAO,  NC_("Script", "Miao") },
-  { G_UNICODE_SCRIPT_SHARADA, HB_SCRIPT_SHARADA,  NC_("Script", "Sharada") },
-  { G_UNICODE_SCRIPT_SORA_SOMPENG, HB_SCRIPT_SORA_SOMPENG,  NC_("Script", "Sora Sompeng") },
-  { G_UNICODE_SCRIPT_TAKRI, HB_SCRIPT_TAKRI,  NC_("Script", "Takri") },
-  { G_UNICODE_SCRIPT_BASSA_VAH, HB_SCRIPT_BASSA_VAH,  NC_("Script", "Bassa") },
-  { G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN, HB_SCRIPT_CAUCASIAN_ALBANIAN,  NC_("Script", "Caucasian Albanian") },
-  { G_UNICODE_SCRIPT_DUPLOYAN, HB_SCRIPT_DUPLOYAN,  NC_("Script", "Duployan") },
-  { G_UNICODE_SCRIPT_ELBASAN, HB_SCRIPT_ELBASAN,  NC_("Script", "Elbasan") },
-  { G_UNICODE_SCRIPT_GRANTHA, HB_SCRIPT_GRANTHA,  NC_("Script", "Grantha") },
-  { G_UNICODE_SCRIPT_KHOJKI, HB_SCRIPT_KHOJKI,  NC_("Script", "Kjohki") },
-  { G_UNICODE_SCRIPT_KHUDAWADI, HB_SCRIPT_KHUDAWADI,  NC_("Script", "Khudawadi, Sindhi") },
-  { G_UNICODE_SCRIPT_LINEAR_A, HB_SCRIPT_LINEAR_A,  NC_("Script", "Linear A") },
-  { G_UNICODE_SCRIPT_MAHAJANI, HB_SCRIPT_MAHAJANI,  NC_("Script", "Mahajani") },
-  { G_UNICODE_SCRIPT_MANICHAEAN, HB_SCRIPT_MANICHAEAN,  NC_("Script", "Manichaean") },
-  { G_UNICODE_SCRIPT_MENDE_KIKAKUI, HB_SCRIPT_MENDE_KIKAKUI,  NC_("Script", "Mende Kikakui") },
-  { G_UNICODE_SCRIPT_MODI, HB_SCRIPT_MODI,  NC_("Script", "Modi") },
-  { G_UNICODE_SCRIPT_MRO, HB_SCRIPT_MRO,  NC_("Script", "Mro") },
-  { G_UNICODE_SCRIPT_NABATAEAN, HB_SCRIPT_NABATAEAN,  NC_("Script", "Nabataean") },
-  { G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN, HB_SCRIPT_OLD_NORTH_ARABIAN,  NC_("Script", "Old North Arabian") },
-  { G_UNICODE_SCRIPT_OLD_PERMIC, HB_SCRIPT_OLD_PERMIC,  NC_("Script", "Old Permic") },
-  { G_UNICODE_SCRIPT_PAHAWH_HMONG, HB_SCRIPT_PAHAWH_HMONG,  NC_("Script", "Pahawh Hmong") },
-  { G_UNICODE_SCRIPT_PALMYRENE, HB_SCRIPT_PALMYRENE,  NC_("Script", "Palmyrene") },
-  { G_UNICODE_SCRIPT_PAU_CIN_HAU, HB_SCRIPT_PAU_CIN_HAU,  NC_("Script", "Pau Cin Hau") },
-  { G_UNICODE_SCRIPT_PSALTER_PAHLAVI, HB_SCRIPT_PSALTER_PAHLAVI,  NC_("Script", "Psalter Pahlavi") },
-  { G_UNICODE_SCRIPT_SIDDHAM, HB_SCRIPT_SIDDHAM,  NC_("Script", "Siddham") },
-  { G_UNICODE_SCRIPT_TIRHUTA, HB_SCRIPT_TIRHUTA,  NC_("Script", "Tirhuta") },
-  { G_UNICODE_SCRIPT_WARANG_CITI, HB_SCRIPT_WARANG_CITI,  NC_("Script", "Warang Citi") },
-  { G_UNICODE_SCRIPT_AHOM, HB_SCRIPT_AHOM,  NC_("Script", "Ahom") },
-  { G_UNICODE_SCRIPT_ANATOLIAN_HIEROGLYPHS, HB_SCRIPT_ANATOLIAN_HIEROGLYPHS,  NC_("Script", "Anatolian Hieroglyphs") },
-  { G_UNICODE_SCRIPT_HATRAN, HB_SCRIPT_HATRAN,  NC_("Script", "Hatran") },
-  { G_UNICODE_SCRIPT_MULTANI, HB_SCRIPT_MULTANI,  NC_("Script", "Multani") },
-  { G_UNICODE_SCRIPT_OLD_HUNGARIAN, HB_SCRIPT_OLD_HUNGARIAN,  NC_("Script", "Old Hungarian") },
-  { G_UNICODE_SCRIPT_SIGNWRITING, HB_SCRIPT_SIGNWRITING,  NC_("Script", "Signwriting") },
-  { G_UNICODE_SCRIPT_ADLAM, HB_SCRIPT_ADLAM,  NC_("Script", "Adlam") },
-  { G_UNICODE_SCRIPT_BHAIKSUKI, HB_SCRIPT_BHAIKSUKI,  NC_("Script", "Bhaiksuki") },
-  { G_UNICODE_SCRIPT_MARCHEN, HB_SCRIPT_MARCHEN,  NC_("Script", "Marchen") },
-  { G_UNICODE_SCRIPT_NEWA, HB_SCRIPT_NEWA,  NC_("Script", "Newa") },
-  { G_UNICODE_SCRIPT_OSAGE, HB_SCRIPT_OSAGE,  NC_("Script", "Osage") },
-  { G_UNICODE_SCRIPT_TANGUT, HB_SCRIPT_TANGUT,  NC_("Script", "Tangut") },
-  { G_UNICODE_SCRIPT_MASARAM_GONDI, HB_SCRIPT_INVALID,  NC_("Script", "Masaram Gondi") },
-  { G_UNICODE_SCRIPT_NUSHU, HB_SCRIPT_INVALID,  NC_("Script", "Nushu") },
-  { G_UNICODE_SCRIPT_SOYOMBO, HB_SCRIPT_INVALID,  NC_("Script", "Soyombo") },
-  { G_UNICODE_SCRIPT_ZANABAZAR_SQUARE, HB_SCRIPT_INVALID,  NC_("Script", "Zanabazar Square") },
-};
-
-const char *
-get_script_name (GUnicodeScript script)
-{
-  int i;
-
-  for (i = 0; i < G_N_ELEMENTS (scripts); i++)
-    {
-      if (scripts[i].script == script)
-        return g_dpgettext2 (GETTEXT_PACKAGE, "Script", scripts[i].name);
-    }
-
-  return NULL;
-}
-
-const char *
-get_script_name_for_tag (guint32 tag)
-{
-  int i;
-
-  for (i = 0; i < G_N_ELEMENTS (scripts); i++)
-    {
-      if (scripts[i].hb_script == hb_script_from_iso15924_tag (tag))
-        return g_dpgettext2 (GETTEXT_PACKAGE, "Script", scripts[i].name);
-    }
-
-  return NULL;
-}
--- a/demos/gtk-demo/script-names.h
+++ b/demos/gtk-demo/script-names.h
@@ -1,13 +0,0 @@
-#ifndef SCRIPT_NAMES_H
-#define SCRIPT_NAMES_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-const char * get_script_name (GUnicodeScript script);
-const char * get_script_name_for_tag (guint32 tag);
-
-G_END_DECLS
-
-#endif
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -151,10 +151,11 @@ create_search_menu (GtkWidget *entry)
 static void
 icon_press_cb (GtkEntry       *entry,
               gint            position,
+               GdkEventButton *event,
               gpointer        data)
 {
  if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+    gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) event);
 }

 static void
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -26,6 +26,14 @@ changed_cb (GtkEditable *editable)
  g_message ("changed: %s", text);
 }

+static gboolean
+window_key_press_event_cb (GtkWidget    *widget,
+			   GdkEvent     *event,
+			   GtkSearchBar *bar)
+{
+  return gtk_search_bar_handle_event (bar, event);
+}
+
 static void
 search_changed (GtkSearchEntry *entry,
                GtkLabel       *label)
@@ -91,7 +99,8 @@ do_search_entry2 (GtkWidget *do_widget)
      gtk_box_pack_start (GTK_BOX (vbox), searchbar);

      /* Hook the search bar to key presses */
-      gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (searchbar), window);
+      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/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -40,7 +40,7 @@ do_sidebar (GtkWidget *do_widget)
      gtk_widget_set_size_request (window, 500, 350);

      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR(header), TRUE);
+      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header), TRUE);
      gtk_window_set_titlebar (GTK_WINDOW(window), header);
      gtk_window_set_title (GTK_WINDOW(window), "Stack Sidebar");

--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -1,486 +0,0 @@
-/* Sliding puzzle
- *
- * This demo demonstrates how to use gestures and paintables to create a
- * small sliding puzzle game.
- *
- */
-
-#include <gtk/gtk.h>
-
-/* Include the header for the puzzle piece */
-#include "puzzlepiece.h"
-#include "paintable.h"
-
-static GtkWidget *window = NULL;
-static GtkWidget *frame = NULL;
-static GtkWidget *choices = NULL;
-static GtkWidget *size_spin = NULL;
-static GdkPaintable *puzzle = NULL;
-
-static gboolean solved = TRUE;
-static guint width = 3;
-static guint height = 3;
-static guint pos_x;
-static guint pos_y;
-
-static gboolean
-move_puzzle (GtkWidget *grid,
-             int        dx,
-             int        dy)
-{
-  GtkWidget *pos, *next;
-  GdkPaintable *piece;
-  guint next_x, next_y;
-
-  /* We don't move anything if the puzzle is solved */
-  if (solved)
-    return FALSE;
-
-  /* Return FALSE if we can't move to where the call 
-   * wants us to move.
-   */
-  if ((dx < 0 && pos_x < -dx) ||
-      dx + pos_x >= width ||
-      (dy < 0 && pos_y < -dy) ||
-      dy + pos_y >= height)
-    return FALSE;
-
-  /* Compute the new position */
-  next_x = pos_x + dx;
-  next_y = pos_y + dy;
-
-  /* Get the current and next image */
-  pos = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y);
-  next = gtk_grid_get_child_at (GTK_GRID (grid), next_x, next_y);
-
-  /* Move the displayed piece. */
-  piece = gtk_picture_get_paintable (GTK_PICTURE (next));
-  gtk_picture_set_paintable (GTK_PICTURE (pos), piece);
-  gtk_picture_set_paintable (GTK_PICTURE (next), NULL);
-
-  /* Update the current position */
-  pos_x = next_x;
-  pos_y = next_y;
-
-  /* Return TRUE because we successfully moved the piece */
-  return TRUE;
-}
-
-static void
-shuffle_puzzle (GtkWidget *grid)
-{
-  guint i, n_steps;
-
-  /* Do this many random moves */
-  n_steps = width * height * 50;
-
-  for (i = 0; i < n_steps; i++)
-    {
-      /* Get a random number for the direction to move in */
-      switch (g_random_int_range (0, 4))
-        {
-        case 0:
-          /* left */
-          move_puzzle (grid, -1, 0);
-          break;
-
-        case 1:
-          /* up */
-          move_puzzle (grid, 0, -1);
-          break;
-
-        case 2:
-          /* right */
-          move_puzzle (grid, 1, 0);
-          break;
-
-        case 3:
-          /* down */
-          move_puzzle (grid, 0, 1);
-          break;
-
-        default:
-          g_assert_not_reached ();
-          continue;
-        }
-    }
-}
-
-static gboolean
-check_solved (GtkWidget *grid)
-{
-  GtkWidget *picture;
-  GdkPaintable *piece;
-  guint x, y;
-
-  /* Nothing to check if the puzzle is already solved */
-  if (solved)
-    return TRUE;
-
-  /* If the empty cell isn't in the bottom right,
-   * the puzzle is obviously not solved */
-  if (pos_x != width - 1 ||
-      pos_y != height - 1)
-    return FALSE;
-
-  /* Check that all pieces are in the right position */
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          picture = gtk_grid_get_child_at (GTK_GRID (grid), x, y);
-          piece = gtk_picture_get_paintable (GTK_PICTURE (picture));
-
-          /* empty cell */
-          if (piece == NULL)
-            continue;
-
-          if (gtk_puzzle_piece_get_x (GTK_PUZZLE_PIECE (piece)) != x ||
-              gtk_puzzle_piece_get_y (GTK_PUZZLE_PIECE (piece)) != y)
-            return FALSE;
-        }
-    }
-
-  /* We solved the puzzle!
-   */
-  solved = TRUE;
-
-  /* Fill the empty cell to show that we're done.
-   */
-  picture = gtk_grid_get_child_at (GTK_GRID (grid), 0, 0);
-  piece = gtk_picture_get_paintable (GTK_PICTURE (picture));
-
-  piece = gtk_puzzle_piece_new (gtk_puzzle_piece_get_puzzle (GTK_PUZZLE_PIECE (piece)),
-                                pos_x, pos_y,
-                                width, height);
-  picture = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y);
-  gtk_picture_set_paintable (GTK_PICTURE (picture), piece);
-
-  return TRUE;
-}
-
-static gboolean
-puzzle_key_pressed (GtkEventControllerKey *controller,
-                    guint                  keyval,
-                    guint                  keycode,
-                    GdkModifierType        state,
-                    GtkWidget             *grid)
-{
-  int dx, dy;
-
-  dx = 0;
-  dy = 0;
-
-  switch (keyval)
-    {
-    case GDK_KEY_KP_Left:
-    case GDK_KEY_Left:
-      /* left */
-      dx = -1;
-      break;
-
-    case GDK_KEY_KP_Up:
-    case GDK_KEY_Up:
-      /* up */
-      dy = -1;
-      break;
-
-    case GDK_KEY_KP_Right:
-    case GDK_KEY_Right:
-      /* right */
-      dx = 1;
-      break;
-
-    case GDK_KEY_KP_Down:
-    case GDK_KEY_Down:
-      /* down */
-      dy = 1;
-      break;
-
-    default:
-      /* We return FALSE here because we didn't handle the key that was pressed */
-      return FALSE;
-    }
-
-  if (!move_puzzle (grid, dx, dy))
-    {
-      /* Make the error sound and then return TRUE.
-       * We handled this key, even though we didn't
-       * do anything to the puzzle.
-       */
-      gtk_widget_error_bell (grid);
-      return TRUE;
-    }
-
-  check_solved (grid);
-
-  return TRUE;
-}
-
-static void
-puzzle_button_pressed (GtkGestureMultiPress *gesture,
-                       int                   n_press,
-                       double                x,
-                       double                y,
-                       GtkWidget            *grid)
-{
-  GtkWidget *child;
-  int l, t, i;
-  int pos;
-
-  child = gtk_widget_pick (grid, x, y);
-
-  if (!child)
-    {
-      gtk_widget_error_bell (grid);
-      return;
-    }
-
-  gtk_container_child_get (GTK_CONTAINER (grid), child,
-                           "left-attach", &l,
-                           "top-attach", &t,
-                           NULL);
-
-  if (l == pos_x && t == pos_y)
-    {
-      gtk_widget_error_bell (grid);
-    }
-  else if (l == pos_x)
-    {
-      pos = pos_y;
-      for (i = t; i < pos; i++)
-        {
-          if (!move_puzzle (grid, 0, -1))
-            gtk_widget_error_bell (grid);
-        }
-      for (i = pos; i < t; i++)
-        {
-          if (!move_puzzle (grid, 0, 1))
-            gtk_widget_error_bell (grid);
-        }
-    }
-  else if (t == pos_y)
-    {
-      pos = pos_x;
-      for (i = l; i < pos; i++)
-        {
-          if (!move_puzzle (grid, -1, 0))
-            gtk_widget_error_bell (grid);
-        }
-      for (i = pos; i < l; i++)
-        {
-          if (!move_puzzle (grid, 1, 0))
-            gtk_widget_error_bell (grid);
-        }
-    }
-  else
-    {
-      gtk_widget_error_bell (grid);
-    }
-}
-
-static void
-start_puzzle (GdkPaintable *puzzle)
-{
-  GtkWidget *picture, *grid;
-  GtkEventController *controller;
-  guint x, y;
-
-  /* Remove the old grid (if there is one) */
-  grid = gtk_bin_get_child (GTK_BIN (frame));
-  if (grid)
-    gtk_container_remove (GTK_CONTAINER (frame), grid);
-
-  /* Create a new grid */
-  grid = gtk_grid_new ();
-  gtk_widget_set_can_focus (grid, TRUE);
-  gtk_container_add (GTK_CONTAINER (frame), grid);
-  gtk_aspect_frame_set (GTK_ASPECT_FRAME (frame), 0.5, 0.5, (float) gdk_paintable_get_intrinsic_aspect_ratio (puzzle), FALSE);
-
-  /* Add a key event controller so people can use the arrow
-   * keys to move the puzzle */
-  controller = gtk_event_controller_key_new ();
-  g_signal_connect (controller, "key-pressed",
-                    G_CALLBACK (puzzle_key_pressed),
-                    grid);
-  gtk_widget_add_controller (GTK_WIDGET (grid), controller);
-
-  controller = GTK_EVENT_CONTROLLER (gtk_gesture_multi_press_new ());
-  g_signal_connect (controller, "pressed",
-                    G_CALLBACK (puzzle_button_pressed),
-                    grid);
-  gtk_widget_add_controller (GTK_WIDGET (grid), controller);
-
-  /* Make sure the cells have equal size */
-  gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
-  gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
-
-  /* Reset the variables */
-  solved = FALSE;
-  pos_x = width - 1;
-  pos_y = height - 1;
-
-  /* add a picture for every cell */
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          GdkPaintable *piece;
-
-          /* Don't paint anything for the lsiding part of the video */
-          if (x == pos_x && y == pos_y)
-            piece = NULL;
-          else
-            piece = gtk_puzzle_piece_new (puzzle,
-                                          x, y,
-                                          width, height);
-          picture = gtk_picture_new_for_paintable (piece);
-          gtk_picture_set_keep_aspect_ratio (GTK_PICTURE (picture), FALSE);
-          gtk_grid_attach (GTK_GRID (grid),
-                           picture,
-                           x, y,
-                           1, 1);
-        }
-    }
-
-  shuffle_puzzle (grid);
-}
-
-static void
-reshuffle (void)
-{
-  GtkWidget *grid;
-
-  grid = gtk_bin_get_child (GTK_BIN (frame));
-  if (solved)
-    start_puzzle (puzzle);
-  else
-    shuffle_puzzle (grid);
-  gtk_widget_grab_focus (grid);
-}
-
-static void
-reconfigure (void)
-{
-  GtkWidget *popover;
-  GtkWidget *grid;
-  GtkWidget *child;
-  GtkWidget *image;
-  GList *selected;
-
-  width = height = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (size_spin));
-
-  selected = gtk_flow_box_get_selected_children (GTK_FLOW_BOX (choices));
-  if (selected == NULL)
-    child = gtk_widget_get_first_child (choices);
-  else
-    {
-      child = selected->data;
-      g_list_free (selected);
-    }
-  image = gtk_bin_get_child (GTK_BIN (child));
-  puzzle = gtk_image_get_paintable (GTK_IMAGE (image));
-
-  start_puzzle (puzzle); 
-  popover = gtk_widget_get_ancestor (size_spin, GTK_TYPE_POPOVER);
-  gtk_popover_popdown (GTK_POPOVER (popover));
-  grid = gtk_bin_get_child (GTK_BIN (frame));
-  gtk_widget_grab_focus (grid);
-}
-
-static void
-add_choice (GtkWidget    *choices,
-            GdkPaintable *paintable)
-{
-  GtkWidget *icon;
-
-  icon = gtk_image_new_from_paintable (paintable);
-  gtk_image_set_icon_size (GTK_IMAGE (icon), GTK_ICON_SIZE_LARGE);
-
-  gtk_container_add (GTK_CONTAINER (choices), icon);
-}
-
-GtkWidget *
-do_sliding_puzzle (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *header;
-      GtkWidget *restart;
-      GtkWidget *tweak;
-      GtkWidget *popover;
-      GtkWidget *tweaks;
-      GtkWidget *apply;
-      GtkWidget *label;
-      GtkWidget *sw;
-      GtkMediaStream *media;
-
-      puzzle = GDK_PAINTABLE (gdk_texture_new_from_resource ("/sliding_puzzle/portland-rose.jpg"));
-
-      tweaks = gtk_grid_new ();
-      gtk_grid_set_row_spacing (GTK_GRID (tweaks), 10);
-      gtk_grid_set_column_spacing (GTK_GRID (tweaks), 10);
-      g_object_set (tweaks, "margin", 10, NULL);
-
-      choices = gtk_flow_box_new ();
-      gtk_style_context_add_class (gtk_widget_get_style_context (choices), GTK_STYLE_CLASS_VIEW);
-      add_choice (choices, puzzle);
-      add_choice (choices, gtk_nuclear_animation_new ());
-      media = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-      gtk_media_stream_set_loop (media, TRUE);
-      gtk_media_stream_set_muted (media, TRUE);
-      gtk_media_stream_play (media);
-      add_choice (choices, GDK_PAINTABLE (media));
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (sw), choices);
-      gtk_grid_attach (GTK_GRID (tweaks), sw, 0, 0, 2, 1);
-
-      label = gtk_label_new ("Size");
-      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-      gtk_grid_attach (GTK_GRID (tweaks), label, 0, 1, 1, 1);
-      size_spin = gtk_spin_button_new_with_range (2, 10, 1);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (size_spin), width);
-      gtk_grid_attach (GTK_GRID (tweaks), size_spin, 1, 1, 1, 1);
-
-      apply = gtk_button_new_with_label ("Apply");
-      gtk_widget_set_halign (apply, GTK_ALIGN_END);
-      gtk_grid_attach (GTK_GRID (tweaks), apply, 1, 2, 1, 1);
-      g_signal_connect (apply, "clicked", G_CALLBACK (reconfigure), NULL);
-
-      popover = gtk_popover_new (NULL);
-      gtk_popover_set_modal (GTK_POPOVER (popover), TRUE);
-      gtk_container_add (GTK_CONTAINER (popover), tweaks);
-
-      tweak = gtk_menu_button_new ();
-      gtk_menu_button_set_popover (GTK_MENU_BUTTON (tweak), popover);
-      gtk_button_set_icon_name (GTK_BUTTON (tweak), "emblem-system-symbolic");
-
-      restart = gtk_button_new_from_icon_name ("view-refresh-symbolic");
-      g_signal_connect (restart, "clicked", G_CALLBACK (reshuffle), NULL);
-
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), tweak);
-      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), "Sliding Puzzle");
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, (float) gdk_paintable_get_intrinsic_aspect_ratio (puzzle), FALSE);
-      gtk_container_add (GTK_CONTAINER (window), frame);
-
-      start_puzzle (puzzle);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/spinbutton.c
+++ b/demos/gtk-demo/spinbutton.c
@@ -33,14 +33,14 @@ hex_spin_output (GtkSpinButton *spin_button)
 {
  GtkAdjustment *adjustment;
  gchar *buf;
-  gdouble val;
+  gint val;

  adjustment = gtk_spin_button_get_adjustment (spin_button);
-  val = gtk_adjustment_get_value (adjustment);
+  val = (gint) gtk_adjustment_get_value (adjustment);
  if (fabs (val) < 1e-5)
    buf = g_strdup ("0x00");
  else
-    buf = g_strdup_printf ("0x%.2X", (gint) val);
+    buf = g_strdup_printf ("0x%.2X", val);
  if (strcmp (buf, gtk_spin_button_get_text (spin_button)))
    gtk_spin_button_set_text (spin_button, buf);
  g_free (buf);
--- 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/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -129,7 +129,6 @@ insert_text (GtkTextBuffer *buffer)
  GtkTextIter iter;
  GtkTextIter start, end;
  GdkPixbuf *pixbuf;
-  GdkTexture *texture;
  GtkIconTheme *icon_theme;

  icon_theme = gtk_icon_theme_get_default ();
@@ -139,7 +138,6 @@ insert_text (GtkTextBuffer *buffer)
                                     GTK_ICON_LOOKUP_GENERIC_FALLBACK,
                                     NULL);
  g_assert (pixbuf);
-  texture = gdk_texture_new_for_pixbuf (pixbuf);

  /* get start of buffer; each insertion will revalidate the
   * iterator to point to just after the inserted text.
@@ -234,9 +232,9 @@ insert_text (GtkTextBuffer *buffer)
                                            "heading", NULL);

  gtk_text_buffer_insert (buffer, &iter, "The buffer can have images in it: ", -1);
-  gtk_text_buffer_insert_texture (buffer, &iter, texture);
-  gtk_text_buffer_insert_texture (buffer, &iter, texture);
-  gtk_text_buffer_insert_texture (buffer, &iter, texture);
+  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
+  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
+  gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
  gtk_text_buffer_insert (buffer, &iter, " for example.\n\n", -1);

  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Spacing. ", -1,
@@ -380,7 +378,6 @@ insert_text (GtkTextBuffer *buffer)
  gtk_text_buffer_apply_tag_by_name (buffer, "word_wrap", &start, &end);

  g_object_unref (pixbuf);
-  g_object_unref (texture);
 }

 static gboolean
--- 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,16 +163,19 @@
    </child>
    <child>
      <object class="GtkToolbar">
+        <property name="visible">1</property>
        <property name="hexpand">1</property>
+        <property name="icon_size">1</property>
        <property name="toolbar-style">icons</property>
        <style>
          <class name="inline-toolbar"/>
        </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 +183,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 +195,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 +205,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 +217,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 +229,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 +244,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 +258,7 @@
        </child>
        <child>
          <object class="GtkButton">
+            <property name="visible">1</property>
            <property name="label">Destructive</property>
            <style>
              <class name="destructive-action"/>
@@ -242,6 +267,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, FALSE, 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
@@ -0,0 +1,179 @@
+/* Benchmark/Widgetbowl
+ *
+ * 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"
+
+GtkWidget *allow_changes;
+
+#define N_STATS 5
+
+#define STATS_UPDATE_TIME G_USEC_PER_SEC
+
+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 *
+get_stats (GtkWidget *widget)
+{
+  static GQuark stats_quark = 0;
+  Stats *stats;
+
+  if (G_UNLIKELY (stats_quark == 0))
+    stats_quark = g_quark_from_static_string ("stats");
+
+  stats = g_object_get_qdata (G_OBJECT (widget), stats_quark);
+  if (stats == NULL)
+    {
+      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 void
+do_stats (GtkWidget *widget,
+          GtkWidget *info_label,
+          gint      *suggested_change)
+{
+  Stats *stats;
+  gint64 frame_time;
+
+  stats = get_stats (widget);
+  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+
+  if (stats->last_stats + STATS_UPDATE_TIME < frame_time)
+    {
+      char *new_label;
+      guint i, n_frames;
+
+      n_frames = 0;
+      for (i = 0; i < N_STATS; i++)
+        {
+          n_frames += stats->frame_counter[i];
+        }
+      
+      new_label = g_strdup_printf ("widgets - %.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);
+
+      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]);
+        }
+
+      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;
+    }
+
+  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
+stats_update (GtkWidget *widget)
+{
+  Stats *stats;
+
+  stats = get_stats (widget);
+
+  stats->item_counter[stats->stats_index] = gtk_fishbowl_get_count (GTK_FISHBOWL (widget));
+}
+
+static gboolean
+move_fish (GtkWidget     *bowl,
+           GdkFrameClock *frame_clock,
+           gpointer       info_label)
+{
+  gint suggested_change = 0;
+  
+  do_stats (bowl,
+            info_label,
+            !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);
+
+  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl),
+                          gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change);
+  stats_update (bowl);
+
+  return G_SOURCE_CONTINUE;
+}
+
+GtkWidget *
+do_widgetbowl (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkBuilder *builder;
+      GtkWidget *bowl, *info_label;
+
+      g_type_ensure (GTK_TYPE_FISHBOWL);
+
+      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      gtk_builder_connect_signals (builder, NULL);
+      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
+      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
+      gtk_fishbowl_set_use_icons (GTK_FISHBOWL (bowl), FALSE);
+      info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
+      allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_widget_realize (window);
+      gtk_widget_add_tick_callback (bowl, move_fish, info_label, NULL);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+
+  return window;
+}
--- a/demos/icon-browser/org.gtk.IconBrowser.desktop
+++ b/demos/icon-browser/org.gtk.IconBrowser.desktop
--- a/demos/icon-browser/icon.list
+++ b/demos/icon-browser/icon.list
@@ -32,7 +32,7 @@ media-view-subtitles=The icon used to show subtitles in a media player

 [network]
 Name=Network
-Description=Icons related to network status
+Description=Icons related to network status");

 network-transmit-receive=The icon used data is being both transmitted and received simultaneously, while the computing device is connected to a network
 network-transmit=The icon used when data is being transmitted, while the computing device is connected to a network
--- a/demos/icon-browser/iconbrowserwin.c
+++ b/demos/icon-browser/iconbrowserwin.c
@@ -94,9 +94,13 @@ get_icon (GtkWidget *image, const gchar *name, gint size)
 static void
 set_image (GtkWidget *image, const gchar *name, gint size)
 {
+  GdkPixbuf *pixbuf;
+
  gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
  gtk_image_set_pixel_size (GTK_IMAGE (image), size);
-  gtk_drag_source_set_icon_name (image, name);
+  pixbuf = get_icon (image, name, size);
+  gtk_drag_source_set_icon_pixbuf (image, pixbuf);
+  g_object_unref (pixbuf);
 }

 static void
@@ -286,26 +290,23 @@ 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
 copy_to_clipboard (GtkButton         *button,
                   IconBrowserWindow *win)
 {
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;

-  clipboard = gtk_widget_get_clipboard (GTK_WIDGET (win));
-  gdk_clipboard_set_text (clipboard, gtk_window_get_title (GTK_WINDOW (win->details)));
+  clipboard = gtk_clipboard_get_default (gdk_display_get_default ());
+  gtk_clipboard_set_text (clipboard, gtk_window_get_title (GTK_WINDOW (win->details)), -1);
 }

 static gboolean
@@ -376,9 +377,10 @@ search_mode_toggled (GObject *searchbar, GParamSpec *pspec, IconBrowserWindow *w

 static void
 get_image_data (GtkWidget        *widget,
-                GdkDrag          *drag,
+                GdkDragContext   *context,
                GtkSelectionData *selection,
                guint             target_info,
+                guint             time,
                gpointer          data)
 {
  GtkWidget *image;
@@ -398,9 +400,10 @@ get_image_data (GtkWidget        *widget,

 static void
 get_scalable_image_data (GtkWidget        *widget,
-                         GdkDrag          *drag,
+                         GdkDragContext   *context,
                         GtkSelectionData *selection,
                         guint             target_info,
+                         guint             time,
                         gpointer          data)
 {
  gchar *uris[2];
@@ -452,7 +455,6 @@ static void
 icon_browser_window_init (IconBrowserWindow *win)
 {
  GdkContentFormats *list;
-  GtkEventController *controller;

  gtk_widget_init_template (GTK_WIDGET (win));

@@ -469,7 +471,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);
@@ -482,30 +483,12 @@ icon_browser_window_init (IconBrowserWindow *win)

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

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

-static void
-icon_browser_window_finalize (GObject *object)
-{
-  IconBrowserWindow *win = ICON_BROWSER_WINDOW (object);
-
-  g_hash_table_unref (win->contexts);
-
-  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),
@@ -536,6 +519,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('org.gtk.IconBrowser.desktop', install_dir: gtk_applicationsdir)
+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-close-button">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="hide-on-close">1</property>
+    <property name="resizable">False</property>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete"/>
    <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/org.gtk.WidgetFactory.desktop
+++ b/demos/widget-factory/org.gtk.WidgetFactory.desktop
--- 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,11 +9,10 @@ executable('gtk4-widget-factory',
           dependencies: libgtk_dep,
           include_directories: confinc,
           gui_app: true,
-           link_args: extra_demo_ldflags,
           install: true)

 # desktop file
-install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir)
+install_data('gtk4-widget-factory.desktop', install_dir: gtk_applicationsdir)

 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
@@ -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);

@@ -353,6 +353,7 @@ update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget)
 static void
 on_entry_icon_release (GtkEntry            *entry,
                       GtkEntryIconPosition icon_pos,
+                       GdkEvent            *event,
                       gpointer             user_data)
 {
  if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
@@ -966,8 +967,8 @@ background_loaded_cb (GObject      *source,
      return;
    }

-  child = gtk_picture_new_for_pixbuf (pixbuf);
-  gtk_widget_set_size_request (child, 110, 70);
+  child = gtk_image_new_from_pixbuf (pixbuf);
+  gtk_widget_show (child);
  gtk_flow_box_insert (GTK_FLOW_BOX (bd->flowbox), child, -1);
  child = gtk_widget_get_parent (child);
  g_object_set_data_full (G_OBJECT (child), "filename", bd->filename, g_free);
@@ -995,7 +996,8 @@ populate_flowbox (GtkWidget *flowbox)

  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 110, 70);
  gdk_pixbuf_fill (pixbuf, 0xffffffff);
-  child = gtk_picture_new_for_pixbuf (pixbuf);
+  child = gtk_image_new_from_pixbuf (pixbuf);
+  gtk_widget_show (child);
  gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), child, -1);

  location = "/usr/share/backgrounds/gnome";
@@ -1080,7 +1082,7 @@ set_accel (GtkApplication *app, GtkWidget *widget)
 typedef struct
 {
  GtkTextView tv;
-  GdkTexture *texture;
+  cairo_surface_t *surface;
 } MyTextView;

 typedef GtkTextViewClass MyTextViewClass;
@@ -1093,23 +1095,18 @@ my_text_view_init (MyTextView *tv)
 }

 static void
-my_tv_snapshot_layer (GtkTextView      *widget,
-                      GtkTextViewLayer  layer,
-                      GtkSnapshot      *snapshot)
+my_tv_draw_layer (GtkTextView      *widget,
+                  GtkTextViewLayer  layer,
+                  cairo_t          *cr)
 {
  MyTextView *tv = (MyTextView *)widget;

-  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT && tv->texture)
+  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT && tv->surface)
    {
-      gtk_snapshot_push_opacity (snapshot, 0.333);
-      gtk_snapshot_append_texture (snapshot,
-                                   tv->texture,
-                                   &GRAPHENE_RECT_INIT(
-                                     0, 0,
-                                     gdk_texture_get_width (tv->texture),
-                                     gdk_texture_get_height (tv->texture)
-                                   ));
-      gtk_snapshot_pop (snapshot);
+      cairo_save (cr);
+      cairo_set_source_surface (cr, tv->surface, 0.0, 0.0);
+      cairo_paint_with_alpha (cr, 0.333);
+      cairo_restore (cr);
    }
 }

@@ -1118,7 +1115,8 @@ my_tv_finalize (GObject *object)
 {
  MyTextView *tv = (MyTextView *)object;

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

  G_OBJECT_CLASS (my_text_view_parent_class)->finalize (object);
 }
@@ -1130,24 +1128,24 @@ my_text_view_class_init (MyTextViewClass *class)
  GObjectClass *o_class = G_OBJECT_CLASS (class);

  o_class->finalize = my_tv_finalize;
-  tv_class->snapshot_layer = my_tv_snapshot_layer;
+  tv_class->draw_layer = my_tv_draw_layer;
 }

 static void
 my_text_view_set_background (MyTextView *tv, const gchar *filename)
 {
+  GdkPixbuf *pixbuf;
  GError *error = NULL;
-  GFile *file;

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

  if (filename == NULL)
    return;

-  file = g_file_new_for_path (filename);
-  tv->texture = gdk_texture_new_from_file (file, &error);
-  g_object_unref (file);
-
+  pixbuf = gdk_pixbuf_new_from_file (filename, &error);
  if (error)
    {
      g_warning ("%s", error->message);
@@ -1155,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));
 }

@@ -1230,10 +1232,10 @@ static void
 handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
 {
  GtkTextBuffer *buffer;
-  GdkClipboard *clipboard;
+  GtkClipboard *clipboard;
  const gchar *id;

-  clipboard = gtk_widget_get_clipboard (textview);
+  clipboard = gtk_widget_get_clipboard (textview, GDK_SELECTION_CLIPBOARD);
  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
  id = gtk_buildable_get_name (GTK_BUILDABLE (button));

@@ -1248,13 +1250,13 @@ handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
 }

 static void
-clipboard_formats_notify (GdkClipboard *clipboard, GdkEvent *event, GtkWidget *button)
+clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, GtkWidget *button)
 {
  const gchar *id;
  gboolean has_text;

  id = gtk_buildable_get_name (GTK_BUILDABLE (button));
-  has_text = gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_TEXT_BUFFER);
+  has_text = gtk_clipboard_wait_is_text_available (clipboard);

  if (strcmp (id, "pastebutton") == 0)
    gtk_widget_set_sensitive (button, has_text);
@@ -1276,13 +1278,8 @@ textbuffer_notify_selection (GObject *object, GParamSpec *pspec, GtkWidget *butt
 }

 static gboolean
-osd_frame_pressed (GtkGestureMultiPress *gesture,
-                   int                   press,
-                   double                x,
-                   double                y,
-                   gpointer              data)
+osd_frame_button_press (GtkWidget *frame, GdkEventButton *event, gpointer data)
 {
-  GtkWidget *frame = data;
  GtkWidget *osd;
  gboolean visible;

@@ -1526,17 +1523,17 @@ g_test_permission_class_init (GTestPermissionClass *class)
  permission_class->release_finish = release_finish;
 }

+static int icon_sizes[] = {0, 1, 2, 3, 4, 5, 6};
+
 static void
-update_buttons (GtkWidget *iv, GtkIconSize size)
+update_buttons (GtkWidget *iv, int pos)
 {
  GtkWidget *button;

  button = GTK_WIDGET (g_object_get_data (G_OBJECT (iv), "increase_button"));
-  gtk_widget_set_sensitive (button, size != GTK_ICON_SIZE_LARGE);
+  gtk_widget_set_sensitive (button, pos + 1 < G_N_ELEMENTS (icon_sizes));
  button = GTK_WIDGET (g_object_get_data (G_OBJECT (iv), "decrease_button"));
-  gtk_widget_set_sensitive (button, size != GTK_ICON_SIZE_NORMAL);
-  button = GTK_WIDGET (g_object_get_data (G_OBJECT (iv), "reset_button"));
-  gtk_widget_set_sensitive (button, size != GTK_ICON_SIZE_INHERIT);
+  gtk_widget_set_sensitive (button, pos > 0);
 }

 static void
@@ -1544,14 +1541,17 @@ increase_icon_size (GtkWidget *iv)
 {
  GList *cells;
  GtkCellRendererPixbuf *cell;
+  GtkIconSize size;

  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (iv));
  cell = cells->data;
  g_list_free (cells);

-  g_object_set (cell, "icon-size", GTK_ICON_SIZE_LARGE, NULL);
+  g_object_get (cell, "stock-size", &size, NULL);
+  size = MIN (size + 1, G_N_ELEMENTS (icon_sizes) - 1);
+  g_object_set (cell, "stock-size", size, NULL);

-  update_buttons (iv, GTK_ICON_SIZE_LARGE);
+  update_buttons (iv, size);

  gtk_widget_queue_resize (iv);
 }
@@ -1561,14 +1561,17 @@ decrease_icon_size (GtkWidget *iv)
 {
  GList *cells;
  GtkCellRendererPixbuf *cell;
+  GtkIconSize size;

  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (iv));
  cell = cells->data;
  g_list_free (cells);

-  g_object_set (cell, "icon-size", GTK_ICON_SIZE_NORMAL, NULL);
+  g_object_get (cell, "stock-size", &size, NULL);
+  size  = MAX (size - 1, 1);
+  g_object_set (cell, "stock-size", size, NULL);

-  update_buttons (iv, GTK_ICON_SIZE_NORMAL);
+  update_buttons (iv, size);

  gtk_widget_queue_resize (iv);
 }
@@ -1583,9 +1586,9 @@ reset_icon_size (GtkWidget *iv)
  cell = cells->data;
  g_list_free (cells);

-  g_object_set (cell, "icon-size", GTK_ICON_SIZE_INHERIT, NULL);
+  g_object_set (cell, "stock-size", 2, NULL);

-  update_buttons (iv, GTK_ICON_SIZE_INHERIT);
+  update_buttons (iv, 2);

  gtk_widget_queue_resize (iv);
 }
@@ -1671,13 +1674,13 @@ activate (GApplication *app)
  gtk_builder_add_callback_symbol (builder, "on_page_combo_changed", (GCallback)on_page_combo_changed);
  gtk_builder_add_callback_symbol (builder, "on_range_from_changed", (GCallback)on_range_from_changed);
  gtk_builder_add_callback_symbol (builder, "on_range_to_changed", (GCallback)on_range_to_changed);
+  gtk_builder_add_callback_symbol (builder, "osd_frame_button_press", (GCallback)osd_frame_button_press);
  gtk_builder_add_callback_symbol (builder, "tab_close_cb", (GCallback)tab_close_cb);
  gtk_builder_add_callback_symbol (builder, "increase_icon_size", (GCallback)increase_icon_size);
  gtk_builder_add_callback_symbol (builder, "decrease_icon_size", (GCallback)decrease_icon_size);
  gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
  gtk_builder_add_callback_symbol (builder, "scale_format_value", (GCallback)scale_format_value);
  gtk_builder_add_callback_symbol (builder, "scale_format_value_blank", (GCallback)scale_format_value_blank);
-  gtk_builder_add_callback_symbol (builder, "osd_frame_pressed", (GCallback)osd_frame_pressed);

  gtk_builder_connect_signals (builder, NULL);

@@ -1840,8 +1843,8 @@ activate (GApplication *app)
                    G_CALLBACK (textbuffer_notify_selection), widget);
  widget = (GtkWidget *)gtk_builder_get_object (builder, "pastebutton");
  g_signal_connect (widget, "clicked", G_CALLBACK (handle_cutcopypaste), widget2);
-  g_signal_connect_object (gtk_widget_get_clipboard (widget2), "notify::formats",
-                           G_CALLBACK (clipboard_formats_notify), widget, 0);
+  g_signal_connect_object (gtk_widget_get_clipboard (widget2, GDK_SELECTION_CLIPBOARD), "owner-change",
+                           G_CALLBACK (clipboard_owner_change), widget, 0);

  widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");
  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "totem_like_osd");
@@ -1885,9 +1888,6 @@ activate (GApplication *app)
  g_object_set_data (G_OBJECT (widget), "increase_button", widget2);
  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "decrease_button");
  g_object_set_data (G_OBJECT (widget), "decrease_button", widget2);
-  widget2 = (GtkWidget *)gtk_builder_get_object (builder, "reset_button");
-  g_object_set_data (G_OBJECT (widget), "reset_button", widget2);
-  reset_icon_size (widget);

  adj = (GtkAdjustment *)gtk_builder_get_object (builder, "adjustment3");
  widget = (GtkWidget *)gtk_builder_get_object (builder, "progressbar1");
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	bf82853385	gdk: Remove a leftover GdkScreen	2017-11-25 08:39:55 -05:00
Matthias Clasen	24915abeb8	wayland: Drop GdkWaylandDeviceManager This object had no functionality left.	2017-11-25 08:39:55 -05:00
Matthias Clasen	cd04bd047d	Drop GdkDeviceManager entirely Nothing uses it anymore.	2017-11-25 08:39:55 -05:00
Matthias Clasen	2872164ff7	Drop the ::device-manager property Not used for anything anymore.	2017-11-25 08:39:55 -05:00
Matthias Clasen	46d344880f	x11: Stop deriving from GdkDeviceManager We can just derive from GObject.	2017-11-25 08:39:55 -05:00
Matthias Clasen	feace2053d	wayland: Stop deriving from GdkDeviceManager We can just derive from GObject.	2017-11-25 08:39:55 -05:00
Matthias Clasen	08ee955d70	win32: Stop deriving from GdkDeviceManager We can just derive from GObject.	2017-11-25 08:39:54 -05:00
Matthias Clasen	c9211530c1	quartz: Stop deriving from GdkDeviceManager We can just derive from GObject.	2017-11-25 08:39:54 -05:00
Matthias Clasen	8d0d8919f7	Drop the GdkDeviceManager::display property Move this to the backends, and stop deriving from GdkDeviceManager.	2017-11-25 08:39:54 -05:00
Matthias Clasen	32bc99f37c	Remove the get_client_pointer vfunc	2017-11-25 08:39:54 -05:00
Matthias Clasen	f85c0d758a	Drop the get_client_pointer vfunc There is no api using this anymore.	2017-11-25 08:39:54 -05:00
Matthias Clasen	ecff77ff42	Drop the list_devices vfunc We no longer have api that uses this.	2017-11-25 08:39:54 -05:00
Matthias Clasen	376c33511b	Drop gdk_device_manager_list_devices It is not used and GdkDeviceManager is going away.	2017-11-25 08:39:54 -05:00
Matthias Clasen	91666e94d7	gdk: Drop devicemanager signals Nobody is emitting them anymore.	2017-11-25 08:39:54 -05:00
Matthias Clasen	07800cfb93	wayland: Stop emitting devicemanager signals Nobody is listening to these signals anymore.	2017-11-25 08:39:54 -05:00
Matthias Clasen	8b0ceb7bb6	x11: Stop emitting devicemanager signals Nobody is listening to these anymore, so there is no point in emitting them.	2017-11-25 08:39:54 -05:00
Matthias Clasen	15945b04a4	display: Drop the device_manager for good This is now entirely the backends responsibility.	2017-11-25 08:39:54 -05:00
Matthias Clasen	863deea0ca	wayland: Stop using display->device_manager We can keep the device manager in the backend.	2017-11-25 08:39:54 -05:00
Matthias Clasen	9b8c590172	quartz: Stop using display->device_manager We can keep the device manager in the backend.	2017-11-25 08:39:54 -05:00
Matthias Clasen	c3d1949bd5	win32: Stop using gdk_display_get_device_manager We can keep the devicemanager in the backend.	2017-11-25 08:39:54 -05:00
Matthias Clasen	f7d0d263a8	x11: Stop using gdk_display_get_device_manager We can keep the displaymanager in the backend.	2017-11-25 08:39:54 -05:00
Matthias Clasen	7eea2f571b	broadway: Remove devicemanager implementation It is not used and not needed anymore.	2017-11-25 08:39:54 -05:00
Matthias Clasen	76b4049f5a	broadway: Stop using GdkDeviceManager We can use the GdkSeat apis for this.	2017-11-25 08:39:54 -05:00
Matthias Clasen	7a4b0a5f7c	display: Stop using devicemanager internally We can just use the seats to find out about device removals.	2017-11-25 08:39:54 -05:00
Matthias Clasen	dd051618e4	Drop GdkDeviceManager APIs No longer used outside of the backends.	2017-11-25 08:39:54 -05:00
Matthias Clasen	93d239401d	Don't mention GdkDeviceManager in docs It is going away.	2017-11-25 08:39:53 -05:00
Matthias Clasen	95458925e4	Drop support for setting event masks for floating devices These are very rarely needed, and are X11-specific. If it turns out that somebody needs this, it can come back as X11-specific functionality.	2017-11-24 09:15:04 -05:00
Matthias Clasen	156bbb99f4	gdk: Move gdk_disable_multidevice tot he X11 backend This api only ever did something for X11, so move it there. Update the docs and adapt the only caller.	2017-11-24 09:15:04 -05:00
Matthias Clasen	d5ba765517	Drop gdk_display_get_device_manager API GdkDeviceManager is being replaced by GdkSeat.	2017-11-24 09:15:04 -05:00
Matthias Clasen	8f07256e02	treeview: Don't use GdkDeviceManager We can just as well use GdkSeat to enumerate (attached) devices. Note that this change excludes floating devices from consideration. This keeps the copy-pasted code in sync with gtkwindow.c	2017-11-24 09:15:04 -05:00
Matthias Clasen	7dd99c4bdc	window: Don't use GdkDeviceManager We can just as well use GdkSeat to enumerate (attached) devices. Note that this change excludes floating devices from consideration.	2017-11-24 09:15:04 -05:00
Matthias Clasen	7bbc1cbde0	widget: Don't use GdkDeviceManager We can just as well use GdkSeat to enumerate the devices.	2017-11-24 09:15:04 -05:00