inspector: Update the logging tab

Make the logging-related checkboxes match the flags we have.

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+ignore = E501

.gitlab-ci.yml

@@ -26,12 +26,20 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v46"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v49"
 
 workflow:
   rules:
-    - if: $CI_COMMIT_TAG
+    # run merge request pipelines
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    # do not run branch pipelines if corresponding merge requests exist...
+    # (this avoids duplicate pipelines)
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    # ...but otherwise run branch pipelines
     - if: $CI_COMMIT_BRANCH
+    # run tag pipelines
+    - if: $CI_COMMIT_TAG
 
 default:
   retry:
@@ -58,7 +66,8 @@ style-check-diff:
       junit:
         - "${CI_PROJECT_DIR}/_build/report-x11.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland_gl.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland_gles2.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
@@ -95,8 +104,9 @@ fedora-x86_64:
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
-    - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
+    - .gitlab-ci/run-tests.sh _build x11 gtk
+    # only repeat test runs that are likely affected by test setups
+    - .gitlab-ci/run-tests.sh _build wayland_gl gtk:gdk,gtk:gsk-gl
 
 release-build:
   extends: .build-fedora-default
@@ -121,7 +131,9 @@ release-build:
     - meson install -C _build
     - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
-    - .gitlab-ci/run-tests.sh _build x11
+    - .gitlab-ci/run-tests.sh _build wayland gtk
+    # only repeat test runs that are likely affected by test setups
+    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk:gdk,gtk:gsk-gl
 
 fedora-clang:
   extends: .build-fedora-default
@@ -197,32 +209,48 @@ msys2-mingw64:
     paths:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
-macos:
-  # Sadly, this fails regularly, and its failure is never enlightening
-  allow_failure: true
+macos-x86_64:
   rules:
+    # Do not run in forks as the runner is not available there.
     - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
   tags:
-    - macos
+    - macosintel
   needs: []
+  variables:
+    MESON_FORCE_BACKTRACKE: 1
+    TMPDIR: /Users/Shared/work/tmp
+    SDKROOT: /opt/sdks/MacOSX10.13.4.sdk
+    PIP_CACHE_DIR: /Users/Shared/build/cache
+    PIPENV_CACHE_DIR: $PIP_CACHE_DIR
+    PYTHONPYCACHEPREFIX: $PIP_CACHE_DIR
+    EXTRA_MESON_FLAGS: "-Dgobject-introspection:werror=false"
   before_script:
+    # Not using ccache on purpose as it accelerates the build so much that it
+    # can trigger race conditions in the gobject-introspection subproject.
     - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson~=1.0
-    - pip3 install --user ninja
-    - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
-    - export MESON_FORCE_BACKTRACE=1
+    - /opt/macports/bin/python3.10 -m venv .venv
+    - ln -s /opt/cmake/CMake.app/Contents/bin/cmake .venv/bin
+    - ln -s /opt/pkg-config/bin/pkg-config .venv/bin
+    - ln -s /opt/bison/bin/bison .venv/bin
+    - source .venv/bin/activate
+    - pip3 install meson==1.2.0
+    - pip3 install ninja==1.11.1
+    - pip3 install /Users/Shared/build/pkgs/PyGObject-3.44.0-cp310-cp310-macosx_10_13_x86_64.whl
+                   /Users/Shared/build/pkgs/pycairo-1.23.0-cp310-cp310-macosx_10_13_x86_64.whl
   script:
-    - meson setup ${COMMON_MESON_FLAGS}
+    - meson setup
+            ${COMMON_MESON_FLAGS}
+            ${EXTRA_MESON_FLAGS}
             -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
             -Dmedia-gstreamer=disabled
-            -Dintrospection=disabled
+            -Dintrospection=enabled
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled
-            -Ddemos=false
+            -Dbuild-demos=false
             -Dbuild-tests=false
             -Dbuild-examples=false
             -Dbuild-testsuite=false
@@ -385,17 +413,28 @@ asan-build:
   tags: [ asan ]
   stage: analysis
   needs: []
-  when: manual
   variables:
   script:
     - export PATH="$HOME/.local/bin:$PATH"
-    - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled -Df16c=disabled _build
+    - CC=clang meson setup
+            --buildtype=debugoptimized
+            -Db_sanitize=address
+            -Db_lundef=false
+            -Dbuild-demos=false
+            -Dbuild-tests=false
+            -Dbuild-examples=false
+            -Dintrospection=disabled
+            -Df16c=disabled
+            _build
     - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build wayland gtk
   artifacts:
+    when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
     paths:
-      - _build/meson-logs
-  allow_failure: true
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 reference:
   image: $FEDORA_IMAGE
@@ -408,10 +447,11 @@ reference:
             --buildtype=release
             --force-fallback-for=gdk-pixbuf,pango
             -Dintrospection=enabled
+            -Ddocumentation=true
             -Dgtk_doc=true
             -Dgdk-pixbuf:gtk_doc=true
             -Dpango:gtk_doc=true
-            -Ddemos=false
+            -Dbuild-demos=false
             -Dbuild-examples=false
             -Dbuild-tests=false
             -Dbuild-testsuite=false

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:39
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -32,6 +32,7 @@ RUN dnf -y install \
     glib2-static \
     glibc-devel \
     glibc-headers \
+    glslc \
     gnupg2 \
     gobject-introspection-devel \
     graphene-devel \

.gitlab-ci/flatpak-build.sh

@@ -23,8 +23,8 @@ flatpak build ${builddir} meson \
                 -Dbuild-testsuite=false \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \
-                -Ddemos=true \
-                -Dprofile=devel \
+                -Dbuild-demos=true \
+                -Ddemo-profile=devel \
                 _flatpak_build
 
 flatpak build ${builddir} ninja -C _flatpak_build install

.gitlab-ci/meson-html-report.py

@@ -324,7 +324,7 @@ for line in args.infile:
     units.append(unit)
 
 report = {}
-report['date'] = datetime.datetime.utcnow()
+report['date'] = datetime.datetime.now(datetime.UTC)
 report['locale_date'] = report['date'].strftime("%c")
 report['project_name'] = args.project_name
 report['backend'] = args.backend

.gitlab-ci/meson-junit-report.py

@@ -44,7 +44,7 @@ outfile = args.output
 testsuites = ET.Element('testsuites')
 testsuites.set('id', '{}/{}'.format(args.job_id, args.branch))
 testsuites.set('package', args.project_name)
-testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes'))
+testsuites.set('timestamp', datetime.datetime.now(datetime.UTC).isoformat(timespec='minutes'))
 
 suites = {}
 for line in args.infile:

.gitlab-ci/run-single-test.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/sh
+#
+builddir=$1
+suite=$2
+unit=$3
+
+echo "** builddir: ${builddir}"
+echo "**    suite: ${suite}"
+echo "**     unit: ${unit}"
+
+export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+compositor=$!
+
+export WAYLAND_DISPLAY=wayland-5
+
+meson test -C ${builddir} \
+            --print-errorlogs \
+            --setup=wayland \
+            --suite=${suite} \
+            --no-suite=failing \
+            --no-suite=flaky \
+            --no-suite=wayland_failing \
+            --no-suite=gsk-compare-broadway \
+            --verbose \
+            "${unit}"
+
+exit_code=$?
+kill ${compositor}
+
+exit ${exit_code}

.gitlab-ci/run-tests.sh

@@ -1,28 +1,31 @@
 #!/bin/bash
 
-set +x
+set -x
 set +e
 
 srcdir=$( pwd )
 builddir=$1
-backend=$2
+setup=$2
+suite=$3
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 
 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:verbosity=1:log_threads=1
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
 export G_SLICE=always-malloc
 
-case "${backend}" in
-  x11)
+case "${setup}" in
+  x11*)
     xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
+                --setup=${setup} \
+                --suite=${suite//,/ --suite=} \
                 --no-suite=failing \
+                --no-suite=${setup}_failing \
                 --no-suite=flaky \
+                --no-suite=headless \
                 --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
@@ -41,18 +44,19 @@ case "${backend}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
+                --setup=${setup} \
+                --suite=${suite//,/ --suite=} \
                 --no-suite=failing \
+                --no-suite=${setup}_failing \
                 --no-suite=flaky \
-                --no-suite=${backend}_failing \
+                --no-suite=headless \
                 --no-suite=gsk-compare-broadway
     exit_code=$?
 
     kill ${compositor}
     ;;
 
-  broadway)
+  broadway*)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
     ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
@@ -63,17 +67,19 @@ case "${backend}" in
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
+                --setup=${setup} \
+                --suite=${suite//,/ --suite=} \
                 --no-suite=failing \
+                --no-suite=${setup}_failing \
                 --no-suite=flaky \
+                --no-suite=headless \
                 --no-suite=gsk-compare-opengl
 
     kill ${server}
     ;;
 
   *)
-    echo "Failed to add ${backend} to .gitlab-ci/run-tests.sh"
+    echo "Failed to add ${setup} to .gitlab-ci/run-tests.sh"
     exit 1
     ;;
 
@@ -83,17 +89,17 @@ cd ${builddir}
 
 $srcdir/.gitlab-ci/meson-junit-report.py \
             --project-name=gtk \
-            --backend="${backend}" \
+            --backend="${setup}" \
             --job-id="${CI_JOB_NAME}" \
-            --output="report-${backend}.xml" \
-            "meson-logs/testlog-${backend}.json"
+            --output="report-${setup}.xml" \
+            "meson-logs/testlog-${setup}.json"
 
 $srcdir/.gitlab-ci/meson-html-report.py \
             --project-name=gtk \
-            --backend="${backend}" \
+            --backend="${setup}" \
             --job-id="${CI_JOB_NAME}" \
-            --reftest-output-dir="testsuite/reftests/output/${backend}" \
-            --output="report-${backend}.html" \
-            "meson-logs/testlog-${backend}.json"
+            --reftest-output-dir="testsuite/reftests/output/${setup}" \
+            --output="report-${setup}.html" \
+            "meson-logs/testlog-${setup}.json"
 
 exit $exit_code

.gitlab-ci/test-msvc.bat

@@ -6,7 +6,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 
 :: FIXME: make warnings fatal
 pip3 install --upgrade --user meson~=0.64 || goto :error
-meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
+meson setup -Dbackend_max_links=1 -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 
 goto :EOF

.gitlab-ci/test-msys2.sh

@@ -32,7 +32,8 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-fribidi \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-python-gobject
+    mingw-w64-$MSYS2_ARCH-python-gobject \
+    mingw-w64-$MSYS2_ARCH-shaderc
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"

AUTHORS

@@ -7,7 +7,7 @@ Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>
 
-The Team that build GTK 2 (in alphabetical order)
+The team that build GTK 2 (in alphabetical order)
 -------------------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
 Jerome Bolliet    <bolliet@gtk.org>
@@ -28,9 +28,8 @@ Jay Painter       <jpaint@gtk.org>
 Manish Singh      <manish@gtk.org>
 Owen Taylor       <otaylor@gtk.org>
 
-The current team (GTK 3 and 4)
-------------------------------
-
+The team that built GTK 3
+-------------------------
 Jonas Ådahl       <jadahl@gmail.com>
 Tim Bäder         <mail@baedert.org>
 Emmanuele Bassi   <ebassi@gnome.org>
@@ -40,6 +39,16 @@ Carlos Garnacho   <mrgarnacho@gmail.com>
 Alexander Larsson <alexl@redhat.com>
 Benjamin Otte     <otte@gnome.org>
 
+The current team (GTK 4)
+------------------------
+Jonas Ådahl       <jadahl@gmail.com>
+Emmanuele Bassi   <ebassi@gnome.org>
+Christian Hergert <chergert@gnome.org>
+Chun-wei Fan      <fanchunwei@src.gnome.org>
+Matthias Clasen   <mclasen@redhat.com>
+Carlos Garnacho   <mrgarnacho@gmail.com>
+Benjamin Otte     <otte@gnome.org>
+
 
 There are many others who have contributed patches; we thank them,
 GTK is much better because of them.
@@ -49,35 +58,15 @@ Over time, GTK has incorporated some pieces of software which
 started as independent projects. We list the original authors here:
 
 
-MS-Windows theme engine
------------------------
-Raymond Penners
-Dom Lachowicz
-
-
-Pixbuf theme engine
--------------------
-Owen Taylor
-
-
 IME input method
 ----------------
 Takuro Ashie
 Kazuki IWAMOTO
 
-
-Mac OS X backend
-----------------
+MacOS backend
+-------------
 Anders Carlsson
 
-
-DirectFB backend
-----------------
-Denis Oliver Kropp
-Sven Neumann
-Mike Emmel
-
-
-gtkparasite
------------
+GtkInspector (originally gtkparasite)
+-------------------------------------
 Christian Hammond

CONTRIBUTING.md

@@ -35,8 +35,7 @@ The issue tracker is meant to be used for actionable issues only.
 
 You should not open a new issue for security related questions.
 
-When in doubt, send an email to the [security](mailto:security@gnome.org)
-mailing list.
+When in doubt, follow [security](https://security.gnome.org/).
 
 ### Bug reports
 
@@ -244,13 +243,11 @@ people committing to GTK to follow a few rules:
    code, you should always ask. If your change is minor and you've been
    working on GTK for a while it probably isn't necessary to ask. But when
    in doubt, ask. Even if your change is correct, somebody may know a
-   better way to do things. If you are making changes to GTK, you should
-   be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
-   mailing list; this is a good place to ask about intended changes.
-   The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK
-   developers to discuss changes, but if you live outside of the EU/US time
-   zones, an email to the gtk-devel mailing list is the most certain and
-   preferred method.
+   better way to do things.
+   The `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org) is also a
+   good place to find GTK developers to discuss changes, but if you live
+   outside of the EU/US time zones, the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
+   is the most certain and preferred method.
 
 0. Ask _first_.
 

NEWS

@@ -1,4 +1,516 @@
-Overview of Changes in 4.11.3, xx-xx-xxxx
+Overview of Changes in 4.13.5, xx-xx-xxxx
+=========================================
+
+Overview of Changes in 4.13.4, 30-12-2023
+=========================================
+
+* GtkFileDialog:
+ - Return an error if no file is selected
+
+* GtkFileLauncher:
+ - Add a writable property
+
+* GtkFileChooserNative:
+ - Make closing portal file dialogs work
+
+* GtkEmojiChooser:
+ - Update Emoji data to CLDR v43
+
+* GtkStringList:
+ - Add item-type and n-itmes properties
+
+* Input:
+ - Respect GTK grabs on DND events
+ - Fix crossing event generation for enter/leave
+
+* Wayland:
+ - Avoid recreating wl_buffers needlessly
+ - Be more careful when loading cursors
+
+* Dmabuf:
+ - Add support for all Dmabuf formats
+ - Tweak the offload code a bit, allow offloading translucent
+   textures, as long as they are raised. Decline to offload
+   with fractional scales.
+
+* Accessibility:
+ - Add a few more accessible roles
+
+* GL:
+ - Use GLES by default
+ - Tweak GDK_DEBUG values. The new values are
+   gl-disable-gl, gl-disable-gles and gl-prefer-gl.
+   The gl-legacy and nograbs values have been dropped.
+
+* Css:
+ - Reduce memory consumption during theme loading
+ - Fix opacity handling
+
+* Theme:
+ - Refresh some of the included symbolic icons
+
+* MacOs:
+ - Silence secure-restore message
+
+* Build:
+ - Require Vulkan 1.3
+
+* Translation updates:
+ Chinese (China)
+ Czech
+ Hebrew
+ Icelandic
+ Polish
+ Russian
+
+
+Overview of Changes in 4.13.3, 15-11-2023
+=========================================
+
+* GtkGraphicsOffload: A new widget to support passthrough
+  of dmabuf textures with subsurfaces on Wayland
+
+* GtkListView:
+ - reduce tree indentation
+
+* GtkInspector:
+ - Show more GL information
+ - Add a subsurface overlay
+ - Improve the fps overlay
+
+* GDK
+ - Allow implicit modifiers for dmabufs
+ - Support more dmabuf formats: NV16, NV61, NV24, NV42
+   and 3-plane YUV formats
+
+* GSK
+ - Fix padding of icons in the GL atlas
+ - Fix handling of texture-scale nodes in cairo
+ - Treat texture-scale nodes more faithfully in GL
+
+* Accessibility:
+ - Tweak the accessible name computation for corner cases
+
+* The GTK/GDK/GSK_DEBUG environment variables now
+  work in productions as well as in debug builds
+
+* Translation updates
+ Catalan
+ French
+ Russian
+
+
+Overview of Changes in 4.13.2, 22-10-2023
+=========================================
+
+* GtkPrintdialog:
+ - New async-style api to replace GtkPrintOperation
+
+* GtkEmojiChooser:
+ - Add more languages: Bengali, Hindi, Japanese, Finnish,
+   Thai and Norwegian bokmål
+
+* Accessibility:
+ - Fix some utf8 handling issues
+
+* GDK:
+ - Add support for dmabuf textures, with GdkDmabufTextureBuilder
+ - Add a few more supported memory formats for textures
+
+* GSK:
+ - Add a fast-path for masking color
+ - Add support for importing dmabuf textures
+ - Handle GLES better by using some extensions
+
+* Translation updates:
+ Catalan
+ Russian
+ Turkish
+
+
+Overview of Changes in 4.13.1, 28-09-2023
+=========================================
+
+* GtkTooltip:
+ - Don't cross native boundaries when looking for tooltips
+
+* GtkCenterLayout, GtkEntry, GtkSearchEntry:
+ - Fix some issues with baseline handling
+
+* GtkColorButton, GtkFontButton:
+ - Propagate focus-on-click
+
+* GtkFileChooser:
+ - Make "Visit file" scroll to the file
+
+* GtkSwitch:
+ - Respect text direction
+
+* GtkWindow:
+ - Don't assume titlebars are GtkHeaderBars
+
+* Printing:
+ - Fix some problems with the portal implementation
+ - Add a new simple print API: GtkPrintDialog
+
+* Paths:
+ - GskPathMeasure performance has been improved
+ - Add custom contours for circles, rounded rectangles and rectangles
+ - Simplify GskPathPoint handling
+ - gsk_path_point_get_closest_point now returns the distance as well
+ - Make GskPathBuilder simplify curves
+
+* Input:
+ - Handle (some) single-key compose sequences
+ - Fix active state tracking with sensitivity changes and grabs
+
+* GSK:
+ - Make the repeated gradients match between GL and cairo
+ - Make rounded rect shrinking match between Vulkan, GL and cairo
+ - Fix parsing of text nodes with color glyphs
+ - Restrict an optimization to the cases where it is crrect
+ - Fix rendering of shadows with opacity
+ - The Vulkan renderer now requires Vulkan 1.2
+ - GL: Transition gradients unpremultiplied
+ - GL: Fix clipping of shadows
+ - GL: Some optimizations
+ - Broadway: Fix memory leaks in the renderer
+
+* Wayland:
+ - Make activation more reliable
+
+* macOS:
+ - Clamp damage regions to the surface size
+
+* Tools:
+ - gtk4-path-tool gained restrict and reverse commands
+ - gtk4-path-tool show and render can show control points
+
+* Demos:
+ - Add a demo for hit testing with paths
+
+* Build:
+ - Fix build problems with C++ compilers
+
+* Deprecations:
+ - gtk_window_present_with_time
+
+* Translation updates
+ Brazilian Portuguese
+ British English
+ Catalan
+ Chinese (China)
+ Czech
+ Danish
+ Dutch
+ Esperanto
+ Galician
+ Georgian
+ Italian
+ Korean
+ Latvian
+ Lithuanian
+ Persian
+ Polish
+ Punjabi
+ Slovenian
+ Turkish
+
+
+Overview of Changes in 4.13.0, 25-08-2023
+=========================================
+
+* GskPath, GskPathBuilder, GskPathMeasure:
+  Data types and APIs for path rendering. These APIs are still
+  considered experimental, and may change until 4.14. Please try
+  them out and give us feedback. Documentation can be found
+  here: https://docs.gtk.org/gsk4/paths.html
+
+* GtkGridView:
+ - Fix a crash when scrolling
+
+* GtkColumnView:
+ - Fix a refcounting issue in the new scroll_to api
+
+* GtkTreeView
+ - Fix style classes for sort arrows
+
+* GtkEntry:
+ - Improve tracking of user changes (for undo)
+
+* GtkNotebook:
+ - Fix a critical when switching pages
+
+* GtkColor/FontDialogButton:
+ - Make these widgets activatable
+
+* GtkMenuButton:
+ - Fix problems with focus handling
+ - Fix problems with DND
+ - Make flags a settable property
+
+* GtkShortcutsWindow:
+ - Add API to build shortcuts windows programmatically
+
+* Printing
+ - Fix the cpdb backend build
+
+* MacOS:
+ - Make file filters work again
+
+* GSK:
+ - Fix issues with color matrix nodes
+
+* Wayland:
+ - Fix a crash with compositors other than gnome-shell
+
+* Deprecations:
+ - Remaining GtkTreeModel-related types
+
+* Demos:
+ - Add a few path demos to gtk4-demo
+
+* Tools:
+ - gtk4-path-tool provides a commandline interface for paths
+
+* Translation updates:
+ Basque
+ Catalan
+ Finnish
+ Galician
+ Georgian
+ German
+ Greek
+ Indonesian
+ Kazakh
+ Persian
+ Polish
+ Romanian
+ Spanish
+ Swedish
+ Turkish
+ Ukrainian
+
+
+Overview of Changes in 4.12.0, 05-08-2023
+=========================================
+
+* List widgets:
+ - Add scroll_to APIs
+
+* GtkFileLauncher:
+ - Add an always-ask property
+
+* GtkTextView:
+ - Make backspace behavior match GtkEntry
+
+* gsk:
+ - Fix handling of luminance in mask nodes
+
+* Text rendering:
+ - Automate the setting of gtk-hint-font-metrics from the
+   scale factor. This improves font rendering in flatpaks
+
+* Wayland:
+ - Fix behavior of stylus buttons
+ - Support suspended window state
+
+* Vulkan:
+ - Many improvements
+
+* Tools:
+ - Add gtk4-rendernode-tool
+
+* Debugging:
+ - Drop the GTK_DEBUG_TOUCHSCREEN flag
+
+* Build:
+ - Some build options have been renamed:
+     gtk_doc -> documentation
+     update_screenshots -> screenshots
+   The old names still work
+
+* Translation updates:
+ Georgian
+ Greek
+ Hebrew
+ Persian
+ Vietnamese
+
+* Contributors:
+ Aleksandr Melman
+ Alexander Mikhaylenko
+ Alexander Shopov
+ Alexandre Franke
+ Alice Mikhaylenko
+ António Fernandes
+ Arjan Molenaar
+ Asier Sarasua Garmendia
+ Balázs Meskó
+ Balázs Úr
+ Barnabás Pőcze
+ Bart Jacobs
+ Benjamin Otte
+ Bilal Elmoussaoui
+ Boyuan Yang
+ Bruce Cowan
+ Calvin Walton
+ Cam Cook
+ Chris Mayo
+ Christian Hergert
+ Christopher Davis
+ Chun-wei Fan
+ Corey Berla
+ Danial Behzadi
+ Daniel Boles
+ Daniel Rusek
+ Efstathios Iosifidis
+ Ekaterine Papava
+ Emin Tufan Çetin
+ Emmanuele Bassi
+ Erik Schilling
+ Fabio Tomat
+ FeRD (Frank Dana)
+ Fina Wilke
+ FineFindus
+ Fran Dieguez
+ G.Willems
+ Georges Basile Stavracas Neto
+ Guillaume Bernard
+ Hugo Carvalho
+ Ivan Molodetskikh
+ Jason Francis
+ Jonas Ådahl
+ Jordan Petridis
+ Jordi Mas
+ José Expósito
+ José Roberto de Souza
+ Khalid Abu Shawarib
+ Kévin Commaille
+ Leônidas Araújo
+ Luca Bacci
+ Ludovico de Nittis
+ Lukáš Tyrychtr
+ Marc-André Lureau
+ Marco Trevisan (Treviño)
+ Matt Turner
+ Matthias Clasen
+ Maximiliano Sandoval R
+ Michael Catanzaro
+ Michel Dänzer
+ Mohammed Sadiq
+ Nathan Follens
+ Nelson Benítez León
+ Ngọc Quân Trần
+ Niels De Graef
+ Olivier Crête
+ Patrick Griffis
+ Piotr Drąg
+ Sabri Ünal
+ Sebastian Keller
+ Sophie Herold
+ Sébastien Le Roux
+ Takao Fujiwara
+ Thomas Lange
+ Yiğit Burak
+ Yosef Or Boczko
+ Yuri Chornoivan
+ Zander Brown
+ al_SeveR
+ dgsasha
+ sumibi-yakitori
+ tszymanski
+ velsinki
+ Алексей Шилин
+ Арсений Засыпкин
+
+Overview of Changes in 4.11.4, 03-07-2023
+=========================================
+
+* GtkFileChooser:
+ - Default to sorting folders first
+ - Fix a crash when visiting recent files
+
+* GtkTextView:
+ - Fix corner cases in word navigation
+
+* GtkMenuButton:
+ - Normalize label layout
+
+* GtkDropDown:
+ - Add support for sections
+
+* GtkVideo:
+ - Make the overlay icon clickable
+
+* GtkWindow:
+ - Clear the resize cursors to avoid artifacts
+
+* GtkFileDialog:
+ - Always set initial-folder
+
+* GtkDropDown:
+ - Update on expression changes
+
+* GtkMapListModel:
+ - Implement GtkSectionModel
+
+* Accessibility:
+ - Improvements all over the place: GtkButton, GtkPasswordEntry,
+   GtkFontChooserDialog, GtkColorChooserDialog, GtkShortcutsWindow,
+   GtkMenuButton, GtkAboutDialog, GtkFileChooserDialog, GtkStackSidebar,
+   GtkStackSwitcher, GtkMediaControls, GtkColorDialogButton, GtkDropDown,
+   GtkInfoBar, GtkNotebook, GtkPrintUnixDialog, GtkModelButton
+ - Make name computation follow the ARIA spec more closely
+ - Adapt name computation for the common 'nested button' scenario
+ - Change many containers to use `generic` instead of `group`
+ - Use `generic` as the default role
+ - Use `application` instead of `window` for windows
+ - Add properties for accessible names of not directly exposed
+   widgets in GtkListView, GtkGridView and GtkColumnView
+
+* DND:
+ - Fix criticals when drops are rejected
+
+* X11:
+ - Fix regressions in GLX setup
+
+* Windows:
+ - Center newly created transient windows
+
+* Vulkan:
+ - Add antialising for gradients
+ - Do less work on clipped away nodes
+ - Redo image uploading
+ - Support different image depths and formats
+ - Add a pipeline cache
+
+* Demos:
+ - gtk4-demo: Improve window sizing
+ - gtk4-demo: Improve focus behavior
+ - gtk4-demo: Add many missing a11y properties
+
+* Tools:
+ - gtk4-builder-tool: Make render an alias screenshot
+
+* Inspector:
+ - Show more information in the a11y tab
+ - Add an accessibility overlay with warnings and recommendations
+ - Limit the width of the a11y tab
+
+* Build:
+ - Require GLib 2.76
+ - Make asan builds work again
+ - Fix the build if ld is not ld.bdf
+
+* Translation updates:
+ Brazilian Portuguese
+ Catalan
+ Czech
+ Georgian
+
+
+Overview of Changes in 4.11.3, 05-06-2023
 =========================================
 
 * GtkGridView:
@@ -8,6 +520,9 @@ Overview of Changes in 4.11.3, xx-xx-xxxx
 * GtkListView:
  - Don't leak the factories
 
+* GtkColumnView:
+ - Support displaying sections
+
 * GtkNotebook:
  - Make the pages model implement GtkSelectionModel
 
@@ -17,18 +532,41 @@ Overview of Changes in 4.11.3, xx-xx-xxxx
 * GtkPopoverMenu:
  - Avoid unnecessary left padding
 
-* Css:
+* GtkSearchEntry:
+ - Improve size allocation for the clear icon
+
+* GtkBoxLayout:
+ - Fix a regression from recent baseline work
+
+* CSS:
  - Add new binding-friendly css provider apis
 
 * Theme:
  - Show focus in the shortcuts window
 
-* Tests:
- - Improve test coverage
+* GDK:
+ - Support grayscale and alpha texture formats for loading
+   and saving to png and tiff, and in GL
+ - Fix some regressions in GL context initialization
+
+* GSK:
+ - Support grayscale and alpha texture formats in the GL renderer
+ - Support straight alpha textures in the GL renderer
+ - Many improvements to the experimental Vulkan renderer
 
 * Wayland:
  - Make exporting surface handles more flexible
 
+* X11:
+ - Trap XRandr errors
+ - Stop using passive grabs during DND
+
+* Windows:
+ - Many cleanups and simplifications
+
+* Tests:
+ - Improve test coverage
+
 * Build:
  - Some build options have been renamed:
      demos -> build-demos
@@ -48,7 +586,9 @@ Overview of Changes in 4.11.3, xx-xx-xxxx
 * Translation updates:
  Basque
  Catalan
+ Georgian
  Russian
+ Turkish
 
 
 Overview of Changes in 4.11.2, 09-05-2023

README.md

@@ -67,6 +67,13 @@ building for:
   - [Graphene](https://github.com/ebassi/graphene)
   - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
 
+If you are building the Wayland backend, you will also need:
+
+  - Wayland-client
+  - Wayland-protocols
+  - Wayland-cursor
+  - Wayland-EGL
+
 If you are building the X11 backend, you will also need:
 
   - Xlib, and the following X extensions:
@@ -79,32 +86,24 @@ If you are building the X11 backend, you will also need:
     - xdamage
     - xcomposite
 
-If you are building the Wayland backend, you will also need:
-
-  - Wayland-client
-  - Wayland-protocols
-  - Wayland-cursor
-  - Wayland-EGL
-
 Once you have all the necessary dependencies, you can build GTK by using
 Meson:
 
 ```sh
-$ meson _build .
-$ cd _build
-$ ninja
+$ meson setup _build
+$ meson compile -C_build
 ```
 
 You can run the test suite using:
 
 ```sh
-$ meson test
+$ meson test -C_build
 ```
 
 And, finally, you can install GTK using:
 
 ```
-$ sudo ninja install
+$ sudo meson install -C_build
 ```
 
 Complete information about installing GTK and related libraries

build-aux/msvc/msvc_recommended_pragmas.h

@@ -0,0 +1,41 @@
+#ifndef _MSC_VER
+#pragma error "This header is for Microsoft VC or clang-cl only."
+#endif /* _MSC_VER */
+
+/* Make MSVC more pedantic, this is a recommended pragma list
+ * from _Win32_Programming_ by Rector and Newcomer.
+ */
+#ifndef __clang__
+#pragma warning(error:4002) /* too many actual parameters for macro */
+#pragma warning(error:4003) /* not enough actual parameters for macro */
+#pragma warning(1:4010)     /* single-line comment contains line-continuation character */
+#pragma warning(error:4013) /* 'function' undefined; assuming extern returning int */
+#pragma warning(1:4016)     /* no function return type; using int as default */
+#pragma warning(error:4020) /* too many actual parameters */
+#pragma warning(error:4021) /* too few actual parameters */
+#pragma warning(error:4027) /* function declared without formal parameter list */
+#pragma warning(error:4029) /* declared formal parameter list different from definition */
+#pragma warning(error:4033) /* 'function' must return a value */
+#pragma warning(error:4035) /* 'function' : no return value */
+#pragma warning(error:4045) /* array bounds overflow */
+#pragma warning(error:4047) /* different levels of indirection */
+#pragma warning(error:4049) /* terminating line number emission */
+#pragma warning(error:4053) /* An expression of type void was used as an operand */
+#pragma warning(error:4071) /* no function prototype given */
+#pragma warning(disable:4101) /* unreferenced local variable */
+#pragma warning(error:4150)
+
+/* G_NORETURN */
+#pragma warning(error:4646) /* function declared with __declspec(noreturn) has non-void return type */
+#pragma warning(error:4715) /* 'function': not all control paths return a value */
+#pragma warning(error:4098) /* 'void' function returning a value */
+
+#pragma warning(disable:4244)	/* No possible loss of data warnings */
+#pragma warning(disable:4305)   /* No truncation from int to char warnings */
+
+#pragma warning(error:4819) /* The file contains a character that cannot be represented in the current code page */
+#endif                      /* __clang__ */
+
+/* work around Microsoft's premature attempt to deprecate the C-Library */
+#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_NONSTDC_NO_WARNINGS

demos/constraint-editor/constraint-editor-window.c

@@ -483,6 +483,8 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
+  g_type_ensure (CONSTRAINT_VIEW_TYPE);
+
   object_class->dispose = constraint_editor_window_dispose;
 
   gtk_widget_class_set_template_from_resource (widget_class,

demos/constraint-editor/constraint-editor.c

@@ -20,8 +20,7 @@
 #include "config.h"
 
 #include "constraint-editor.h"
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+#include "constraint-view.h"
 
 struct _ConstraintEditor
 {
@@ -66,7 +65,7 @@ static const char *
 get_target_name (GtkConstraintTarget *target)
 {
   if (target == NULL)
-    return "super";
+    return "Super";
   else if (GTK_IS_WIDGET (target))
     return gtk_widget_get_name (GTK_WIDGET (target));
   else if (GTK_IS_CONSTRAINT_GUIDE (target))
@@ -80,62 +79,29 @@ constraint_target_combo (GListModel *model,
                          GtkWidget  *combo,
                          gboolean    is_source)
 {
+  GtkStringList *targets;
   int i;
 
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "super", "Super");
+  targets = gtk_string_list_new (NULL);
+
+  gtk_string_list_append (targets, "Super");
 
   if (model)
     {
       for (i = 0; i < g_list_model_get_n_items (model); i++)
         {
           GObject *item = g_list_model_get_object (model, i);
-          const char *name;
 
           if (GTK_IS_CONSTRAINT (item))
             continue;
 
-          name = get_target_name (GTK_CONSTRAINT_TARGET (item));
-
-          gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), name, name);
+          gtk_string_list_append (targets, get_target_name (GTK_CONSTRAINT_TARGET (item)));
           g_object_unref (item);
         }
     }
-}
 
-static void
-constraint_attribute_combo (GtkWidget *combo,
-                            gboolean is_source)
-{
-  if (is_source)
-    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "none", "None");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "left", "Left");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "right", "Right");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "top", "Top");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "bottom", "Bottom");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "start", "Start");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "end", "End");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "width", "Width");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "height", "Height");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-x", "Center X");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-y", "Center Y");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "baseline", "Baseline");
-}
-
-static void
-constraint_relation_combo (GtkWidget *combo)
-{
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "le", "≤");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "eq", "=");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "ge", "≥");
-}
-
-static void
-constraint_strength_combo (GtkWidget *combo)
-{
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
+  gtk_drop_down_set_model (GTK_DROP_DOWN (combo), G_LIST_MODEL (targets));
+  g_object_unref (targets);
 }
 
 static gpointer
@@ -147,7 +113,7 @@ get_target (GListModel *model,
   if (id == NULL)
     return NULL;
 
-  if (strcmp ("super", id) == 0)
+  if (strcmp ("Super", id) == 0)
     return NULL;
 
   for (i = 0; i < g_list_model_get_n_items (model); i++)
@@ -171,16 +137,65 @@ get_target (GListModel *model,
   return NULL;
 }
 
-static GtkConstraintAttribute
-get_target_attr (const char *id)
+static void
+select_target (GtkDropDown *combo,
+               const char  *target_name)
 {
-  GtkConstraintAttribute attr;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  attr = value->value;
-  g_type_class_unref (class);
+  GListModel *model = gtk_drop_down_get_model (combo);
 
-  return attr;
+  for (unsigned int i = 0; i < g_list_model_get_n_items (model); i++)
+    {
+      GtkStringObject *s = g_list_model_get_item (model, i);
+
+      g_object_unref (s);
+      if (strcmp (target_name, gtk_string_object_get_string (s)) == 0)
+        {
+          gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), i);
+          return;
+        }
+    }
+}
+
+static GtkConstraintAttribute
+get_attr (unsigned int id)
+{
+  switch (id)
+    {
+    case 0: return GTK_CONSTRAINT_ATTRIBUTE_NONE;
+    case 1: return GTK_CONSTRAINT_ATTRIBUTE_LEFT;
+    case 2: return GTK_CONSTRAINT_ATTRIBUTE_RIGHT;
+    case 3: return GTK_CONSTRAINT_ATTRIBUTE_TOP;
+    case 4: return GTK_CONSTRAINT_ATTRIBUTE_BOTTOM;
+    case 5: return GTK_CONSTRAINT_ATTRIBUTE_START;
+    case 6: return GTK_CONSTRAINT_ATTRIBUTE_END;
+    case 7: return GTK_CONSTRAINT_ATTRIBUTE_WIDTH;
+    case 8: return GTK_CONSTRAINT_ATTRIBUTE_HEIGHT;
+    case 9: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_X;
+    case 10: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y;
+    case 11: return GTK_CONSTRAINT_ATTRIBUTE_BASELINE;
+    default: g_assert_not_reached ();
+    }
+}
+
+static unsigned int
+get_attr_id (GtkConstraintAttribute attr)
+{
+  switch (attr)
+    {
+    case GTK_CONSTRAINT_ATTRIBUTE_NONE: return 0;
+    case GTK_CONSTRAINT_ATTRIBUTE_LEFT: return 1;
+    case GTK_CONSTRAINT_ATTRIBUTE_RIGHT: return 2;
+    case GTK_CONSTRAINT_ATTRIBUTE_TOP: return 3;
+    case GTK_CONSTRAINT_ATTRIBUTE_BOTTOM: return 4;
+    case GTK_CONSTRAINT_ATTRIBUTE_START: return 5;
+    case GTK_CONSTRAINT_ATTRIBUTE_END: return 6;
+    case GTK_CONSTRAINT_ATTRIBUTE_WIDTH: return 7;
+    case GTK_CONSTRAINT_ATTRIBUTE_HEIGHT: return 8;
+    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_X: return 9;
+    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y: return 10;
+    case GTK_CONSTRAINT_ATTRIBUTE_BASELINE: return 11;
+    default: g_assert_not_reached ();
+    }
 }
 
 static const char *
@@ -195,15 +210,27 @@ get_attr_nick (GtkConstraintAttribute attr)
 }
 
 static GtkConstraintRelation
-get_relation (const char *id)
+get_relation (unsigned int id)
 {
-  GtkConstraintRelation relation;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  relation = value->value;
-  g_type_class_unref (class);
+  switch (id)
+    {
+    case 0: return GTK_CONSTRAINT_RELATION_LE;
+    case 1: return GTK_CONSTRAINT_RELATION_EQ;
+    case 2: return GTK_CONSTRAINT_RELATION_GE;
+    default: g_assert_not_reached ();
+    }
+}
 
-  return relation;
+static unsigned int
+get_relation_id (GtkConstraintRelation relation)
+{
+  switch (relation)
+    {
+    case GTK_CONSTRAINT_RELATION_LE: return 0;
+    case GTK_CONSTRAINT_RELATION_EQ: return 1;
+    case GTK_CONSTRAINT_RELATION_GE: return 2;
+    default: g_assert_not_reached ();
+    }
 }
 
 static const char *
@@ -234,15 +261,29 @@ get_relation_display_name (GtkConstraintRelation relation)
 }
 
 static GtkConstraintStrength
-get_strength (const char *id)
-{
-  GtkConstraintStrength strength;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  strength = value->value;
-  g_type_class_unref (class);
+get_strength (unsigned int id)
+{ 
+  switch (id)
+    {
+    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
+    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
+    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
+    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
+    default: g_assert_not_reached ();
+    }
+}
 
-  return strength;
+static unsigned int
+get_strength_id (GtkConstraintStrength strength)
+{
+  switch (strength)
+    {
+    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
+    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
+    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
+    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
+    default: g_assert_not_reached ();
+    }
 }
 
 static const char *
@@ -294,7 +335,7 @@ static void
 create_constraint (GtkButton        *button,
                    ConstraintEditor *editor)
 {
-  const char *id;
+  gpointer obj;
   gpointer target;
   GtkConstraintAttribute target_attr;
   gpointer source;
@@ -305,25 +346,27 @@ create_constraint (GtkButton        *button,
   int strength;
   GtkConstraint *constraint;
 
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  target = get_target (editor->model, id);
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
-  target_attr = get_target_attr (id);
+  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
+  if (obj)
+    target = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
+  else
+    target = NULL;
+  target_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->target_attr)));
 
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-  source = get_target (editor->model, id);
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  source_attr = get_target_attr (id);
+  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
+  if (obj)
+    source = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
+  else
+    source = NULL;
+  source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN(editor->source_attr)));
 
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->relation));
-  relation = get_relation (id);
+  relation = get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation)));
 
   multiplier = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->multiplier)), NULL);
 
   constant = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->constant)), NULL);
 
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
-  strength = get_strength (id);
+  strength = get_strength (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength)));
 
   constraint = gtk_constraint_new (target, target_attr,
                                    relation,
@@ -338,12 +381,9 @@ create_constraint (GtkButton        *button,
 static void
 source_attr_changed (ConstraintEditor *editor)
 {
-  const char *id;
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  if (strcmp (id, "none") == 0)
+  if (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))) == GTK_CONSTRAINT_ATTRIBUTE_NONE)
     {
-      gtk_combo_box_set_active (GTK_COMBO_BOX (editor->source), -1);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source), GTK_INVALID_LIST_POSITION);
       gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "");
       gtk_widget_set_sensitive (editor->source, FALSE);
       gtk_widget_set_sensitive (editor->multiplier, FALSE);
@@ -409,7 +449,7 @@ update_preview (ConstraintEditor *editor)
   GString *str;
   const char *name;
   const char *attr;
-  char *relation;
+  const char *relation;
   const char *multiplier;
   const char *constant;
   double c, m;
@@ -419,23 +459,22 @@ update_preview (ConstraintEditor *editor)
 
   str = g_string_new ("");
 
-  name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
-  relation = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (editor->relation));
+  name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target))));
+  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected ((GTK_DROP_DOWN (editor->target_attr)))));
+  relation = get_relation_nick (get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation))));
 
   if (name == NULL)
     name = "[ ]";
 
   g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
-  g_free (relation);
 
   constant = gtk_editable_get_text (GTK_EDITABLE (editor->constant));
   c = g_ascii_strtod (constant, NULL);
 
-  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
+  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))));
   if (strcmp (attr, "none") != 0)
     {
-      name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
+       name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source))));
       multiplier = gtk_editable_get_text (GTK_EDITABLE (editor->multiplier));
       m = g_ascii_strtod (multiplier, NULL);
 
@@ -463,12 +502,18 @@ update_preview (ConstraintEditor *editor)
 static void
 update_button (ConstraintEditor *editor)
 {
-  const char *target = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  const char *source = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-  const char *source_attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
+  gpointer obj;
+  const char *target;
+  const char *source;
+  GtkConstraintAttribute source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr)));
 
-  if (target &&
-      (source || (source_attr && get_target_attr (source_attr) == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
+  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
+  target = obj ? gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
+
+  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
+  source = obj ?  gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
+
+  if (target && (source || (source_attr == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
     gtk_widget_set_sensitive (editor->button, TRUE);
   else
     gtk_widget_set_sensitive (editor->button, FALSE);
@@ -486,12 +531,7 @@ constraint_editor_constructed (GObject *object)
   ConstraintEditor *editor = CONSTRAINT_EDITOR (object);
 
   constraint_target_combo (editor->model, editor->target, FALSE);
-  constraint_attribute_combo (editor->target_attr, FALSE);
-  constraint_relation_combo (editor->relation);
   constraint_target_combo (editor->model, editor->source, TRUE);
-  constraint_attribute_combo (editor->source_attr, TRUE);
-
-  constraint_strength_combo (editor->strength);
 
   if (editor->constraint)
     {
@@ -499,30 +539,24 @@ constraint_editor_constructed (GObject *object)
       GtkConstraintAttribute attr;
       GtkConstraintRelation relation;
       GtkConstraintStrength strength;
-      const char *nick;
       char *val;
       double multiplier;
       double constant;
 
       target = gtk_constraint_get_target (editor->constraint);
-      nick = get_target_name (target);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target), nick);
+      select_target (GTK_DROP_DOWN (editor->target), get_target_name (target));
 
       attr = gtk_constraint_get_target_attribute (editor->constraint);
-      nick = get_attr_nick (attr);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), nick);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (attr));
 
       target = gtk_constraint_get_source (editor->constraint);
-      nick = get_target_name (target);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source), nick);
+      select_target (GTK_DROP_DOWN (editor->source), get_target_name (target));
 
       attr = gtk_constraint_get_source_attribute (editor->constraint);
-      nick = get_attr_nick (attr);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), nick);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (attr));
 
       relation = gtk_constraint_get_relation (editor->constraint);
-      nick = get_relation_nick (relation);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), nick);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (relation));
 
       multiplier = gtk_constraint_get_multiplier (editor->constraint);
       val = g_strdup_printf ("%g", multiplier);
@@ -535,17 +569,16 @@ constraint_editor_constructed (GObject *object)
       g_free (val);
 
       strength = gtk_constraint_get_strength (editor->constraint);
-      nick = get_strength_nick (strength);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
     }
   else
     {
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), "left");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), "left");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), "eq");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "required");
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (GTK_CONSTRAINT_RELATION_EQ));
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_REQUIRED));
 
       gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1.0");
       gtk_editable_set_text (GTK_EDITABLE (editor->constant), "0.0");

demos/constraint-editor/constraint-editor.ui

@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <object class="GtkStringList" id="targets">
+    <items>
+      <item>None</item>
+      <item>Left</item>
+      <item>Right</item>
+      <item>Top</item>
+      <item>Bottom</item>
+      <item>Start</item>
+      <item>End</item>
+      <item>Width</item>
+      <item>Height</item>
+      <item>Center X</item>
+      <item>Center Y</item>
+      <item>Baseline</item>
+    </items>
+  </object>
   <template class="ConstraintEditor" parent="GtkWidget">
     <child>
       <object class="GtkGrid" id="grid">
@@ -19,9 +35,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="target">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="update_button" swapped="yes"/>
+          <object class="GtkDropDown" id="target">
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <signal name="notify::selected" handler="update_button" swapped="yes"/>
             <layout>
               <property name="column">1</property>
               <property name="row">1</property>
@@ -29,8 +45,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="target_attr">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
+          <object class="GtkDropDown" id="target_attr">
+            <property name="model">targets</property>
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
             <layout>
               <property name="column">2</property>
               <property name="row">1</property>
@@ -47,8 +64,17 @@
           </object>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="relation">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
+          <object class="GtkDropDown" id="relation">
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <property name="model">
+              <object class="GtkStringList">
+                <items>
+                  <item>≤</item>
+                  <item>=</item>
+                  <item>≥</item>
+                </items>
+              </object>
+            </property>
             <layout>
               <property name="column">1</property>
               <property name="row">2</property>
@@ -65,9 +91,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="source">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="update_button" swapped="yes"/>
+          <object class="GtkDropDown" id="source">
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <signal name="notify::selected" handler="update_button" swapped="yes"/>
             <layout>
               <property name="column">1</property>
               <property name="row">3</property>
@@ -75,10 +101,11 @@
           </object>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="source_attr">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="source_attr_changed" swapped="yes"/>
-            <signal name="changed" handler="update_button" swapped="yes"/>
+          <object class="GtkDropDown" id="source_attr">
+            <property name="model">targets</property>
+            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+            <signal name="notify::selected" handler="source_attr_changed" swapped="yes"/>
+            <signal name="notify::selected" handler="update_button" swapped="yes"/>
             <layout>
               <property name="column">2</property>
               <property name="row">3</property>
@@ -131,7 +158,17 @@
           </object>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="strength">
+          <object class="GtkDropDown" id="strength">
+            <property name="model">
+              <object class="GtkStringList">
+                <items>
+                  <item>Weak</item>
+                  <item>Medium</item>
+                  <item>Strong</item>
+                  <item>Required</item>
+                </items>
+              </object>
+            </property>
             <layout>
               <property name="column">1</property>
               <property name="row">6</property>

demos/constraint-editor/guide-editor.c

@@ -21,8 +21,6 @@
 
 #include "guide-editor.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 struct _GuideEditor
 {
   GtkWidget parent_instance;
@@ -59,25 +57,30 @@ static guint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE(GuideEditor, guide_editor, GTK_TYPE_WIDGET);
 
-static void
-guide_strength_combo (GtkWidget *combo)
+static GtkConstraintStrength
+get_strength (unsigned int id)
 {
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
+  switch (id)
+    {
+    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
+    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
+    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
+    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
+    default: g_assert_not_reached ();
+    }
 }
 
-static GtkConstraintStrength
-get_strength (const char *id)
+static unsigned int
+get_strength_id (GtkConstraintStrength strength)
 {
-  GtkConstraintStrength strength;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  strength = value->value;
-  g_type_class_unref (class);
-
-  return strength;
+  switch (strength)
+    {
+    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
+    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
+    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
+    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
+    default: g_assert_not_reached ();
+    }
 }
 
 static const char *
@@ -118,11 +121,11 @@ static void
 create_guide (GtkButton   *button,
               GuideEditor *editor)
 {
-  const char *id;
   int strength;
   const char *name;
   int w, h;
   GtkConstraintGuide *guide;
+  unsigned int id;
 
   if (editor->guide)
     guide = g_object_ref (editor->guide);
@@ -144,7 +147,7 @@ create_guide (GtkButton   *button,
   h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_height));
   gtk_constraint_guide_set_max_size (guide, w, h);
 
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
+  id = gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength));
   strength = get_strength (id);
   gtk_constraint_guide_set_strength (guide, strength);
 
@@ -191,14 +194,9 @@ guide_editor_constructed (GObject *object)
 {
   GuideEditor *editor = GUIDE_EDITOR (object);
 
-  guide_strength_combo (editor->strength);
-
   g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
-
   g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
-
   g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
-
   g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
 
   if (editor->guide)
@@ -224,8 +222,7 @@ guide_editor_constructed (GObject *object)
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), h);
 
       strength = gtk_constraint_guide_get_strength (editor->guide);
-      nick = get_strength_nick (strength);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
     }
@@ -245,7 +242,7 @@ guide_editor_constructed (GObject *object)
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), G_MAXINT);
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), G_MAXINT);
 
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "medium");
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_MEDIUM));
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
     }

demos/constraint-editor/guide-editor.ui

@@ -167,7 +167,17 @@
           </object>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="strength">
+          <object class="GtkDropDown" id="strength">
+            <property name="model">
+              <object class="GtkStringList">
+                <items>
+                  <item>Weak</item>
+                  <item>Medium</item>
+                  <item>Strong</item>
+                  <item>Required</item>
+                </items>
+              </object>
+            </property>
             <layout>
               <property name="column">1</property>
               <property name="row">4</property>

demos/gtk-demo/application.c

@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
@@ -37,7 +35,7 @@ show_action_dialog (GSimpleAction *action)
 {
   GtkAlertDialog *dialog;
 
-  dialog = gtk_alert_dialog_new ("You activated action: \"%s\n",
+  dialog = gtk_alert_dialog_new ("You activated action: \"%s\"",
                                  g_action_get_name (G_ACTION (action)));
   gtk_alert_dialog_show (dialog, NULL);
   g_object_unref (dialog);
@@ -216,6 +214,41 @@ activate_quit (GSimpleAction *action,
     }
 }
 
+static void
+delete_messages (gpointer data)
+{
+  g_list_free_full ((GList *)data, g_free);
+}
+
+static void
+pop_message (GtkWidget *status)
+{
+  GList *messages = (GList *) g_object_steal_data (G_OBJECT (status), "messages");
+
+  if (messages)
+    {
+      char *message = messages->data;
+      messages = g_list_remove (messages, message);
+
+      g_object_set_data_full (G_OBJECT (status), "messages",
+                              messages, delete_messages);
+
+      gtk_label_set_label (GTK_LABEL (status), message);
+    }
+}
+
+static void
+push_message (GtkWidget  *status,
+              const char *message)
+{
+  GList *messages = (GList *) g_object_steal_data (G_OBJECT (status), "messages");
+
+  gtk_label_set_label (GTK_LABEL (status), message);
+  messages = g_list_prepend (messages, g_strdup (message));
+  g_object_set_data_full (G_OBJECT (status), "messages",
+                          messages, delete_messages);
+}
+
 static void
 update_statusbar (GtkTextBuffer         *buffer,
                   DemoApplicationWindow *window)
@@ -226,7 +259,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   GtkTextIter iter;
 
   /* clear any previous message, underflow is allowed */
-  gtk_statusbar_pop (GTK_STATUSBAR (window->status), 0);
+  pop_message (window->status);
 
   count = gtk_text_buffer_get_char_count (buffer);
 
@@ -240,7 +273,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
                          row, col, count);
 
-  gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, msg);
+  push_message (window->status, msg);
 
   g_free (msg);
 }

demos/gtk-demo/application.ui

@@ -76,8 +76,13 @@
           </object>
         </child>
         <child>
-          <object class="GtkStatusbar" id="status">
+          <object class="GtkLabel" id="status">
             <property name="hexpand">1</property>
+            <property name="xalign">0</property>
+            <property name="margin-start">2</property>
+            <property name="margin-end">2</property>
+            <property name="margin-top">2</property>
+            <property name="margin-bottom">2</property>
             <layout>
               <property name="column">0</property>
               <property name="row">3</property>

demos/gtk-demo/assistant.c

@@ -162,6 +162,10 @@ create_page4 (GtkWidget *assistant)
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), progress_bar, GTK_ASSISTANT_PAGE_PROGRESS);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), progress_bar, "Applying changes");
 
+  gtk_accessible_update_property (GTK_ACCESSIBLE (progress_bar),
+                                  GTK_ACCESSIBLE_PROPERTY_LABEL, "Applying changes",
+                                  -1);
+
   /* This prevents the assistant window from being
    * closed while we're "busy" applying changes.
    */

demos/gtk-demo/bluroverlay.h

@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __BLUR_OVERLAY_H__
-#define __BLUR_OVERLAY_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -60,5 +59,3 @@ void       blur_overlay_set_child   (BlurOverlay *overlay,
                                      GtkWidget   *widget);
 
 G_END_DECLS
-
-#endif /* __BLUR_OVERLAY_H__ */

demos/gtk-demo/builder.c

@@ -1,5 +1,5 @@
 /* Builder
- * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkStatusBar, GtkShortcutController, toolbar
+ * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkShortcutController, toolbar
  *
  * Demonstrates a traditional interface, loaded from a XML description,
  * and shows how to connect actions to the menu items and toolbar buttons.
@@ -37,30 +37,34 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-static gboolean
-pop_status (gpointer data)
+static int
+pop_message (gpointer data)
 {
-  gtk_statusbar_pop (GTK_STATUSBAR (data), 0);
-  g_object_set_data (G_OBJECT (data), "timeout", NULL);
+  GtkWidget *status = data;
+
+  gtk_label_set_label (GTK_LABEL (status), "");
+  g_object_set_data (G_OBJECT (status), "timeout", GUINT_TO_POINTER (0));
+
   return G_SOURCE_REMOVE;
 }
 
 static void
-status_message (GtkStatusbar *status,
-                const char   *text)
+status_message (GtkWidget  *status,
+                const char *text)
 {
   guint id;
 
-  gtk_statusbar_push (GTK_STATUSBAR (status), 0, text);
-  id = g_timeout_add (5000, pop_status, status);
+  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (status), "timeout"));
+  if (id)
+    g_source_remove (id);
+
+  gtk_label_set_text (GTK_LABEL (status), text);
+
+  id = g_timeout_add (5000, pop_message, status);
 
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
-G_GNUC_END_IGNORE_DEPRECATIONS
-
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,
@@ -69,7 +73,7 @@ help_activate (GSimpleAction *action,
   GtkWidget *status;
 
   status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (GTK_STATUSBAR (status), "Help not available");
+  status_message (status, "Help not available");
 }
 
 static void
@@ -82,7 +86,7 @@ not_implemented (GSimpleAction *action,
 
   text = g_strdup_printf ("Action “%s” not implemented", g_action_get_name (G_ACTION (action)));
   status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (GTK_STATUSBAR (status), text);
+  status_message (status, text);
   g_free (text);
 }
 

demos/gtk-demo/clipboard.ui

@@ -4,6 +4,9 @@
   <object class="GtkWindow" id="window">
     <property name="resizable">1</property>
     <property name="title">Clipboard</property>
+    <accessibility>
+      <relation name="described-by">label</relation>
+    </accessibility>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
@@ -13,7 +16,7 @@
         <property name="margin-bottom">12</property>
         <property name="spacing">12</property>
         <child>
-          <object class="GtkLabel">
+          <object class="GtkLabel" id="label">
             <property name="label">“Copy” will copy the selected data the clipboard, “Paste” will show the current clipboard contents. You can also drag the data to the bottom.</property>
             <property name="wrap">1</property>
             <property name="max-width-chars">40</property>
@@ -24,6 +27,9 @@
             <property name="spacing">12</property>
             <child>
               <object class="GtkDropDown" id="source_chooser">
+                <accessibility>
+                  <property name="label">Source Type</property>
+                </accessibility>
                 <property name="valign">center</property>
                 <property name="model">
                   <object class="GtkStringList">
@@ -54,6 +60,9 @@
                     <property name="name">Text</property>
                     <property name="child">
                       <object class="GtkEntry" id="source_text">
+                        <accessibility>
+                          <property name="label">Text Drag Source</property>
+                        </accessibility>
                         <property name="valign">center</property>
                         <signal name="notify::text" handler="text_changed_cb" object="copy_button"/>
                         <property name="text">Copy this!</property>
@@ -66,6 +75,9 @@
                     <property name="name">Color</property>
                     <property name="child">
                       <object class="GtkColorDialogButton" id="source_color">
+                        <accessibility>
+                          <property name="label">Color Drag Source</property>
+                        </accessibility>
                         <property name="dialog">
                           <object class="GtkColorDialog">
                           </object>
@@ -87,14 +99,17 @@
                         </style>
                         <child>
                           <object class="GtkToggleButton" id="image_rose">
+                            <accessibility>
+                              <property name="label">Photo Drag Source</property>
+                            </accessibility>
                             <property name="active">1</property>
                             <child>
-                              <object class="GtkDragSource">
-                                <signal name="prepare" handler="drag_prepare"/>
-                              </object>
                             </child>
                             <child>
                               <object class="GtkImage">
+                                <accessibility>
+                                  <property name="label">Portland Rose Photo</property>
+                                </accessibility>
                                 <style>
                                   <class name="large-icons"/>
                                 </style>
@@ -105,6 +120,9 @@
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="image_floppy">
+                            <accessibility>
+                              <property name="label">Icon Drag Source</property>
+                            </accessibility>
                             <property name="group">image_rose</property>
                             <child>
                               <object class="GtkDragSource">
@@ -113,6 +131,9 @@
                             </child>
                             <child>
                               <object class="GtkImage">
+                                <accessibility>
+                                  <property name="label">Floppy Buddy Icon</property>
+                                </accessibility>
                                 <style>
                                   <class name="large-icons"/>
                                 </style>
@@ -123,6 +144,9 @@
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="image_logo">
+                            <accessibility>
+                              <property name="label">SVG Drag Source</property>
+                            </accessibility>
                             <property name="group">image_floppy</property>
                             <child>
                               <object class="GtkDragSource">
@@ -131,6 +155,9 @@
                             </child>
                             <child>
                               <object class="GtkImage">
+                                <accessibility>
+                                  <property name="label">gtk-demo logo</property>
+                                </accessibility>
                                 <style>
                                   <class name="large-icons"/>
                                 </style>
@@ -148,6 +175,9 @@
                     <property name="name">File</property>
                     <property name="child">
                       <object class="GtkButton" id="source_file">
+                        <accessibility>
+                          <property name="label">File Drag Source</property>
+                        </accessibility>
                         <child>
                           <object class="GtkDragSource">
                             <property name="propagation-phase">capture</property>
@@ -172,6 +202,9 @@
                     <property name="name">Folder</property>
                     <property name="child">
                       <object class="GtkButton" id="source_folder">
+                        <accessibility>
+                          <property name="label">Folder Drag Source</property>
+                        </accessibility>
                         <child>
                           <object class="GtkDragSource">
                             <property name="propagation-phase">capture</property>
@@ -225,7 +258,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="paste_label">
                 <property name="xalign">0</property>
                 <binding name="label">
                   <lookup name="visible-child-name" type="GtkStack">
@@ -252,6 +285,9 @@
                     <property name="name">Text</property>
                     <property name="child">
                       <object class="GtkLabel">
+                        <accessibility>
+                          <relation name="labelled-by">paste_label</relation>
+                        </accessibility>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
                         <property name="xalign">0</property>
@@ -265,6 +301,9 @@
                     <property name="name">Image</property>
                     <property name="child">
                       <object class="GtkImage">
+                        <accessibility>
+                          <relation name="labelled-by">paste_label</relation>
+                        </accessibility>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
                         <style>
@@ -283,6 +322,9 @@
                         <property name="valign">center</property>
                         <child>
                           <object class="GtkColorSwatch">
+                            <accessibility>
+                              <relation name="labelled-by">paste_label</relation>
+                            </accessibility>
                             <property name="accessible-role">img</property>
                             <property name="can-focus">0</property>
                             <property name="selectable">0</property>
@@ -298,6 +340,9 @@
                     <property name="name">File</property>
                     <property name="child">
                       <object class="GtkLabel">
+                        <accessibility>
+                          <relation name="labelled-by">paste_label</relation>
+                        </accessibility>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
                         <property name="xalign">0</property>

demos/gtk-demo/css_basics.c

@@ -6,8 +6,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -49,20 +47,23 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1);
+  gtk_css_provider_load_from_string (provider, text);
   g_free (text);
 }
 
+static void
+clear_provider (gpointer data)
+{
+  GtkStyleProvider *provider = data;
+
+  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+}
+
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
 }
 
 GtkWidget *
@@ -81,6 +82,7 @@ do_css_basics (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       text = gtk_text_buffer_new (NULL);

demos/gtk-demo/css_basics.css

@@ -4,23 +4,24 @@
  * anymore. :)
  */
 
-/* This CSS resets all properties to their defaults values
- *    and overrides all user settings and the theme in use */
-@import url("resource://css_basics/reset.css");
+/* This resets all properties to their defaults values
+ * and overrides all user settings and the theme in use
+ */
+@import url("resource://css_shadows/reset.css");
 
 /* Set a very futuristic style by default */
-* {
+.demo * {
   color: green;
   font-family: Monospace;
   border: 1px solid;
 }
 
-window {
+window.demo {
   background-color: white;
 }
 
 /* Make sure selections are visible */
-selection {
+.demo selection {
   background-color: darkGreen;
   color: black;
 }

demos/gtk-demo/css_multiplebgs.c

@@ -6,8 +6,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -50,33 +48,23 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1);
+  gtk_css_provider_load_from_string (provider, text);
   g_free (text);
 }
 
 static void
-drawing_area_draw (GtkDrawingArea *da,
-                   cairo_t        *cr,
-                   int             width,
-                   int             height,
-                   gpointer        data)
+clear_provider (gpointer data)
 {
-  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (da));
+  GtkStyleProvider *provider = data;
 
-  gtk_render_background (context, cr, 0, 0, width, height);
-  gtk_render_frame (context, cr, 0, 0, width, height);
+  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
 }
 
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
 }
 
 GtkWidget *
@@ -95,16 +83,17 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       overlay = gtk_overlay_new ();
       gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       child = gtk_drawing_area_new ();
+      /* Don't set a draw_func, since we are only interested in CSS drawing,
+       * which happens automatically.
+       */
       gtk_widget_set_name (child, "canvas");
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
-                                      drawing_area_draw,
-                                      NULL, NULL);
       gtk_overlay_set_child (GTK_OVERLAY (overlay), child);
 
       child = gtk_button_new ();

demos/gtk-demo/css_pixbufs.c

@@ -7,8 +7,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -51,20 +49,23 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1);
+  gtk_css_provider_load_from_string (provider, text);
   g_free (text);
 }
 
+static void
+clear_provider (gpointer data)
+{
+  GtkStyleProvider *provider = data;
+
+  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+}
+
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
 }
 
 GtkWidget *
@@ -83,6 +84,7 @@ do_css_pixbufs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);

demos/gtk-demo/css_pixbufs.css

@@ -50,7 +50,7 @@
     100% { background-size: 12px, 96px, 12px, 96px, 12px, 96px, 12px, 96px, auto; }
 }
 
-window {
+window.demo {
     background-image: url("resource://css_pixbufs/images/apple-red.png"),
                       url("resource://css_pixbufs/images/gnome-applets.png"),
                       url("resource://css_pixbufs/images/gnome-calendar.png"),
@@ -66,11 +66,11 @@ window {
 }
 
 /* Make the text editor has a nice style */
-.view, scrollbar, separator {
+window.demo .view, scrollbar, separator {
   color: black;
   background-color: rgba(255,255,255,0.5);
 }
 
-.view:selected {
+window.demo .view:selected {
   background-color: rgba(127,127,255,0.5);
 }

demos/gtk-demo/css_shadows.c

@@ -5,8 +5,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -48,20 +46,23 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_data (provider, text, -1);
+  gtk_css_provider_load_from_string (provider, text);
   g_free (text);
 }
 
+static void
+clear_provider (gpointer data)
+{
+  GtkStyleProvider *provider = data;
+
+  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+}
+
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
-  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
+  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
 }
 
 static GtkWidget *
@@ -101,6 +102,7 @@ do_css_shadows (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Shadows");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -142,7 +144,7 @@ do_css_shadows (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_shadows.css

@@ -5,12 +5,13 @@
  */
 
 /* This CSS resets all properties to their defaults values
- *    and overrides all user settings and the theme in use */
+ * and overrides all user settings and the theme in use
+ */
 @import url("resource://css_shadows/reset.css");
 @import url("resource://css_shadows/cssview.css");
 
 /* Get a nice background for the window */
-.background {
+window.demo.background {
   background-color: #4870bc;
   background-image: linear-gradient(to left, transparent, rgba(255,255,255,.07) 50%, transparent 50%),
                     linear-gradient(to left, transparent, rgba(255,255,255,.13) 50%, transparent 50%),
@@ -19,7 +20,7 @@
   background-size: 29px, 59px, 73px, 109px;
 }
 
-button {
+window.demo button {
   color: black;
   padding: 10px;
   border-radius: 5px;
@@ -27,18 +28,15 @@ button {
   border: 1px transparent solid;
 }
 
-button:hover {
+window.demo button:hover {
   text-shadow: 3px 3px 5px alpha(black, 0.75);
   -gtk-icon-shadow: 3px 3px 5px alpha(black, 0.75);
   box-shadow: 3px 3px 5px alpha(black, 0.5) inset;
   border: solid 1px alpha(black, 0.75);
 }
 
-button:active {
+window.demo button:active {
   padding: 11px 9px 9px 11px;
   text-shadow: 1px 1px 2.5px alpha(black, 0.6);
   -gtk-icon-shadow: 1px 1px 2.5px alpha(black, 0.6);
 }
-
-
-

demos/gtk-demo/cssview.css

@@ -1,21 +1,21 @@
 /* Make the text editor has a nice style */
-.view {
+window.demo .view {
   color: #2e3436;
   font-family: Monospace;
   background-color: alpha(white, 0.30);
 }
 
-.view:selected {
+window.demo .view:selected {
   color: white;
   background-color: #4a90d9;
 }
 
-scrollbar trough,
+window.demo scrollbar trough,
 .scrollbars-junction {
   background-color: alpha(white, 0.80);
 }
 
-scrollbar slider {
+window.demo scrollbar slider {
   border-width: 3px;
   border-style: solid;
   border-radius: 10px;
@@ -24,11 +24,11 @@ scrollbar slider {
   background-color: #999;
 }
 
-scrollbar slider:hover {
+window.demo scrollbar slider:hover {
   background-color: #555;
 }
 
-paned separator {
+window.demo paned separator {
   background-color: alpha(white, 0.80);
   background-image: linear-gradient(transparent, transparent 1px, #999 1px, #999 4px, transparent 4px);
   background-size: 40px auto;
@@ -36,6 +36,6 @@ paned separator {
   background-position: center;
 }
 
-paned separator:hover {
+window.demo paned separator:hover {
   background-image: linear-gradient(transparent, transparent 1px, #555 1px, #555 4px, transparent 4px);
 }

demos/gtk-demo/demo.gresource.xml

@@ -127,6 +127,7 @@
     <file>fishbowl.ui</file>
     <file>gtkfishbowl.c</file>
     <file>gtkfishbowl.h</file>
+    <file>tiger.node</file>
   </gresource>
   <gresource prefix="/frames">
     <file>frames.ui</file>
@@ -335,6 +336,11 @@
     <file>paintable_symbolic.c</file>
     <file>panes.c</file>
     <file>password_entry.c</file>
+    <file>path_fill.c</file>
+    <file>path_maze.c</file>
+    <file>path_spinner.c</file>
+    <file>path_walk.c</file>
+    <file>path_text.c</file>
     <file>peg_solitaire.c</file>
     <file>pickers.c</file>
     <file>printing.c</file>
@@ -420,6 +426,13 @@
   <gresource prefix="/fontrendering">
     <file>fontrendering.ui</file>
   </gresource>
+  <gresource prefix="/path_walk">
+    <file>path_walk.ui</file>
+    <file compressed="true">path_world.txt</file>
+  </gresource>
+  <gresource prefix="/path_text">
+    <file>path_text.ui</file>
+  </gresource>
   <gresource prefix="/org/gtk/Demo4">
     <file>icons/16x16/actions/application-exit.png</file>
     <file>icons/16x16/actions/document-new.png</file>

demos/gtk-demo/demo.ui

@@ -208,7 +208,13 @@
           </object>
         </child>
         <child>
-          <object class="GtkStatusbar" id="statusbar1"/>
+          <object class="GtkLabel" id="statusbar1">
+            <property name="xalign">0</property>
+            <property name="margin-start">2</property>
+            <property name="margin-end">2</property>
+            <property name="margin-top">2</property>
+            <property name="margin-bottom">2</property>
+          </object>
         </child>
       </object>
     </child>

demos/gtk-demo/demo3widget.c

@@ -75,7 +75,9 @@ query_tooltip (GtkWidget  *widget,
   gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
 
   precision = 1;
+  s = NULL;
   do {
+    g_free (s);
     s = g_strdup_printf ("%.*f", precision, self->scale);
     l = strlen (s) - 1;
     while (s[l] == '0')
@@ -387,6 +389,8 @@ demo3_widget_class_init (Demo3WidgetClass *class)
   gtk_widget_class_set_template_from_resource (widget_class, "/menu/demo3widget.ui");
   gtk_widget_class_bind_template_child (widget_class, Demo3Widget, menu);
   gtk_widget_class_bind_template_callback (widget_class, pressed_cb);
+
+  gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_IMG);
 }
 
 GtkWidget *

demos/gtk-demo/demo3widget.ui

@@ -19,8 +19,14 @@
     </item>
   </menu>
   <template class="Demo3Widget">
+    <accessibility>
+      <property name="label">Demo image</property>
+    </accessibility>
     <child>
       <object class="GtkPopoverMenu" id="menu">
+        <accessibility>
+          <property name="label">Context menu</property>
+        </accessibility>
         <property name="has-arrow">0</property>
         <property name="menu-model">model</property>
       </object>

demos/gtk-demo/demotaggedentry.h

@@ -18,8 +18,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __DEMO_TAGGED_ENTRY_H__
-#define __DEMO_TAGGED_ENTRY_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -57,5 +56,3 @@ void            demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *
                                                             gboolean            has_close_button);
 
 G_END_DECLS
-
-#endif /* __DEMO_TAGGED_ENTRY_H__ */

demos/gtk-demo/demowidget.c

@@ -34,7 +34,7 @@ transition (GtkWidget     *widget,
 {
   DemoWidget *self = DEMO_WIDGET (widget);
   DemoLayout *demo_layout = DEMO_LAYOUT (gtk_widget_get_layout_manager (widget));
-  gint64 now = g_get_monotonic_time ();
+  gint64 now = gdk_frame_clock_get_frame_time (frame_clock);
 
   gtk_widget_queue_allocate (widget);
 
@@ -66,11 +66,13 @@ clicked (GtkGestureClick *gesture,
          gpointer         data)
 {
   DemoWidget *self = data;
+  GdkFrameClock *frame_clock;
 
   if (self->tick_id != 0)
     return;
 
-  self->start_time = g_get_monotonic_time ();
+  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (self));
+  self->start_time = gdk_frame_clock_get_frame_time (frame_clock);
   self->tick_id = gtk_widget_add_tick_callback (GTK_WIDGET (self), transition, NULL, NULL);
 }
 

demos/gtk-demo/dnd.c

@@ -162,27 +162,39 @@ click_done (GtkGesture *gesture)
     gtk_widget_insert_after (item, canvas, last_child);
 }
 
+/* GtkSettings treats `GTK_THEME=foo:dark` as theme name `foo`, variant `dark`,
+ * and our embedded CSS files let `foo-dark` work as an alias for `foo:dark`. */
+static gboolean
+has_dark_suffix (const char *theme)
+{
+  return g_str_has_suffix (theme, ":dark") ||
+         g_str_has_suffix (theme, "-dark");
+}
+
+/* So we can make a good guess whether the current theme is dark by checking for
+ * either: it is suffixed `[:-]dark`, or Settings:…prefer-dark-theme is TRUE. */
 static gboolean
 theme_is_dark (void)
 {
+  const char *env_theme;
   GtkSettings *settings;
   char *theme;
   gboolean prefer_dark;
   gboolean dark;
 
+  /* Like GtkSettings, 1st see if theme is overridden by environment variable */
+  env_theme = g_getenv ("GTK_THEME");
+  if (env_theme != NULL)
+    return has_dark_suffix (env_theme);
+
+  /* If not, test Settings:…theme-name in the same way OR :…prefer-dark-theme */
   settings = gtk_settings_get_default ();
   g_object_get (settings,
                 "gtk-theme-name", &theme,
                 "gtk-application-prefer-dark-theme", &prefer_dark,
                 NULL);
-
-  if ((strcmp (theme, "Adwaita") == 0 && prefer_dark) || strcmp (theme, "HighContrastInverse") == 0)
-    dark = TRUE;
-  else
-    dark = FALSE;
-
+  dark = prefer_dark || has_dark_suffix (theme);
   g_free (theme);
-
   return dark;
 }
 
@@ -748,9 +760,7 @@ do_dnd (GtkWidget *do_widget)
       GtkCssProvider *provider;
       GString *css;
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-      button = gtk_color_button_new ();
-G_GNUC_END_IGNORE_DEPRECATIONS
+      button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
       g_object_unref (g_object_ref_sink (button));
 
       provider = gtk_css_provider_new ();

demos/gtk-demo/drawingarea.c

@@ -334,11 +334,17 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_widget_set_vexpand (frame, TRUE);
       gtk_box_append (GTK_BOX (vbox), frame);
 
-      da = gtk_drawing_area_new ();
+      da = g_object_new (GTK_TYPE_DRAWING_AREA,
+                         "accessible-role", GTK_ACCESSIBLE_ROLE_IMG,
+                         NULL);
+      gtk_frame_set_child (GTK_FRAME (frame), da);
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (da),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                      -1);
+
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), groups_draw, NULL, NULL);
-      gtk_frame_set_child (GTK_FRAME (frame), da);
 
       /*
        * Create the scribble area
@@ -352,11 +358,17 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_widget_set_vexpand (frame, TRUE);
       gtk_box_append (GTK_BOX (vbox), frame);
 
-      da = gtk_drawing_area_new ();
+      da = g_object_new (GTK_TYPE_DRAWING_AREA,
+                         "accessible-role", GTK_ACCESSIBLE_ROLE_IMG,
+                         NULL);
+      gtk_frame_set_child (GTK_FRAME (frame), da);
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (da),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                      -1);
+
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), scribble_draw, NULL, NULL);
-      gtk_frame_set_child (GTK_FRAME (frame), da);
 
       g_signal_connect (da, "resize",
                         G_CALLBACK (scribble_resize), NULL);
@@ -372,7 +384,7 @@ do_drawingarea (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-      gtk_widget_set_visible (window, TRUE);
+      gtk_window_present (GTK_WINDOW (window));
   else
       gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/entry_completion.c

@@ -95,6 +95,13 @@ do_entry_completion (GtkWidget *do_widget)
       entry = gtk_entry_new ();
       gtk_box_append (GTK_BOX (vbox), entry);
 
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (entry),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                      -1);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
+                                      GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE, GTK_ACCESSIBLE_AUTOCOMPLETE_LIST,
+                                      -1);
+
       /* Create the completion object */
       completion = gtk_entry_completion_new ();
 

demos/gtk-demo/entry_undo.c

@@ -43,6 +43,10 @@ do_entry_undo (GtkWidget *do_widget)
       entry = gtk_entry_new ();
       gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
       gtk_box_append (GTK_BOX (vbox), entry);
+
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (entry),
+                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                      -1);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/errorstates.c

@@ -22,11 +22,15 @@ validate_more_details (GtkEntry   *entry,
     {
       gtk_widget_set_tooltip_text (GTK_WIDGET (entry), "Must have details first");
       gtk_widget_add_css_class (GTK_WIDGET (entry), "error");
+      gtk_accessible_update_state (GTK_ACCESSIBLE (entry),
+                                   GTK_ACCESSIBLE_STATE_INVALID, GTK_ACCESSIBLE_INVALID_TRUE,
+                                   -1);
     }
   else
     {
       gtk_widget_set_tooltip_text (GTK_WIDGET (entry), "");
       gtk_widget_remove_css_class (GTK_WIDGET (entry), "error");
+      gtk_accessible_reset_state (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_STATE_INVALID);
     }
 }
 
@@ -44,10 +48,18 @@ mode_switch_state_set (GtkSwitch *sw,
     {
       gtk_widget_set_visible (label, FALSE);
       gtk_switch_set_state (sw, state);
+      gtk_accessible_reset_relation (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE);
+      gtk_accessible_reset_state (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_STATE_INVALID);
     }
   else
     {
       gtk_widget_set_visible (label, TRUE);
+      gtk_accessible_update_relation (GTK_ACCESSIBLE (sw),
+                                      GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, label,
+                                      -1);
+      gtk_accessible_update_state (GTK_ACCESSIBLE (sw),
+                                   GTK_ACCESSIBLE_STATE_INVALID, GTK_ACCESSIBLE_INVALID_TRUE,
+                                   -1);
     }
 
   return TRUE;
@@ -73,6 +85,9 @@ level_scale_value_changed (GtkRange *range,
     {
       gtk_switch_set_state (GTK_SWITCH (sw), FALSE);
     }
+
+  gtk_accessible_reset_relation (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE);
+  gtk_accessible_reset_state (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_STATE_INVALID);
 }
 
 GtkWidget *

demos/gtk-demo/expander.c

@@ -10,8 +10,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *window = NULL;
 
 static void
@@ -45,21 +43,22 @@ do_expander (GtkWidget *do_widget)
   if (!window)
     {
       toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
-      window = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
-                                                   0,
-                                                   GTK_MESSAGE_ERROR,
-                                                   GTK_BUTTONS_CLOSE,
-                                                   "<big><b>%s</b></big>",
-                                                   "Something went wrong");
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (window),
-                                                "Here are some more details "
-                                                "but not the full story.");
-
-      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
-
-      label = gtk_widget_get_last_child (area);
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Expander");
+      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (toplevel));
+      area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+      gtk_widget_set_margin_start (area, 10);
+      gtk_widget_set_margin_end (area, 10);
+      gtk_widget_set_margin_top (area, 10);
+      gtk_widget_set_margin_bottom (area, 10);
+      gtk_window_set_child (GTK_WINDOW (window), area);
+      label = gtk_label_new ("<big><b>Something went wrong</b></big>");
+      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+      gtk_box_append (GTK_BOX (area), label);
+      label = gtk_label_new ("Here are some more details but not the full story");
       gtk_label_set_wrap (GTK_LABEL (label), FALSE);
       gtk_widget_set_vexpand (label, FALSE);
+      gtk_box_append (GTK_BOX (area), label);
 
       expander = gtk_expander_new ("Details:");
       gtk_widget_set_vexpand (expander, TRUE);
@@ -122,7 +121,7 @@ do_expander (GtkWidget *do_widget)
   }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/fishbowl.c

@@ -11,6 +11,9 @@
 #include "gtkgears.h"
 #include "gskshaderpaintable.h"
 
+#include "nodewidget.h"
+#include "graphwidget.h"
+
 const char *const css =
 ".blurred-button {"
 "  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
@@ -68,13 +71,11 @@ create_blurred_button (void)
   return w;
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static GtkWidget *
 create_font_button (void)
 {
-  return gtk_font_button_new ();
+  return gtk_font_dialog_button_new (gtk_font_dialog_new ());
 }
-G_GNUC_END_IGNORE_DEPRECATIONS
 
 static GtkWidget *
 create_level_bar (void)
@@ -203,6 +204,18 @@ create_menu_button (void)
   return w;
 }
 
+static GtkWidget *
+create_tiger (void)
+{
+  return node_widget_new ("/fishbowl/tiger.node");
+}
+
+static GtkWidget *
+create_graph (void)
+{
+  return graph_widget_new ();
+}
+
 static const struct {
   const char *name;
   GtkWidget * (*create_func) (void);
@@ -220,6 +233,8 @@ static const struct {
   { "Switch",     create_switch         },
   { "Menubutton", create_menu_button    },
   { "Shader",     create_cogs           },
+  { "Tiger",      create_tiger          },
+  { "Graph",      create_graph          },
 };
 
 static int selected_widget_type = -1;
@@ -310,11 +325,20 @@ do_fishbowl (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
+      GtkBuilderScope *scope;
       GtkWidget *bowl;
 
       g_type_ensure (GTK_TYPE_FISHBOWL);
 
-      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
+      scope = gtk_builder_cscope_new ();
+      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_prev_button_clicked_cb);
+      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_next_button_clicked_cb);
+      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_changes_toggled_cb);
+      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), format_header_cb);
+
+      builder = gtk_builder_new ();
+      gtk_builder_set_scope (builder, scope);
+      gtk_builder_add_from_resource (builder, "/fishbowl/fishbowl.ui", NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
@@ -326,6 +350,7 @@ do_fishbowl (GtkWidget *do_widget)
 
       gtk_widget_realize (window);
       g_object_unref (builder);
+      g_object_unref (scope);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/font_features.ui

@@ -59,6 +59,9 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkFontDialogButton" id="font">
+                        <accessibility>
+                          <property name="label">Font</property>
+                        </accessibility>
                         <property name="dialog">
                           <object class="GtkFontDialog">
                           </object>
@@ -73,7 +76,7 @@
                         <property name="column-spacing">10</property>
                         <property name="row-spacing">10</property>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="size_label">
                             <property name="label">Size</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -89,6 +92,9 @@
                             <property name="width-request">100</property>
                             <property name="valign">baseline</property>
                             <property name="adjustment">size_adjustment</property>
+                            <accessibility>
+                              <relation name="labelled-by">size_label</relation>
+                            </accessibility>
                             <layout>
                               <property name="column">1</property>
                               <property name="row">0</property>
@@ -101,6 +107,9 @@
                             <property name="max-width-chars">4</property>
                             <property name="hexpand">0</property>
                             <property name="valign">baseline</property>
+                            <accessibility>
+                              <relation name="labelled-by">size_label</relation>
+                            </accessibility>
                             <signal name="activate" handler="basic_entry_activated"
                                     object="size_adjustment" swapped="false"/>
                             <layout>
@@ -110,7 +119,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="letterspacing_label">
                             <property name="label">Letterspacing</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -126,6 +135,9 @@
                             <property name="width-request">100</property>
                             <property name="valign">baseline</property>
                             <property name="adjustment">letterspacing_adjustment</property>
+                            <accessibility>
+                              <relation name="labelled-by">letterspacing_label</relation>
+                            </accessibility>
                             <layout>
                               <property name="column">1</property>
                               <property name="row">1</property>
@@ -138,6 +150,9 @@
                             <property name="max-width-chars">4</property>
                             <property name="hexpand">0</property>
                             <property name="valign">baseline</property>
+                            <accessibility>
+                              <relation name="labelled-by">letterspacing_label</relation>
+                            </accessibility>
                             <signal name="activate" handler="basic_entry_activated"
                                     object="letterspacing_adjustment" swapped="false"/>
                             <layout>
@@ -147,7 +162,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="line_height_label">
                             <property name="label">Line Height</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -163,6 +178,9 @@
                             <property name="width-request">100</property>
                             <property name="valign">baseline</property>
                             <property name="adjustment">line_height_adjustment</property>
+                            <accessibility>
+                              <relation name="labelled-by">line_height_label</relation>
+                            </accessibility>
                             <layout>
                               <property name="column">1</property>
                               <property name="row">2</property>
@@ -175,6 +193,9 @@
                             <property name="max-width-chars">4</property>
                             <property name="hexpand">0</property>
                             <property name="valign">baseline</property>
+                            <accessibility>
+                              <relation name="labelled-by">line_height_label</relation>
+                            </accessibility>
                             <signal name="activate" handler="basic_entry_activated"
                                     object="line_height_adjustment" swapped="false"/>
                             <layout>
@@ -184,7 +205,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="foreground_label">
                             <property name="label">Foreground</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -202,6 +223,9 @@
                             </property>
                             <property name="valign">baseline</property>
                             <property name="rgba">black</property>
+                            <accessibility>
+                              <relation name="labelled-by">foreground_label</relation>
+                            </accessibility>
                             <signal name="notify::rgba" handler="color_set_cb"/>
                             <layout>
                               <property name="column">1</property>
@@ -210,7 +234,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="background_label">
                             <property name="label">Background</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -228,6 +252,9 @@
                             </property>
                             <property name="valign">baseline</property>
                             <property name="rgba">white</property>
+                            <accessibility>
+                              <relation name="labelled-by">background_label</relation>
+                            </accessibility>
                             <signal name="notify::rgba" handler="color_set_cb"/>
                             <layout>
                               <property name="column">1</property>
@@ -240,6 +267,9 @@
                             <property name="icon-name">object-flip-vertical-symbolic</property>
                             <property name="halign">start</property>
                             <property name="valign">center</property>
+                            <accessibility>
+                              <property name="label">Swap colors</property>
+                            </accessibility>
                             <style>
                               <class name="circular"/>
                             </style>
@@ -341,6 +371,9 @@
                             <property name="yalign">0</property>
                             <property name="valign">start</property>
                             <property name="selectable">1</property>
+                            <accessibility>
+                              <property name="label">Font example</property>
+                            </accessibility>
                           </object>
                         </property>
                       </object>
@@ -350,6 +383,9 @@
                         <property name="name">entry</property>
                         <property name="child">
                           <object class="GtkTextView" id="entry">
+                            <accessibility>
+                              <property name="label">Example text</property>
+                            </accessibility>
                             <property name="buffer">
                               <object class="GtkTextBuffer">
                                 <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
@@ -446,6 +482,9 @@
                     <property name="icon-name">document-edit-symbolic</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
+                    <accessibility>
+                      <property name="label">Edit text</property>
+                    </accessibility>
                     <signal name="clicked" handler="font_features_toggle_edit"/>
                   </object>
                 </child>

demos/gtk-demo/fontplane.h

@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_FONT_PLANE_H__
-#define __GTK_FONT_PLANE_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -60,5 +59,3 @@ GtkWidget * gtk_font_plane_new      (GtkAdjustment *width_adj,
                                      GtkAdjustment *weight_adj);
 
 G_END_DECLS
-
-#endif /* __GTK_FONT_PLANE_H__ */

demos/gtk-demo/fontrendering.c

@@ -306,7 +306,7 @@ retry:
   texture = gdk_texture_new_for_pixbuf (pixbuf2);
   gtk_picture_set_paintable (GTK_PICTURE (image), GDK_PAINTABLE (texture));
   g_object_unref (pixbuf2);
-  g_object_unref (pixbuf2);
+  g_object_unref (texture);
 }
 
 static gboolean fading = FALSE;

demos/gtk-demo/fontrendering.ui

@@ -39,7 +39,7 @@
             <property name="row-spacing">10</property>
             <property name="column-spacing">10</property>
             <child>
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="text_label">
                 <property name="margin-start">10</property>
                 <property name="label">Text</property>
                 <property name="xalign">1</property>
@@ -57,10 +57,13 @@
                 <layout>
                   <property name="column">2</property>
                 </layout>
+                <accessibility>
+                  <relation name="labelled-by">text_label</relation>
+                </accessibility>
               </object>
             </child>
             <child>
-              <object class="GtkLabel">
+              <object class="GtkLabel" id="font_label">
                 <property name="margin-start">10</property>
                 <property name="label">Font</property>
                 <property name="xalign">1</property>
@@ -75,6 +78,9 @@
             </child>
             <child>
               <object class="GtkFontDialogButton" id="font_button">
+                <accessibility>
+                  <relation name="labelled-by">font_label</relation>
+                </accessibility>
                 <property name="dialog">
                   <object class="GtkFontDialog">
                   </object>
@@ -186,6 +192,9 @@
                 <property name="icon-name">list-add-symbolic</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
+                <accessibility>
+                  <property name="label">Zoom in</property>
+                </accessibility>
                 <style>
                   <class name="circular"/>
                 </style>
@@ -211,6 +220,9 @@
                 <property name="icon-name">list-remove-symbolic</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
+                <accessibility>
+                  <property name="label">Zoom out</property>
+                </accessibility>
                 <style>
                   <class name="circular"/>
                 </style>
@@ -251,6 +263,9 @@
             <property name="vexpand">1</property>
             <child>
               <object class="GtkPicture" id="image">
+                <accessibility>
+                  <property name="label">Font rendering example</property>
+                </accessibility>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="can-shrink">0</property>

demos/gtk-demo/graphwidget.c

@@ -0,0 +1,153 @@
+#include "graphwidget.h"
+
+struct _GraphWidget
+{
+  GtkWidget parent_instance;
+
+  GskPath *path;
+  GskStroke *stroke;
+  GdkRGBA color;
+
+  guint tick_cb;
+  guint64 start_time;
+
+  double period;
+  double amplitude;
+};
+
+struct _GraphWidgetClass
+{
+  GtkWidgetClass parent_class;
+};
+
+G_DEFINE_TYPE (GraphWidget, graph_widget, GTK_TYPE_WIDGET)
+
+static void
+update_path (GraphWidget *self,
+             float        amplitude)
+{
+  graphene_point_t p[20];
+  GskPathBuilder *builder;
+
+  g_clear_pointer (&self->path, gsk_path_unref);
+
+  for (int i = 0; i < 20; i++)
+    {
+      p[i].x = 10 * i;
+      p[i].y = 50;
+
+      if (i % 4 == 1 || i % 4 == 2)
+        {
+          if (i % 8 < 4)
+            p[i].y += amplitude;
+          else
+            p[i].y -= amplitude;
+        }
+    }
+
+  builder = gsk_path_builder_new ();
+  gsk_path_builder_move_to (builder, p[0].x, p[0].y);
+
+  for (int i = 0; i < 20; i += 4)
+    gsk_path_builder_cubic_to (builder,
+                               p[i+1].x, p[i+1].y,
+                               p[i+2].x, p[i+2].y,
+                               p[i+3].x, p[i+3].y);
+
+  self->path = gsk_path_builder_free_to_path (builder);
+}
+
+static gboolean
+tick_cb (GtkWidget     *widget,
+         GdkFrameClock *frame_clock,
+         gpointer       user_data)
+{
+  GraphWidget *self = GRAPH_WIDGET (widget);
+  guint64 now;
+  double angle;
+
+  now = gdk_frame_clock_get_frame_time (frame_clock);
+
+  if (self->start_time == 0)
+    self->start_time = now;
+
+  angle = 360 * (now - self->start_time) / (double)(self->period * G_TIME_SPAN_MINUTE);
+  update_path (self, sin (angle) * self->amplitude);
+
+  gtk_widget_queue_draw (widget);
+
+  return G_SOURCE_CONTINUE;
+}
+
+static void
+graph_widget_init (GraphWidget *self)
+{
+  self->color.red = g_random_double_range (0, 1);
+  self->color.green = g_random_double_range (0, 1);
+  self->color.blue = g_random_double_range (0, 1);
+  self->color.alpha = 1;
+
+  self->period = g_random_double_range (0.5, 1);
+  self->amplitude = g_random_double_range (10, 25);
+
+  self->stroke = gsk_stroke_new (2);
+
+  update_path (self, 0);
+
+  self->start_time = 0;
+  self->tick_cb = gtk_widget_add_tick_callback (GTK_WIDGET (self), tick_cb, NULL, NULL);
+}
+
+static void
+graph_widget_dispose (GObject *object)
+{
+  GraphWidget *self = GRAPH_WIDGET (object);
+
+  g_clear_pointer (&self->path, gsk_path_unref);
+  gsk_stroke_free (self->stroke);
+
+  G_OBJECT_CLASS (graph_widget_parent_class)->dispose (object);
+}
+
+static void
+graph_widget_snapshot (GtkWidget   *widget,
+                      GtkSnapshot *snapshot)
+{
+  GraphWidget *self = GRAPH_WIDGET (widget);
+
+  gtk_snapshot_append_stroke (snapshot, self->path, self->stroke, &self->color);
+}
+
+static void
+graph_widget_measure (GtkWidget      *widget,
+                      GtkOrientation  orientation,
+                      int             for_size,
+                      int            *minimum,
+                      int            *natural,
+                      int            *minimum_baseline,
+                      int            *natural_baseline)
+{
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    *minimum = *natural = 200;
+  else
+    *minimum = *natural = 100;
+}
+
+
+static void
+graph_widget_class_init (GraphWidgetClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  object_class->dispose = graph_widget_dispose;
+
+  widget_class->snapshot = graph_widget_snapshot;
+  widget_class->measure = graph_widget_measure;
+}
+
+GtkWidget *
+graph_widget_new (void)
+{
+  return g_object_new (GRAPH_TYPE_WIDGET, NULL);
+}

demos/gtk-demo/graphwidget.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <gtk/gtk.h>
+
+#define GRAPH_TYPE_WIDGET (graph_widget_get_type ())
+G_DECLARE_FINAL_TYPE (GraphWidget, graph_widget, GRAPH, WIDGET, GtkWidget)
+
+GtkWidget * graph_widget_new       (void);

demos/gtk-demo/gskshaderpaintable.h

@@ -17,8 +17,7 @@
  * Authors: Matthias Clasen <mclasen@redhat.com>
  */
 
-#ifndef __GSK_SHADER_PAINTABLE_H__
-#define __GSK_SHADER_PAINTABLE_H__
+#pragma once
 
 #include <gdk/gdk.h>
 #include <gsk/gsk.h>
@@ -42,5 +41,3 @@ void             gsk_shader_paintable_update_time      (GskShaderPaintable *self
                                                         int                 time_idx,
                                                         gint64              frame_time);
 G_END_DECLS
-
-#endif /* __GSK_SHADER_PAINTABLE_H__ */

demos/gtk-demo/gtkfishbowl.h

@@ -15,8 +15,7 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_FISHBOWL_H__
-#define __GTK_FISHBOWL_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -65,5 +64,3 @@ void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
                                            GtkFishCreationFunc creation_func);
 
 G_END_DECLS
-
-#endif /* __GTK_FISHBOWL_H__ */

demos/gtk-demo/gtkgears.c

@@ -840,24 +840,24 @@ gtk_gears_unrealize (GtkWidget *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;
+  if (gtk_gl_area_get_error (glarea) == NULL)
+    {
+      /* Release the resources associated with OpenGL */
+      if (priv->gear_vbo[0] != 0)
+        glDeleteBuffers (1, &(priv->gear_vbo[0]));
 
-  /* 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[1] != 0)
-    glDeleteBuffers (1, &(priv->gear_vbo[1]));
+      if (priv->gear_vbo[2] != 0)
+        glDeleteBuffers (1, &(priv->gear_vbo[2]));
 
-  if (priv->gear_vbo[2] != 0)
-    glDeleteBuffers (1, &(priv->gear_vbo[2]));
+      if (priv->vao != 0)
+        glDeleteVertexArrays (1, &priv->vao);
 
-  if (priv->vao != 0)
-    glDeleteVertexArrays (1, &priv->vao);
-
-  if (priv->program != 0)
-    glDeleteProgram (priv->program);
+      if (priv->program != 0)
+        glDeleteProgram (priv->program);
+    }
 
   priv->ModelViewProjectionMatrix_location = 0;
   priv->NormalMatrix_location = 0;

demos/gtk-demo/gtkgears.h

@@ -1,5 +1,4 @@
-#ifndef __GTK_GEARS_H__
-#define __GTK_GEARS_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -44,5 +43,3 @@ void       gtk_gears_set_fps_label (GtkGears *gears,
 
 
 G_END_DECLS
-
-#endif /* __GTK_GEARS_H__ */

demos/gtk-demo/gtkshaderbin.h

@@ -1,5 +1,4 @@
-#ifndef __GTK_SHADER_BIN_H__
-#define __GTK_SHADER_BIN_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -19,5 +18,3 @@ void       gtk_shader_bin_set_child   (GtkShaderBin *self,
 GtkWidget *gtk_shader_bin_get_child   (GtkShaderBin *self);
 
 G_END_DECLS
-
-#endif /* __GTK_SHADER_BIN_H__ */

demos/gtk-demo/gtkshaderstack.h

@@ -1,5 +1,4 @@
-#ifndef __GTK_SHADER_STACK_H__
-#define __GTK_SHADER_STACK_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -19,5 +18,3 @@ void        gtk_shader_stack_set_active   (GtkShaderStack *self,
                                            int             index);
 
 G_END_DECLS
-
-#endif /* __GTK_SHADER_STACK_H__ */

demos/gtk-demo/gtkshadertoy.h

@@ -1,5 +1,4 @@
-#ifndef __GTK_SHADERTOY_H__
-#define __GTK_SHADERTOY_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -30,5 +29,3 @@ void        gtk_shadertoy_set_image_shader (GtkShadertoy *shadertoy,
                                             const char   *shader);
 
 G_END_DECLS
-
-#endif /* __GTK_SHADERTOY_H__ */

demos/gtk-demo/headerbar.c

@@ -18,6 +18,7 @@ do_headerbar (GtkWidget *do_widget)
   GtkWidget *header;
   GtkWidget *button;
   GtkWidget *box;
+  GtkWidget *content;
 
   if (!window)
     {
@@ -37,16 +38,26 @@ do_headerbar (GtkWidget *do_widget)
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_add_css_class (box, "linked");
       button = gtk_button_new_from_icon_name ("go-previous-symbolic");
+      gtk_widget_set_tooltip_text (button, "Back");
       gtk_box_append (GTK_BOX (box), button);
       button = gtk_button_new_from_icon_name ("go-next-symbolic");
+      gtk_widget_set_tooltip_text (button, "Forward");
       gtk_box_append (GTK_BOX (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), gtk_switch_new ());
+      button = gtk_switch_new ();
+      gtk_accessible_update_property (GTK_ACCESSIBLE (button),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Change something",
+                                      -1);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
 
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
 
-      gtk_window_set_child (GTK_WINDOW (window), gtk_text_view_new ());
+      content = gtk_text_view_new ();
+      gtk_accessible_update_property (GTK_ACCESSIBLE (content),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Content",
+                                      -1);
+      gtk_window_set_child (GTK_WINDOW (window), content);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/iconscroll.c

@@ -354,10 +354,18 @@ do_iconscroll (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
+      GtkBuilderScope *scope;
       GtkWidget *label;
       guint id;
 
-      builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
+      scope = gtk_builder_cscope_new ();
+      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), iconscroll_prev_clicked_cb);
+      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), iconscroll_next_clicked_cb);
+
+      builder = gtk_builder_new ();
+      gtk_builder_set_scope (builder, scope);
+
+      gtk_builder_add_from_resource (builder, "/iconscroll/iconscroll.ui", NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
       gtk_window_set_display (GTK_WINDOW (window),
@@ -375,6 +383,7 @@ do_iconscroll (GtkWidget *do_widget)
                               GUINT_TO_POINTER (id), remove_timeout);
 
       g_object_unref (builder);
+      g_object_unref (scope);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/image_scaling.c

@@ -164,12 +164,18 @@ do_image_scaling (GtkWidget *do_widget)
       scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, -10., 10., 0.1);
       gtk_scale_add_mark (GTK_SCALE (scale), 0., GTK_POS_TOP, NULL);
       gtk_widget_set_tooltip_text (scale, "Zoom");
+      gtk_accessible_update_property (GTK_ACCESSIBLE (scale),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Zoom",
+                                      -1);
       gtk_range_set_value (GTK_RANGE (scale), 0.);
       gtk_widget_set_hexpand (scale, TRUE);
       gtk_box_append (GTK_BOX (box2), scale);
 
       dropdown = gtk_drop_down_new (G_LIST_MODEL (gtk_string_list_new ((const char *[]){ "Linear", "Nearest", "Trilinear", NULL })), NULL);
       gtk_widget_set_tooltip_text (dropdown, "Filter");
+      gtk_accessible_update_property (GTK_ACCESSIBLE (dropdown),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Filter",
+                                      -1);
       gtk_box_append (GTK_BOX (box2), dropdown);
 
       g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);

demos/gtk-demo/language-names.h

@@ -1,5 +1,4 @@
-#ifndef LANGUAGE_NAMES_H
-#define LANGUAGE_NAMES_H
+#pragma once
 
 #include <pango/pango.h>
 
@@ -9,5 +8,3 @@ const char * get_language_name (PangoLanguage *language);
 const char * get_language_name_for_tag (guint32 tag);
 
 G_END_DECLS
-
-#endif

demos/gtk-demo/listbox_controls.ui

@@ -49,6 +49,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="hexpand">1</property>
+                                <property name="mnemonic-widget">switch</property>
                               </object>
                             </child>
                             <child>
@@ -73,6 +74,7 @@
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="hexpand">1</property>
+                                <property name="mnemonic-widget">check</property>
                               </object>
                             </child>
                             <child>
@@ -110,6 +112,7 @@
                                 <property name="margin-start">10</property>
                                 <property name="margin-end">10</property>
                                 <property name="opacity">0</property>
+                                <property name="accessible-role">status</property>
                               </object>
                             </child>
                           </object>
@@ -150,10 +153,11 @@
                                   <property name="halign">start</property>
                                   <property name="valign">center</property>
                                   <property name="hexpand">1</property>
+                                  <property name="mnemonic-widget">scale</property>
                                 </object>
                               </child>
                               <child>
-                                <object class="GtkScale">
+                                <object class="GtkScale" id="scale">
                                   <property name="halign">end</property>
                                   <property name="valign">center</property>
                                   <property name="draw-value">0</property>
@@ -185,10 +189,11 @@
                                   <property name="halign">start</property>
                                   <property name="valign">center</property>
                                   <property name="hexpand">1</property>
+                                  <property name="mnemonic-widget">spin</property>
                                 </object>
                               </child>
                               <child>
-                                <object class="GtkSpinButton">
+                                <object class="GtkSpinButton" id="spin">
                                   <property name="halign">end</property>
                                   <property name="valign">center</property>
                                   <property name="adjustment">
@@ -217,10 +222,11 @@
                                   <property name="halign">start</property>
                                   <property name="valign">center</property>
                                   <property name="hexpand">1</property>
+                                  <property name="mnemonic-widget">dropdown</property>
                                 </object>
                               </child>
                               <child>
-                                <object class="GtkDropDown">
+                                <object class="GtkDropDown" id="dropdown">
                                   <property name="halign">end</property>
                                   <property name="valign">center</property>
                                   <property name="model">
@@ -252,10 +258,11 @@
                                   <property name="halign">start</property>
                                   <property name="valign">center</property>
                                   <property name="hexpand">1</property>
+                                  <property name="mnemonic-widget">entry</property>
                                 </object>
                               </child>
                               <child>
-                                <object class="GtkEntry">
+                                <object class="GtkEntry" id="entry">
                                   <property name="halign">end</property>
                                   <property name="valign">center</property>
                                   <property name="placeholder-text">Type here…</property>

demos/gtk-demo/listview_applauncher.c

@@ -52,6 +52,10 @@ setup_listitem_cb (GtkListItemFactory *factory,
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   image = gtk_image_new ();
+  gtk_accessible_update_property (GTK_ACCESSIBLE (image),
+                                  GTK_ACCESSIBLE_PROPERTY_LABEL,
+                                  "App icon",
+                                  -1);
   gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
   gtk_box_append (GTK_BOX (box), image);
   label = gtk_label_new ("");
@@ -79,6 +83,7 @@ bind_listitem_cb (GtkListItemFactory *factory,
 
   gtk_image_set_from_gicon (GTK_IMAGE (image), g_app_info_get_icon (app_info));
   gtk_label_set_label (GTK_LABEL (label), g_app_info_get_display_name (app_info));
+  gtk_list_item_set_accessible_label (list_item, g_app_info_get_display_name (app_info));
 }
 
 /* In more complex code, we would also need functions to unbind and teardown

demos/gtk-demo/listview_clocks.c

@@ -431,6 +431,9 @@ setup_listitem_cb (GtkListItemFactory *factory,
   picture = gtk_picture_new ();
   gtk_expression_bind (expression, picture, "paintable", picture);
   gtk_box_append (GTK_BOX (box), picture);
+  gtk_accessible_update_relation (GTK_ACCESSIBLE (picture),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, location_label, NULL,
+                                  -1);
 
 
   /* And finally, everything comes together.
@@ -487,6 +490,9 @@ do_listview_clocks (GtkWidget *do_widget)
 
       model = GTK_SELECTION_MODEL (gtk_no_selection_new (create_clocks_model ()));
       gridview = gtk_grid_view_new (model, factory);
+      gtk_accessible_update_property (GTK_ACCESSIBLE (gridview),
+                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Clocks",
+                                      -1);
       gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
       gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
 

demos/gtk-demo/listview_selections.c

@@ -368,6 +368,38 @@ match_func (MatchObject *obj,
   g_free (tmp2);
 }
 
+static void
+setup_header (GtkSignalListItemFactory *factory,
+              GObject                  *list_item,
+              gpointer                  data)
+{
+  GtkListHeader *self = GTK_LIST_HEADER (list_item);
+  GtkWidget *child;
+
+  child = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (child), 0);
+  gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
+  gtk_widget_set_margin_top (child, 10);
+  gtk_widget_set_margin_bottom (child, 10);
+
+  gtk_list_header_set_child (self, child);
+}
+
+static void
+bind_header (GtkSignalListItemFactory *factory,
+             GObject                  *list_item,
+             gpointer                  data)
+{
+  GtkListHeader *self = GTK_LIST_HEADER (list_item);
+  GtkWidget *child = gtk_list_header_get_child (self);
+  GObject *item = gtk_list_header_get_item (self);
+
+  if (strstr (gtk_string_object_get_string (GTK_STRING_OBJECT (item)), "hour"))
+    gtk_label_set_label (GTK_LABEL (child), "<big><b>Hours</b></big>");
+  else
+    gtk_label_set_label (GTK_LABEL (child), "<big><b>Minutes</b></big>");
+}
+
 GtkWidget *
 do_listview_selections (GtkWidget *do_widget)
 {
@@ -377,10 +409,12 @@ do_listview_selections (GtkWidget *do_widget)
   GtkExpression *expression;
   GtkListItemFactory *factory;
   const char * const times[] = { "1 minute", "2 minutes", "5 minutes", "20 minutes", NULL };
-  const char * const many_times[] = {
+  const char * const minutes[] = {
     "1 minute", "2 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes",
     "25 minutes", "30 minutes", "35 minutes", "40 minutes", "45 minutes", "50 minutes",
-    "55 minutes", "1 hour", "2 hours", "3 hours", "5 hours", "6 hours", "7 hours",
+    "55 minutes", NULL
+  };
+  const char * const hours[] = { "1 hour", "2 hours", "3 hours", "5 hours", "6 hours", "7 hours",
     "8 hours", "9 hours", "10 hours", "11 hours", "12 hours", NULL
   };
   const char * const device_titles[] = { "Digital Output", "Headphones", "Digital Output", "Analog Output", NULL };
@@ -395,6 +429,10 @@ do_listview_selections (GtkWidget *do_widget)
 
   if (!window)
     {
+      GtkStringList *minutes_model, *hours_model;
+      GListStore *store;
+      GtkFlattenListModel *flat;
+
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
@@ -422,14 +460,25 @@ do_listview_selections (GtkWidget *do_widget)
       gtk_box_append (GTK_BOX (box), button);
 
       /* A dropdown using an expression to obtain strings */
-      button = drop_down_new_from_strings (many_times, NULL, NULL);
-      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
+      minutes_model = gtk_string_list_new (minutes);
+      hours_model = gtk_string_list_new (hours);
+      store = g_list_store_new (G_TYPE_LIST_MODEL);
+      g_list_store_append (store, minutes_model);
+      g_list_store_append (store, hours_model);
+      g_object_unref (minutes_model);
+      g_object_unref (hours_model);
+      flat = gtk_flatten_list_model_new (G_LIST_MODEL (store));
       expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
                                                 0, NULL,
                                                 (GCallback)get_title,
                                                 NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
-      gtk_expression_unref (expression);
+      button = gtk_drop_down_new (G_LIST_MODEL (flat), expression);
+      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
+      factory = gtk_signal_list_item_factory_new ();
+      g_signal_connect (factory, "setup", G_CALLBACK (setup_header), NULL);
+      g_signal_connect (factory, "bind", G_CALLBACK (bind_header), NULL);
+      gtk_drop_down_set_header_factory (GTK_DROP_DOWN (button), factory);
+      g_object_unref (factory);
       gtk_box_append (GTK_BOX (box), button);
 
       button = gtk_drop_down_new (NULL, NULL);

demos/gtk-demo/main-listitem.ui

@@ -10,6 +10,8 @@
         <property name="child">
           <object class="GtkInscription">
             <property name="hexpand">1</property>
+            <property name="nat-chars">25</property>
+            <property name="text-overflow">ellipsize-end</property>
             <binding name="text">
               <lookup name="title" type="GtkDemo">
                 <lookup name="item">expander</lookup>

demos/gtk-demo/main.c

@@ -18,7 +18,6 @@
 #include <string.h>
 
 #include "config.h"
-
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
@@ -268,9 +267,9 @@ activate_run (GSimpleAction *action,
 }
 
 static GtkWidget *
-display_image (const char  *format,
-               const char  *resource,
-               char       **label)
+display_image (const char *format,
+               const char *resource,
+               GtkWidget  *label)
 {
   GtkWidget *sw, *image;
 
@@ -280,13 +279,17 @@ display_image (const char  *format,
   sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), image);
 
+  gtk_accessible_update_relation (GTK_ACCESSIBLE (image),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                  -1);
+
   return sw;
 }
 
 static GtkWidget *
-display_images (const char  *format,
-                const char  *resource_dir,
-                char       **label)
+display_images (const char *format,
+                const char *resource_dir,
+                GtkWidget  *label)
 {
   char **resources;
   GtkWidget *grid;
@@ -311,13 +314,15 @@ display_images (const char  *format,
     {
       char *resource_name;
       GtkWidget *box;
+      GtkWidget *image_label;
 
       resource_name = g_strconcat (resource_dir, "/", resources[i], NULL);
 
-      widget = display_image (NULL, resource_name, NULL);
+      image_label = gtk_label_new (resources[i]);
+      widget = display_image (NULL, resource_name, image_label);
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_box_append (GTK_BOX (box), widget);
-      gtk_box_append (GTK_BOX (box), gtk_label_new (resources[i]));
+      gtk_box_append (GTK_BOX (box), image_label);
       gtk_flow_box_insert (GTK_FLOW_BOX (grid), box, -1);
 
       g_free (resource_name);
@@ -325,15 +330,19 @@ display_images (const char  *format,
 
   g_strfreev (resources);
 
-  *label = g_strdup ("Images");
+  gtk_label_set_label (GTK_LABEL (label), "Images");
+
+  gtk_accessible_update_relation (GTK_ACCESSIBLE (grid),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                  -1);
 
   return sw;
 }
 
 static GtkWidget *
-display_text (const char  *format,
-              const char  *resource,
-              char       **label)
+display_text (const char *format,
+              const char *resource,
+              GtkWidget  *label)
 {
   GtkTextBuffer *buffer;
   GtkWidget *textview, *sw;
@@ -368,6 +377,10 @@ display_text (const char  *format,
 
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
 
+  gtk_accessible_update_relation (GTK_ACCESSIBLE (textview),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                  -1);
+
   sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
@@ -378,15 +391,19 @@ display_text (const char  *format,
 }
 
 static GtkWidget *
-display_video (const char  *format,
-               const char  *resource,
-               char       **label)
+display_video (const char *format,
+               const char *resource,
+               GtkWidget  *label)
 {
   GtkWidget *video;
 
   video = gtk_video_new_for_resource (resource);
   gtk_video_set_loop (GTK_VIDEO (video), TRUE);
 
+  gtk_accessible_update_relation (GTK_ACCESSIBLE (video),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
+                                  -1);
+
   return video;
 }
 
@@ -408,9 +425,9 @@ display_nothing (const char *resource)
 static struct {
   const char *extension;
   const char *format;
-  GtkWidget * (* display_func) (const char  *format,
-                                const char  *resource,
-                                char       **label);
+  GtkWidget * (* display_func) (const char *format,
+                                const char *resource,
+                                GtkWidget  *label);
 } display_funcs[] = {
   { ".gif", NULL, display_image },
   { ".jpg", NULL, display_image },
@@ -433,7 +450,6 @@ add_data_tab (const char *demoname)
   char **resources;
   GtkWidget *widget, *label;
   guint i, j;
-  char *label_string;
 
   resource_dir = g_strconcat ("/", demoname, NULL);
   resources = g_resources_enumerate_children (resource_dir, 0, NULL);
@@ -453,23 +469,21 @@ add_data_tab (const char *demoname)
             break;
         }
 
-      label_string = NULL;
+      label = gtk_label_new (resources[i]);
 
       if (j < G_N_ELEMENTS (display_funcs))
         widget = display_funcs[j].display_func (display_funcs[j].format,
                                                 resource_name,
-                                                &label_string);
+                                                label);
       else
         widget = display_nothing (resource_name);
 
-      label = gtk_label_new (label_string ? label_string : resources[i]);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
       g_object_set (gtk_notebook_get_page (GTK_NOTEBOOK (notebook), widget),
                     "tab-expand", FALSE,
                     NULL);
 
       g_free (resource_name);
-      g_free (label_string);
     }
 
   g_strfreev (resources);

demos/gtk-demo/main.ui

@@ -57,14 +57,17 @@
       <object class="GtkBox">
         <child>
           <object class="GtkBox">
-            <property name="width-request">220</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkSearchBar" id="searchbar">
+                <accessibility>
+                  <relation name="labelled-by">search-entry</relation>
+                </accessibility>
                 <property name="key-capture-widget">window</property>
                 <child>
                   <object class="GtkSearchEntry" id="search-entry">
                     <accessibility>
+                      <property name="label" translatable="yes">Search</property>
                       <relation name="controls">listview</relation>
                     </accessibility>
                   </object>
@@ -76,15 +79,15 @@
                 <style>
                   <class name="sidebar"/>
                 </style>
-                <property name="width-request">120</property>
                 <property name="hscrollbar-policy">never</property>
-                <property name="min-content-width">150</property>
+                <property name="propagate-natural-width">1</property>
                 <property name="vexpand">1</property>
                 <child>
                   <object class="GtkListView" id="listview">
                     <style>
                       <class name="navigation-sidebar"/>
                     </style>
+                    <property name="tab-behavior">item</property>
                     <property name="factory">
                       <object class="GtkBuilderListItemFactory">
                         <property name="resource">/ui/main-listitem.ui</property>

demos/gtk-demo/meson.build

@@ -72,6 +72,11 @@ demos = files([
   'paintable_symbolic.c',
   'panes.c',
   'password_entry.c',
+  'path_fill.c',
+  'path_maze.c',
+  'path_spinner.c',
+  'path_walk.c',
+  'path_text.c',
   'peg_solitaire.c',
   'pickers.c',
   'printing.c',
@@ -136,6 +141,8 @@ extra_demo_sources = files([
   'unicode-names.c',
   'suggestionentry.c',
   'language-names.c',
+  'nodewidget.c',
+  'graphwidget.c',
 ])
 
 if os_unix
@@ -150,25 +157,13 @@ if librsvg_dep.found()
   gtkdemo_deps += [ librsvg_dep ]
 endif
 
-gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]
-
 demos_h = custom_target('gtk4 demo header',
   output: 'demos.h',
   input: demos,
   command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ],
 )
 
-objcopy_supports_add_symbol = false
-objcopy = find_program('objcopy', required : false)
-if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
-endif
-
-ld = find_program('ld', required : false)
-
-if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
-  glib_compile_resources = find_program('glib-compile-resources')
-
+if can_use_objcopy_for_resources
   # Create the resource blob
   gtkdemo_gresource = custom_target('gtkdemo.gresource',
       input : 'demo.gresource.xml',
@@ -216,6 +211,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
     output : 'gtkdemo_resources2.o',
     command : [objcopy,
                  '--strip-all',
+                 '--set-section-alignment', '.data=8',
                  '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
                  '@INPUT@',
                  '@OUTPUT@'])
@@ -244,7 +240,7 @@ gtkdemo_deps += [ demo_conf_h ]
 
 executable('gtk4-demo',
   sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
-  c_args: gtkdemo_args + demo_cflags,
+  c_args: demo_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
   win_subsystem: 'windows',
@@ -254,7 +250,7 @@ executable('gtk4-demo',
 
 executable('gtk4-demo-application',
   sources: ['application.c', gtkdemo_resources],
-  c_args: gtkdemo_args + common_cflags,
+  c_args: common_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
   win_subsystem: 'windows',

demos/gtk-demo/nodewidget.c

@@ -0,0 +1,76 @@
+#include "nodewidget.h"
+
+struct _NodeWidget
+{
+  GtkWidget parent_instance;
+
+  GskRenderNode *node;
+};
+
+struct _NodeWidgetClass
+{
+  GtkWidgetClass parent_class;
+};
+
+G_DEFINE_TYPE (NodeWidget, node_widget, GTK_TYPE_WIDGET)
+
+static void
+node_widget_init (NodeWidget *self)
+{
+}
+
+static void
+node_widget_dispose (GObject *object)
+{
+  NodeWidget *self = NODE_WIDGET (object);
+
+  gsk_render_node_unref (self->node);
+
+  G_OBJECT_CLASS (node_widget_parent_class)->dispose (object);
+}
+
+static void
+node_widget_snapshot (GtkWidget   *widget,
+                      GtkSnapshot *snapshot)
+{
+  NodeWidget *self = NODE_WIDGET (widget);
+
+  gtk_snapshot_append_node (snapshot, self->node);
+}
+
+static void
+node_widget_class_init (NodeWidgetClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  object_class->dispose = node_widget_dispose;
+
+  widget_class->snapshot = node_widget_snapshot;
+}
+
+GtkWidget *
+node_widget_new (const char *resource)
+{
+  NodeWidget *self;
+  GBytes *bytes;
+  GskRenderNode *node;
+  graphene_rect_t bounds;
+  float scale;
+  GskTransform *transform;
+
+  self = g_object_new (NODE_TYPE_WIDGET, NULL);
+
+  bytes = g_resources_lookup_data (resource, 0, NULL);
+  node = gsk_render_node_deserialize (bytes, NULL, NULL);
+  g_bytes_unref (bytes);
+
+  gsk_render_node_get_bounds (node, &bounds);
+  scale = MIN (100.0/bounds.size.width, 100.0/bounds.size.height);
+  transform = gsk_transform_scale (NULL, scale, scale);
+  self->node = gsk_transform_node_new (node, transform);
+  gsk_transform_unref (transform);
+  gsk_render_node_unref (node);
+
+  return GTK_WIDGET (self);
+}

demos/gtk-demo/nodewidget.h

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <gtk/gtk.h>
+
+#define NODE_TYPE_WIDGET (node_widget_get_type ())
+G_DECLARE_FINAL_TYPE (NodeWidget, node_widget, NODE, WIDGET, GtkWidget)
+
+GtkWidget * node_widget_new       (const char *file);

demos/gtk-demo/paint.c

@@ -7,8 +7,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 enum {
   COLOR_SET,
   N_SIGNALS
@@ -124,19 +122,16 @@ drawing_area_unmap (GtkWidget *widget)
 
 static void
 drawing_area_snapshot (GtkWidget   *widget,
-		       GtkSnapshot *snapshot)
+                       GtkSnapshot *snapshot)
 {
   DrawingArea *area = (DrawingArea *) widget;
-  GtkAllocation allocation;
+  int width, height;
   cairo_t *cr;
 
-  gtk_widget_get_allocation (widget, &allocation);
-  cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT (
-                                    0, 0,
-				    allocation.width,
-				    allocation.height
-                                  ));
+  width = gtk_widget_get_width (widget);
+  height = gtk_widget_get_height (widget);
+
+  cr = gtk_snapshot_append_cairo (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
 
   cairo_set_source_rgb (cr, 1, 1, 1);
   cairo_paint (cr);
@@ -145,7 +140,7 @@ drawing_area_snapshot (GtkWidget   *widget,
   cairo_paint (cr);
 
   cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
+  cairo_rectangle (cr, 0, 0, width, height);
   cairo_stroke (cr);
 
   cairo_destroy (cr);

demos/gtk-demo/paintable.h

@@ -1,5 +1,4 @@
-#ifndef __PAINTABLE_H__
-#define __PAINTABLE_H__
+#pragma once
 
 #include <gtk/gtk.h>
 
@@ -13,5 +12,3 @@ void            gtk_nuclear_snapshot           (GtkSnapshot     *snapshot,
 GdkPaintable *  gtk_nuclear_icon_new            (double          rotation);
 GdkPaintable *  gtk_nuclear_animation_new       (gboolean        draw_background);
 GtkMediaStream *gtk_nuclear_media_stream_new    (void);
-
-#endif /* __PAINTABLE_H__ */