alertdialog: Add a cancellable argument

Allow passing a cancellable to gtk_alert_dialog_show.

.gitignore

@@ -1,2 +1 @@
 /subprojects/*/
-.flatpak-builder/

.gitlab-ci.yml

@@ -22,44 +22,40 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false -Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false -Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false -Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false -Dharfbuzz:werror=false -Dfreetype2:werror=false -Dfontconfig:werror=false -Dfribidi:werror=false -Dlibffi:werror=false -Dlibjpeg-turbo:werror=false -Dmutest:werror=false -Dpixman:werror=false -Dproxy-libintl:werror=false"
+  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false -Dwayland:werror=false"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true"
+  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=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:v38"
+  FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
 
-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
-default:
-  retry:
-    max: 2
-    when:
-      - 'runner_system_failure'
-      - 'stuck_or_timeout_failure'
-      - 'scheduler_failure'
-      - 'api_failure'
-  interruptible: true
+.only-default:
+  only:
+    - branches
+  except:
+    - tags
 
 style-check-diff:
+  extends: .only-default
   image: $FEDORA_IMAGE
   stage: check
-  when: manual
+  allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
+  extends: .only-default
   image: $FEDORA_IMAGE
   artifacts:
     when: always
     reports:
       junit:
         - "${CI_PROJECT_DIR}/_build/report-x11.xml"
+        - "${CI_PROJECT_DIR}/_build/report-x11_unstable.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_gles.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland_unstable.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
+        - "${CI_PROJECT_DIR}/_build/report-broadway_unstable.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
@@ -70,12 +66,16 @@ style-check-diff:
       - "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
       - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
       - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
-      - "${CI_PROJECT_DIR}/_build/testsuite/headless/*/*.log"
       - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
   cache:
     key: "$CI_JOB_NAME"
     paths:
       - _ccache/
+      - subprojects/gdk-pixbuf/
+      - subprojects/glib/
+      - subprojects/graphene/
+      - subprojects/libepoxy/
+      - subprojects/pango/
 
 fedora-x86_64:
   extends: .build-fedora-default
@@ -85,18 +85,19 @@ fedora-x86_64:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - meson subprojects download
-    - meson subprojects update --reset
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
+    - meson subprojects update
+    - mkdir _install
+    - meson --prefix=${CI_PROJECT_DIR}/_install
+            ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
+    - meson install -C _build
+    - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
+    - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
+    - .gitlab-ci/run-tests.sh _build x11
     - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
+    - .gitlab-ci/run-tests.sh _build waylandgles
+    - .gitlab-ci/run-tests.sh _build broadway
 
 release-build:
   extends: .build-fedora-default
@@ -106,43 +107,12 @@ release-build:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - meson subprojects download
-    - meson subprojects update --reset
-    - mkdir _install
-    - meson setup
-            --prefix=${CI_PROJECT_DIR}/_install
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
+    - meson subprojects update
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
-    - meson compile -C _build
-    - meson install -C _build
-    - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
-    - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
+    - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11
 
-fedora-clang:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release"
-  script:
-    - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - export CC=clang
-    - meson subprojects download
-    - meson subprojects update --reset
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
-            _build
-    - meson compile -C _build
-
 fedora-mingw64:
   extends: .build-fedora-default
   stage: build
@@ -161,14 +131,37 @@ fedora-mingw64:
             # mingw64-graphene (rawhide)
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - pip3 install --user meson~=1.0
-    - meson subprojects download
-    - meson subprojects update --reset
-    - meson -Dintrospection=disabled -Dgraphene:introspection=disabled _build
-    - meson compile -C _build
+    - meson subprojects update
+    - mkdir _build && cd _build
+    - mingw64-meson -Dintrospection=disabled -Dgraphene:introspection=disabled
+    - ninja
+
+installed-tests:
+  extends: .build-fedora-default
+  stage: build
+  needs: []
+  variables:
+    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
+    G_TEST_ACCESSIBLE: 1
+  script:
+    - .gitlab-ci/show-info-linux.sh
+    - meson subprojects update
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+            _build
+    - ninja -C _build
+    - sudo ninja -C _build install
+    - dbus-run-session xvfb-run -a -s "-screen 0 1024x768x24"
+            gnome-desktop-testing-runner
+                   --report-directory=_build/installed-tests-report/failed/
+                   --parallel=0
+                   gtk-4.0
+  artifacts:
+    paths:
+      - "_build/installed-tests-report/"
+
 
 .mingw-defaults:
+  extends: .only-default
   stage: build
   tags:
     - win32-ps
@@ -198,23 +191,21 @@ msys2-mingw64:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
 macos:
-  # Sadly, this fails regularly, and its failure is never enlightening
-  allow_failure: true
-  rules:
-    - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  extends: .only-default
+  only:
+    - branches@GNOME/gtk
   stage: build
   tags:
     - macos
   needs: []
   before_script:
     - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson~=1.0
+    - pip3 install --user meson==0.60.3
     - pip3 install --user ninja
     - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
     - export MESON_FORCE_BACKTRACE=1
   script:
-    - meson setup ${COMMON_MESON_FLAGS}
-            -Dx11-backend=false
+    - meson -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
             -Dmedia-gstreamer=disabled
@@ -222,21 +213,18 @@ macos:
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled
-            -Ddemos=false
-            -Dbuild-tests=false
-            -Dbuild-examples=false
-            -Dbuild-testsuite=false
             _build
-    - meson compile -C _build
+    - ninja -C _build
   artifacts:
     when: always
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 vs2017-x64:
+  extends: .only-default
   # TODO: Uncomment this when ready to merge.
-  # rules:
-  #   - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  #only:
+  #  - branches@GNOME/gtk
   stage: build
   tags:
     - win32-ps
@@ -249,7 +237,7 @@ vs2017-x64:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 .flatpak-defaults:
-  image: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
+  image: $FLATPAK_IMAGE
   stage: flatpak
   allow_failure: true
   tags:
@@ -259,67 +247,65 @@ vs2017-x64:
       - "${APPID}-dev.flatpak"
       - 'repo.tar'
     expire_in: 1 day
-  rules:
-    # Only build Flatpak bundles automatically on main
-    - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_BRANCH != "main"
-      when: "manual"
   script:
     - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
 
-flatpak:demo:
-  extends: '.flatpak-defaults'
+# Manual jobs, for branches and MRs
+.flatpak-manual:
+  extends: .flatpak-defaults
+  when: manual
+
+# Only build Flatpak bundles automatically on main
+.flatpak-main:
+  extends: .flatpak-defaults
+  only:
+    - main
+
+flatpak-manual:demo:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.Demo4
 
-flatpak:demo:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:demo:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.Demo4
 
-flatpak:widget-factory:
-  extends: '.flatpak-defaults'
+flatpak-manual:widget-factory:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak:widget-factory:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:widget-factory:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak:icon-browser:
-  extends: '.flatpak-defaults'
+flatpak-manual:icon-browser:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak:icon-browser:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:icon-browser:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak:node-editor:
-  extends: '.flatpak-defaults'
+flatpak-manual:node-editor:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
-flatpak:node-editor:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:node-editor:
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
@@ -328,35 +314,23 @@ flatpak:node-editor:aarch64:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
     extends: '.publish_nightly'
-    needs: ['flatpak:demo']
-
-nightly demo aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:demo:aarch64']
+    dependencies: ['flatpak-main:demo']
+    needs: ['flatpak-main:demo']
 
 nightly factory:
     extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory']
-
-nightly factory aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory:aarch64']
+    dependencies: ['flatpak-main:widget-factory']
+    needs: ['flatpak-main:widget-factory']
 
 nightly icon-browser:
     extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser']
-
-nightly icon-browser aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser:aarch64']
+    dependencies: ['flatpak-main:icon-browser']
+    needs: ['flatpak-main:icon-browser']
 
 nightly node-editor:
     extends: '.publish_nightly'
-    needs: ['flatpak:node-editor']
-
-nightly node-editor aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:node-editor:aarch64']
+    dependencies: ['flatpak-main:node-editor']
+    needs: ['flatpak-main:node-editor']
 
 static-scan:
   image: $FEDORA_IMAGE
@@ -365,31 +339,23 @@ static-scan:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
   script:
-    - export PATH="$HOME/.local/bin:$PATH"
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
-            _scan_build
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _scan_build
     - ninja -C _scan_build scan-build
   artifacts:
     paths:
       - _scan_build/meson-logs
   allow_failure: true
 
-# Run tests with the address sanitizer. We need to turn off introspection
-# and f16c, since they are incompatible with asan
+# Run tests with the address sanitizer. We need to turn off introspection,
+# since it is incompatible with asan
 asan-build:
   image: $FEDORA_IMAGE
   tags: [ asan ]
   stage: analysis
   needs: []
-  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 --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland
   artifacts:
@@ -401,21 +367,10 @@ reference:
   image: $FEDORA_IMAGE
   stage: docs
   needs: []
+  variables:
+    EXTRA_MESON_FLAGS: "--buildtype=release --force-fallback-for=gdk-pixbuf,pango"
   script:
-    - export PATH="$HOME/.local/bin:$PATH"
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            --buildtype=release
-            --force-fallback-for=gdk-pixbuf,pango
-            -Dintrospection=enabled
-            -Dgtk_doc=true
-            -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:gtk_doc=true
-            -Ddemos=false
-            -Dbuild-examples=false
-            -Dbuild-tests=false
-            -Dbuild-testsuite=false
-            _build
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true -Dgdk-pixbuf:gtk_doc=true -Dpango:gtk_doc=true _build
     - meson compile -C _build
     - mkdir -p _reference/
     - mv _build/docs/reference/gdk/gdk4/ _reference/gdk4/
@@ -438,9 +393,9 @@ reference:
 publish-docs:
   image: fedora:latest
   stage: publish
-  interruptible: false
   needs: ['reference']
   script:
     - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "main"
+  only:
+    refs:
+      - main

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:36
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -18,9 +18,7 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
-    docbook-style-xsl \
     elfutils-libelf-devel \
-    expat-devel \
     fribidi-devel \
     gcc \
     gcc-c++ \
@@ -32,7 +30,7 @@ RUN dnf -y install \
     glib2-static \
     glibc-devel \
     glibc-headers \
-    gnupg2 \
+    gnome-desktop-testing \
     gobject-introspection-devel \
     graphene-devel \
     graphviz \
@@ -73,22 +71,18 @@ RUN dnf -y install \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
     meson \
-    mutter \
     ninja-build \
     pango-devel \
     pcre-devel \
     pcre-static \
-    pipewire \
-    pipewire-gstreamer \
     python3 \
     python3-docutils \
     python3-gobject \
     python3-jinja2 \
     python3-markdown \
-    python3-packaging \
     python3-pip \
-    python3-pydbus \
     python3-pygments \
+    python3-toml \
     python3-typogrify \
     python3-wheel \
     redhat-rpm-config \
@@ -99,8 +93,9 @@ RUN dnf -y install \
     weston \
     weston-libs \
     which \
-    wireplumber \
     xorg-x11-server-Xvfb \
+ && dnf install -y 'dnf-command(builddep)' \
+ && dnf builddep -y wayland \
  && dnf clean all
 
 # Enable sudo for wheel users

.gitlab-ci/flatpak-build.sh

@@ -20,7 +20,6 @@ flatpak build ${builddir} meson \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
                 -Dbuild-tests=false \
-                -Dbuild-testsuite=false \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \
                 -Ddemos=true \

.gitlab-ci/run-docker.sh

@@ -23,7 +23,6 @@ push=0
 list=0
 print_help=0
 no_login=0
-no_cache=0
 
 while (($# > 0)); do
         case "${1%%=*}" in
@@ -35,7 +34,6 @@ while (($# > 0)); do
                 --base|-b) read_arg base "$@" || shift;;
                 --version|-v) read_arg base_version "$@" || shift;;
                 --no-login) no_login=1;;
-                --no-cache) no_cache=1;;
                 *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
         esac
         shift
@@ -105,21 +103,11 @@ TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
 
 if [ $build == 1 ]; then
         echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        if [ $no_cache == 0 ]; then
-                ${CMD} build \
-                        ${format} \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        else
-                ${CMD} build \
-                        ${format} \
-                        --no-cache \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        fi
-
+        ${CMD} build \
+                ${format} \
+                --build-arg HOST_USER_ID="$UID" \
+                --tag "${TAG}" \
+                --file "${base}.Dockerfile" .
         exit $?
 fi
 
@@ -138,8 +126,7 @@ if [ $run == 1 ]; then
         echo -e "\e[1;32mRUNNING\e[0m: ${base} as ${TAG}"
         ${CMD} run \
                 --rm \
-                --userns=keep-id \
-                --volume "$(pwd)/..:/home/user/app:rw,z" \
+                --volume "$(pwd)/..:/home/user/app" \
                 --workdir "/home/user/app" \
                 --tty \
                 --interactive "${TAG}" \

.gitlab-ci/run-tests.sh

@@ -6,18 +6,16 @@ set +e
 srcdir=$( pwd )
 builddir=$1
 backend=$2
-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
 export G_SLICE=always-malloc
 
 case "${backend}" in
   x11)
     xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
-                --quiet \
-                --timeout-multiplier "${multiplier}" \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
@@ -28,9 +26,17 @@ case "${backend}" in
     # Store the exit code for the CI run, but always
     # generate the reports
     exit_code=$?
+
+    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
+          meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend}_unstable \
+                --suite=flaky \
+                --suite=failing || true
     ;;
 
-  wayland*)
+  wayland)
     export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
 
     weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
@@ -38,17 +44,49 @@ case "${backend}" in
     export WAYLAND_DISPLAY=wayland-5
 
     meson test -C ${builddir} \
-                --quiet \
-                --timeout-multiplier "${multiplier}" \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
                 --no-suite=failing \
                 --no-suite=flaky \
-                --no-suite=${backend}_failing \
                 --no-suite=gsk-compare-broadway
     exit_code=$?
 
+    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend}_unstable \
+                --suite=flaky \
+                --suite=failing || true
+
+    kill ${compositor}
+    ;;
+
+  waylandgles)
+    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+    weston --backend=headless-backend.so --socket=wayland-6 --idle-time=0 &
+    compositor=$!
+    export WAYLAND_DISPLAY=wayland-6
+
+    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend} \
+                --suite=gtk \
+                --no-suite=failing \
+                --no-suite=flaky \
+                --no-suite=gsk-compare-broadway
+    exit_code=$?
+
+    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend}_unstable \
+                --suite=flaky \
+                --suite=failing || true
+
     kill ${compositor}
     ;;
 
@@ -60,8 +98,7 @@ case "${backend}" in
     export BROADWAY_DISPLAY=:5
 
     meson test -C ${builddir} \
-                --quiet \
-                --timeout-multiplier "${multiplier}" \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
@@ -69,6 +106,16 @@ case "${backend}" in
                 --no-suite=flaky \
                 --no-suite=gsk-compare-opengl
 
+    # don't let Broadway failures fail the run, for now
+    exit_code=0
+
+    meson test -C ${builddir} \
+                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --print-errorlogs \
+                --setup=${backend}_unstable \
+                --suite=flaky \
+                --suite=failing || true
+
     kill ${server}
     ;;
 
@@ -81,19 +128,20 @@ esac
 
 cd ${builddir}
 
-$srcdir/.gitlab-ci/meson-junit-report.py \
+for suffix in "" "_unstable"; do
+    $srcdir/.gitlab-ci/meson-junit-report.py \
             --project-name=gtk \
-            --backend="${backend}" \
+            --backend="${backend}${suffix}" \
             --job-id="${CI_JOB_NAME}" \
-            --output="report-${backend}.xml" \
-            "meson-logs/testlog-${backend}.json"
-
-$srcdir/.gitlab-ci/meson-html-report.py \
+            --output="report-${backend}${suffix}.xml" \
+            "meson-logs/testlog-${backend}${suffix}.json"
+    $srcdir/.gitlab-ci/meson-html-report.py \
             --project-name=gtk \
-            --backend="${backend}" \
+            --backend="${backend}${suffix}" \
             --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/${backend}${suffix}" \
+            --output="report-${backend}${suffix}.html" \
+            "meson-logs/testlog-${backend}${suffix}.json"
+done
 
 exit $exit_code

.gitlab-ci/test-msvc.bat

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

CONTRIBUTING.md

@@ -21,7 +21,7 @@ many things that we value:
 Please, do not use the issue tracker for support questions. If you have
 questions on how to use GTK effectively, you can use:
 
- - the `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org)
+ - the `#gtk` IRC channel on irc.gnome.org
  - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
 
 You can also look at the GTK tag on [Stack
@@ -44,7 +44,6 @@ If you're reporting a bug make sure to list:
 
  0. which version of GTK are you using?
  0. which operating system are you using?
- 0. what display and graphics driver are you using?
  0. the necessary steps to reproduce the issue
  0. the expected outcome
  0. a description of the behavior; screenshots are also welcome

NEWS

@@ -1,468 +1,6 @@
-Overview of Changes in 4.11.3, xx-xx-xxxx
-=========================================
-
-Overview of Changes in 4.11.2, 09-05-2023
-=========================================
-
-* GtkGLArea:
- - Add an allowed-apis property
-
-* GtkListBox:
- - Fix a problem with gtk_list_box_remove_all
-
-* Add the GtkSectionModel interface, and implement it in most
-  of our list models
-
-* GtkListView:
- - Support displaying sections
-
-* GtkCenterBox:
- - Add a shrink-center-last property
-
-* GtkButton, GtkMenuButton:
- - Add a can-shrink property
-
-* GtkPopover:
- - Fix problems with grabs
-
-* GtkFileChooser:
- - Fix a problem with removing files
- - Make the date, time and location columns work
- - Fix filtering in the save entry popup
- - A few memory leak fixes
- - Handle webdav in the pathbar
-
-* GtkBox:
- - Support baselines in vertical orientation with GtkBox:baseline-child
-
-* Dialogs:
- - Destroy windows promptly when the async callback finishes
- - Detect absence of the OpenURI portal and fall back
-
-* Theme:
- - Add explicit style classes to a number of widgets
- - Fix some contrast issues in the dark theme
-
-* Accessibility:
- - Fix alert dialogs in the a11y tree
- - Improve accessibility of GtkShortcutsWindow
-
-* Layout:
- - Some fixes to baseline alignment
- - Separate GTK_ALIGN_BASELINE_CENTER and _FILL
-
-* CSS:
- - Fix a crash with color transitions
-
-* GSK:
- - Fix problems with negative scales
- - Improve scaling of offscreens for (cross-fades, masks, blends)
-
-* GL:
- - Add GdkGLTextureBuilder, a more flexible api for creating textures
- - Support setting update regions for GL textures
- - Ensure that we work with GLES 2
-
-* Vulkan:
- - More fixes to the experimental Vulkan renderer
- - Rework glyph caching
-
-* Wayland:
- - Don't destroy wl_surfaces on hide
- - Plug leaks of compositor-side resources
-
-* X11:
- - Fix artifacts in gnome-shell frame decorations
-
-* Windows:
- - Fix GL context initialization
-
-* Inspector:
- - Improve the action list
- - Improve the accessibility pane
- - Fix a crash
-
-* Tools:
- - gtk4-node-editor: Improve scaling
- - gtk4-node-editor: Preserve aspect ratio of textures
- - gtk4-node-editor: Add some smarter editing
- - gtk4-demo: Make the stylus demo work with mice
-
-* Deprecations:
- - gtk_widget_get_allocated_width/height/baseline
- - GTK_ALIGN_BASELINE
-
-* Translation updates
- Bulgarian
- Chinese (China)
- Friulian
- Galician
- Hebrew
- Persian
- Polish
- Portuguese
- `Russian
- Turkish
-
-
-Overview of Changes in 4.11.1, 03-04-2023
-=========================================
-
-* GtkLabel, GtkLinkButton:
- - Make file:// uris work again
-
-* GtkListView/GtkColumnView/GtkGridView:
- - Fix clipping issues
- - Handle focus movement better
- - Introduce ::tab-behavior properties
- - Introduce GtkListItem::focusable
- - Introduce GtkColumnViewCell
- - Introduce row factories in GtkColumnView
- - Make list grid and column views inert when not rendering
-
-* Drag-and-Drop:
- - Support resizing drag surfaces, using the new
-   GdkDragSurface::compute-size signal
-
-* Theme:
- - Port .boxed-list style from Adwaita
- - Make insensitive pictures appear grayed out
-
-* Accessibility:
- - Fix memory leaks
- - Fix a crash
-
-* GDK:
- - Add gdk_surface_get_scale to get the fractional scale
- - Use fractional scales on Wayland with cairo
- - Use fractional scales on Wayland with GL if GDK_DEBUG=gl-fractional
-   is set. This support is still experimental
-
-* GSK:
- - Allow limiting texture sizes with GSK_MAX_TEXTURE_SIZE
- - Use samplers for GL texture filtering
- - Fix problems with texture slicing
- - Avoid re-uploading textures when possible
- - Use mipmaps when it is beneficial
-
-* Wayland:
- - Fix handling of Drag hotspots
- - Fix a crash with cursor size 0
- - Support absolute paths in WAYLAND_DISPLAY
- - Use the fractional scale protocol
- - Use a viewporter to set buffer scale
-
-* Windows:
- - Fix problems with WGL
-
-* Vulkan:
- - Some fixes to the experimental Vulkan renderer
- - Support fractional scaling
-
-* Debugging:
- - Show more Wayland-specific information in the inspector
-
-* Deprecations:
- - gtk_widget_translate_coordinates
- - gdk_surface_create_similar_surface
-
-* Documentation:
- - Add a section on coordinate systems
-
-* Build:
- - Require wayland-protocols 1.31
-
-* Translation updates
- - British English
- - Bulgarian
- - Chinese (China)
- - Dutch
- - French
- - Persian
- - Russian
-
-
-Overview of Changes in 4.10.1, 14-03-2023
-=========================================
-
-* GtkFileChooser
- - Improve search performance
- - Be safe against pathless files
- - Fix memory leaks
- - Only show local files in recent files
- - Show most recent files first
- - Make files non-selectable in selet_folder mode
-
-* GtkListView / GtkColumnView / GtkGridView
- - Fix scrolling problems
- - Support CSS border-spacing
-
-* GtkComboBox
- - Fix a size allocation problem
-
-* gtk
- - Size allocation fixes
-
-* Accessibility
- - Miscellaneous property fixes and improvements
-
-* Wayland
- - Fix an ordering problem in surface disposal
-
-* Windows
- - Fix Visual Studio build with older GLib
-
-* Translation updates
- Basque
- Bulgarian
- Catalan
- Czech
- Danish
- Finnish
- Friulian
- Galician
- Georgian
- Hungarian
- Lithuanian
- Polish
- Portuguese
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.10.0, 04-03-2023
-=========================================
-
-* GtkTextView
- - Document hanging indentation
-
-* GtkListView
- - Fix a size allocation problem
-
-* GtkFileChooser
- - Fix paned behavior
- - Fix a crash
-
-* GtkText
- - Fix various problems with undo
-
-* Accessibility
- - Make some getters transfer-full
- - Allow setting accessible parents and siblings
- - Add a role for toggle buttons
- - Miscellaneous property fixes and improvements
-
-* gtk
- - Improve the handling resize-during-size-allocate
-
-* gdk
- - Introduce GdkTextureDownloader and use it
- - Make gdk_texture_get_format public
-
-* gsk
- - Make mask nodes more versatile
- - Improve the GL implementation for texture scale nodes
-
-* X11
- - Fix key handling during DND
-
-* Tools
- - gtk-builder-tool: Try harder to handle templates
- - gtk-builder-tool: Prefer properties over <child>
-
-* Translation updates
- Basque
- Belarusian
- Bulgarian
- Indonesian
- Galician
- Georgian
- German
- Hebrew
- Lithuanian
- Portuguese
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.4, 12-02-2023
+Overview of Changes in 4.9.2, xx-xx-xxxx
 ========================================
 
-* Printing:
- - Add a CPDB backend
- - Drop the lpr backend
-
-* GtkFileDialog:
- - Robustness fixes
-
-* GtkScaleButton:
- - Add an 'active' property
-
-* GtkSearchEntry:
- - Add placeholder text
-
-* Fix conflicting type names between gtk and gio
-
-* Gsk:
- - Settable filtering for scaled textures
- - Add mask nodes
- - Some robustness and crash fixes
-
-* Wayland:
- - Handle dispatch failing in more places
-
-* Deprecations:
- - GtkVolumeButton
-
-* Translation updates:
- Belarusian
- Chinese (Taiwan)
- Georgian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.3, 04-02-2023
-========================================
-
-* Add GtkUriLauncher, as replacement for gtk_show_uri
-
-* Add GdkMonitor::description
-
-* Fix problems with tooltip sizing
-
-* Deprecations:
- - GtkStatusbar
- - GtkAssistant
- - GtkLockButton
- - gtk_gesture_set_sequence_state
-
-* GtkColumnView:
- - Only create widgets for visible columns
-
-* GtkFileDialog:
- - Drop shortcut folders API
-
-* GtkCalendar:
- - Make marked days work again
-
-* GtkSwitch:
- - Make state and active independently settable
-
-* GtkFileChooser:
- - Fix a crash with DND
- - Fix excessively wide sidebar
- - Make context menus work again
-
-* Accessibility:
- - Make GtkAccessible public, so it can be implemented outside GTK
- - Support accessible implementation for editables
-
-* CSS:
- - Fix randomly stopping CSS animations
-
-* GL:
- - Fix synchronization with GStreamer
- - Fix problems with 3rd party GL in the same thread
-
-* Wayland:
- - Fix startup notification with xdg_activation
-
-* Broadway:
- - Implement modal windows
-
-* macOS:
- - Make DND work
-
-* Build:
- - Require graphene 1.10
- - Require gobject-introspection 1.72
-
-* Translation updates
- Catalan
- Galician
- German
- Hebrew
- Indonesian
- Portuguese
- Russian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.2, 26-12-2022
-========================================
-
-* GtkFileChooserWidget:
- - Add a grid view
-
-* GtkText, GtkTextView:
- - Fix activation of the on-screen keyboard
- - Prevent unexpected text direction changes
-
-* GtkCenterBox:
- - Add properties for children
-
-* GtkTreeExpander:
- - Add a hide-expander property
-
-* GtkStringList:
- - Add a construct-only strings property
-
-* GtkBuilder:
- - Support parsing Pango attributes in string form
-
-* GtkGestureStylus:
- - Add a stylus-only property
-
-* GtkFileLauncher:
- - New async-style api to replace gtk_show_uri
-
-* GtkColorDialog, GtkFontDialog, GtkFileDialog,
-  GtkAlertDialog:
- - APIs have seen some tweaks
- - Prefer portals when available
- - Fixes for cancellation
-
-* Add GDK_DEBUG=no-portals
-
-* Improve file DND with remote files
-
-* GtkInfoBar has been deprecated
-
-* gtk_widget_show/hide have been deprecated
-
-* gtk_show_uri has been deprecated
-
-* Wayland:
- - Fix button mask handling
- - Fix problems with cursor size on hi-dpi screens
- - Support newer versions of some protocols
- - Fix handling of surrounding text in input methods
-
-* X11:
- - Fix some ordering problems with surface destruction
-
-* Windows:
- - Improved system settings integration
- - Fix window resizing work with native decorations
- - Include a full hicolor index.theme file as a resource
-
-* Translation updates
- Croatian
- Dutch
- Hungarian
- Interlingua
- Persian
- Turkish
- Ukrainian
-
-
 Overview of Changes in 4.9.1, 31-10-2022
 ========================================
 

README.md

@@ -116,12 +116,19 @@ docs/reference/gtk/html/gtk-building.html
 
 Or [online](https://docs.gtk.org/gtk4/building.html)
 
-Building from git
------------------
+Default branch renamed to `main`
+--------------------------------
 
-The GTK sources are hosted on [gitlab.gnome.org](http://gitlab.gnome.org). The main
-development branch is called `main`, and stable branches are named after their minor
-version, for example `gtk-4-10`.
+The default development branch of GTK has been renamed to `main`.
+To update your local checkout, use:
+```sh
+git checkout master
+git branch -m master main
+git fetch
+git branch --unset-upstream
+git branch -u origin/main
+git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
+```
 
 How to report bugs
 ------------------

build-aux/flatpak/org.gtk.Demo4.json

@@ -187,7 +187,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Ddemo-profile=devel"
+                "-Dprofile=devel"
             ],
             "sources" : [
                 {

build-aux/flatpak/org.gtk.IconBrowser4.json

@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Ddemo-profile=devel"
+                "-Dprofile=devel"
             ],
             "sources" : [
                 {

build-aux/flatpak/org.gtk.WidgetFactory4.json

@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Ddemo-profile=devel"
+                "-Dprofile=devel"
             ],
             "sources" : [
                 {

build-aux/flatpak/org.gtk.gtk4.NodeEditor.json

@@ -116,7 +116,7 @@
                 "--libdir=/app/lib",
                 "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
-                "-Ddemo-profile=devel"
+                "-Dprofile=devel"
             ],
             "sources" : [
                 {

build-aux/meson/gen-visibility-macros.py

@@ -1,201 +0,0 @@
-#!/usr/bin/env python3
-#
-# SPDX-FileCopyrightText: 2022 Collabora Inc.
-#                         2023 Emmanuele Bassi
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# Original author: Xavier Claessens <xclaesse@gmail.com>
-
-import argparse
-import textwrap
-from pathlib import Path
-
-
-# Disable line length warnings as wrapping the C code templates would be hard
-# flake8: noqa: E501
-
-
-def gen_versions_macros(args, current_major_version, current_minor_version, current_micro_version):
-    with args.out_path.open("w", encoding="utf-8") as ofile, args.in_path.open(
-        "r", encoding="utf-8"
-    ) as ifile:
-        for line in ifile.readlines():
-            if "@GDK_VERSIONS@" in line:
-                ofile.write(
-                    textwrap.dedent(
-                        f"""\
-                    /**
-                     * GDK_MAJOR_VERSION:
-                     *
-                     * The major version component of the library's version, e.g. "1" for "1.2.3".
-                     */
-                    #define GDK_MAJOR_VERSION ({current_major_version})
-
-                    /**
-                     * GDK_MINOR_VERSION:
-                     *
-                     * The minor version component of the library's version, e.g. "2" for "1.2.3".
-                     */
-                    #define GDK_MINOR_VERSION ({current_minor_version})
-
-                    /**
-                     * GDK_MICRO_VERSION:
-                     *
-                     * The micro version component of the library's version, e.g. "3" for "1.2.3".
-                     */
-                    #define GDK_MICRO_VERSION ({current_micro_version})
-                        """
-                        )
-                    )
-                for minor in range(0, current_minor_version + 2, 2):
-                    ofile.write(
-                        textwrap.dedent(
-                            f"""\
-                        /**
-                         * GDK_VERSION_{current_major_version}_{minor}:
-                         *
-                         * A macro that evaluates to the {current_major_version}.{minor} version of GTK, in a format
-                         * that can be used by the C pre-processor.
-                         *
-                         * Since: {current_major_version}.{minor}
-                         */
-                        #define GDK_VERSION_{current_major_version}_{minor} (G_ENCODE_VERSION ({current_major_version}, {minor}))
-                        """
-                        )
-                    )
-            else:
-                ofile.write(line)
-
-
-def gen_visibility_macros(args, current_major_version, current_minor_version, current_micro_version):
-    """
-    Generates a set of macros for each minor stable version of GTK
-
-    - GDK_DEPRECATED
-    - GDK_DEPRECATED_IN_…
-    - GDK_DEPRECATED_MACRO_IN_…
-    - GDK_DEPRECATED_ENUMERATOR_IN_…
-    - GDK_DEPRECATED_TYPE_IN_…
-
-    - GDK_AVAILABLE_IN_ALL
-    - GDK_AVAILABLE_IN_…
-    - GDK_AVAILABLE_STATIC_INLINE_IN_…
-    - GDK_AVAILABLE_MACRO_IN_…
-    - GDK_AVAILABLE_ENUMERATOR_IN_…
-    - GDK_AVAILABLE_TYPE_IN_…
-
-    - GDK_UNAVAILABLE(maj,min)
-    - GDK_UNAVAILABLE_STATIC_INLINE(maj,min)
-    """
-
-    ns = args.namespace
-    with args.out_path.open("w", encoding="utf-8") as f:
-        f.write(
-            textwrap.dedent(
-                f"""\
-            #pragma once
-
-            #if (defined(_WIN32) || defined(__CYGWIN__)) && !defined({ns}_STATIC_COMPILATION)
-            #  define _{ns}_EXPORT __declspec(dllexport)
-            #  define _{ns}_IMPORT __declspec(dllimport)
-            #elif __GNUC__ >= 4
-            #  define _{ns}_EXPORT __attribute__((visibility("default")))
-            #  define _{ns}_IMPORT
-            #else
-            #  define _{ns}_EXPORT
-            #  define _{ns}_IMPORT
-            #endif
-            #ifdef GTK_COMPILATION
-            #  define _{ns}_API _{ns}_EXPORT
-            #else
-            #  define _{ns}_API _{ns}_IMPORT
-            #endif
-
-            #define _{ns}_EXTERN _{ns}_API extern
-
-            #define {ns}_VAR _{ns}_EXTERN
-            #define {ns}_AVAILABLE_IN_ALL _{ns}_EXTERN
-
-            #ifdef GDK_DISABLE_DEPRECATION_WARNINGS
-            #define {ns}_DEPRECATED _{ns}_EXTERN
-            #define {ns}_DEPRECATED_FOR(f) _{ns}_EXTERN
-            #define {ns}_UNAVAILABLE(maj,min) _{ns}_EXTERN
-            #define {ns}_UNAVAILABLE_STATIC_INLINE(maj,min)
-            #else
-            #define {ns}_DEPRECATED G_DEPRECATED _{ns}_EXTERN
-            #define {ns}_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _{ns}_EXTERN
-            #define {ns}_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _{ns}_EXTERN
-            #define {ns}_UNAVAILABLE_STATIC_INLINE(maj,min) G_UNAVAILABLE(maj,min)
-            #endif
-            """
-            )
-        )
-        for minor in range(0, current_minor_version + 2, 2):
-            f.write(
-                textwrap.dedent(
-                    f"""
-                #if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_{minor}
-                #define {ns}_DEPRECATED_IN_{current_major_version}_{minor} {ns}_DEPRECATED
-                #define {ns}_DEPRECATED_IN_{current_major_version}_{minor}_FOR(f) {ns}_DEPRECATED_FOR (f)
-                #define {ns}_DEPRECATED_MACRO_IN_{current_major_version}_{minor} GDK_DEPRECATED_MACRO
-                #define {ns}_DEPRECATED_MACRO_IN_{current_major_version}_{minor}_FOR(f) GDK_DEPRECATED_MACRO_FOR (f)
-                #define {ns}_DEPRECATED_ENUMERATOR_IN_{current_major_version}_{minor} GDK_DEPRECATED_ENUMERATOR
-                #define {ns}_DEPRECATED_ENUMERATOR_IN_{current_major_version}_{minor}_FOR(f) GDK_DEPRECATED_ENUMERATOR_FOR (f)
-                #define {ns}_DEPRECATED_TYPE_IN_{current_major_version}_{minor} GDK_DEPRECATED_TYPE
-                #define {ns}_DEPRECATED_TYPE_IN_{current_major_version}_{minor}_FOR(f) GDK_DEPRECATED_TYPE_FOR (f)
-                #else
-                #define {ns}_DEPRECATED_IN_{current_major_version}_{minor} _{ns}_EXTERN
-                #define {ns}_DEPRECATED_IN_{current_major_version}_{minor}_FOR(f) _{ns}_EXTERN
-                #define {ns}_DEPRECATED_MACRO_IN_{current_major_version}_{minor}
-                #define {ns}_DEPRECATED_MACRO_IN_{current_major_version}_{minor}_FOR(f)
-                #define {ns}_DEPRECATED_ENUMERATOR_IN_{current_major_version}_{minor}
-                #define {ns}_DEPRECATED_ENUMERATOR_IN_{current_major_version}_{minor}_FOR(f)
-                #define {ns}_DEPRECATED_TYPE_IN_{current_major_version}_{minor}
-                #define {ns}_DEPRECATED_TYPE_IN_{current_major_version}_{minor}_FOR(f)
-                #endif
-
-                #if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_{current_major_version}_{minor}
-                #define {ns}_AVAILABLE_IN_{current_major_version}_{minor} {ns}_UNAVAILABLE ({current_major_version}, {minor})
-                #define {ns}_AVAILABLE_STATIC_INLINE_IN_{current_major_version}_{minor} GDK_UNAVAILABLE_STATIC_INLINE ({current_major_version}, {minor})
-                #define {ns}_AVAILABLE_MACRO_IN_{current_major_version}_{minor} GDK_UNAVAILABLE_MACRO ({current_major_version}, {minor})
-                #define {ns}_AVAILABLE_ENUMERATOR_IN_{current_major_version}_{minor} GDK_UNAVAILABLE_ENUMERATOR ({current_major_version}, {minor})
-                #define {ns}_AVAILABLE_TYPE_IN_{current_major_version}_{minor} GDK_UNAVAILABLE_TYPE ({current_major_version}, {minor})
-                #else
-                #define {ns}_AVAILABLE_IN_{current_major_version}_{minor} _{ns}_EXTERN
-                #define {ns}_AVAILABLE_STATIC_INLINE_IN_{current_major_version}_{minor}
-                #define {ns}_AVAILABLE_MACRO_IN_{current_major_version}_{minor}
-                #define {ns}_AVAILABLE_ENUMERATOR_IN_{current_major_version}_{minor}
-                #define {ns}_AVAILABLE_TYPE_IN_{current_major_version}_{minor}
-                #endif
-                """
-                )
-            )
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument("gtk_version", help="Current GLib version")
-    subparsers = parser.add_subparsers()
-
-    versions_parser = subparsers.add_parser(
-        "versions-macros", help="Generate versions macros"
-    )
-    versions_parser.add_argument("in_path", help="input file", type=Path)
-    versions_parser.add_argument("out_path", help="output file", type=Path)
-    versions_parser.set_defaults(func=gen_versions_macros)
-
-    visibility_parser = subparsers.add_parser(
-        "visibility-macros", help="Generate visibility macros"
-    )
-    visibility_parser.add_argument("namespace", help="Macro namespace")
-    visibility_parser.add_argument("out_path", help="output file", type=Path)
-    visibility_parser.set_defaults(func=gen_visibility_macros)
-
-    args = parser.parse_args()
-    version = [int(i) for i in args.gtk_version.split(".")]
-    args.func(args, version[0], version[1], version[2])
-
-
-if __name__ == "__main__":
-    main()

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

@@ -228,9 +228,9 @@ open_cb (GtkWidget              *button,
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Open file");
   cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  gtk_file_dialog_set_current_folder (dialog, cwd);
   g_object_unref (cwd);
-  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, open_response_cb, self);
+  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, NULL, open_response_cb, self);
   g_object_unref (dialog);
 }
 
@@ -317,7 +317,8 @@ save_response_cb (GObject *source,
           alert = gtk_alert_dialog_new ("Saving failed");
           gtk_alert_dialog_set_detail (alert, error->message);
           gtk_alert_dialog_show (alert,
-                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))));
+                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
+                                 NULL);
           g_object_unref (alert);
           g_error_free (error);
         }
@@ -337,10 +338,11 @@ save_cb (GtkWidget              *button,
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Save constraints");
   cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  gtk_file_dialog_set_current_folder (dialog, cwd);
   g_object_unref (cwd);
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
+                        NULL, NULL,
                         NULL,
                         save_response_cb, self);
   g_object_unref (dialog);

demos/constraint-editor/meson.build

@@ -9,7 +9,7 @@ constraint_editor_sources = [
 
 constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
   'constraint-editor.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-constraint-editor',

demos/gtk-demo/application.c

@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
@@ -39,7 +37,7 @@ show_action_dialog (GSimpleAction *action)
 
   dialog = gtk_alert_dialog_new ("You activated action: \"%s\n",
                                  g_action_get_name (G_ACTION (action)));
-  gtk_alert_dialog_show (dialog, NULL);
+  gtk_alert_dialog_show (dialog, NULL, NULL);
   g_object_unref (dialog);
 }
 
@@ -108,7 +106,7 @@ open_response_cb (GObject *source,
       GtkAlertDialog *alert;
 
       alert = gtk_alert_dialog_new ("Error loading file: \"%s\"", error->message);
-      gtk_alert_dialog_show (alert, NULL);
+      gtk_alert_dialog_show (alert, NULL, NULL);
       g_object_unref (alert);
       g_error_free (error);
     }
@@ -126,7 +124,7 @@ activate_open (GSimpleAction *action,
   GtkFileDialog *dialog;
 
   dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_open (dialog, NULL, NULL, open_response_cb, g_object_ref (app));
+  gtk_file_dialog_open (dialog, NULL, NULL, NULL, open_response_cb, g_object_ref (app));
   g_object_unref (dialog);
 }
 

demos/gtk-demo/assistant.c

@@ -7,8 +7,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *progress_bar = NULL;
 
 static gboolean

demos/gtk-demo/bluroverlay.c

@@ -116,8 +116,7 @@ effective_align (GtkAlign         align,
       return direction == GTK_TEXT_DIR_RTL ? GTK_ALIGN_START : GTK_ALIGN_END;
     case GTK_ALIGN_FILL:
     case GTK_ALIGN_CENTER:
-    case GTK_ALIGN_BASELINE_FILL:
-    case GTK_ALIGN_BASELINE_CENTER:
+    case GTK_ALIGN_BASELINE:
     default:
       return align;
     }
@@ -259,8 +258,7 @@ blur_overlay_get_child_position (BlurOverlay    *overlay,
     case GTK_ALIGN_END:
       alloc->x += width - alloc->width;
       break;
-    case GTK_ALIGN_BASELINE_FILL:
-    case GTK_ALIGN_BASELINE_CENTER:
+    case GTK_ALIGN_BASELINE:
     default:
       g_assert_not_reached ();
       break;
@@ -283,8 +281,7 @@ blur_overlay_get_child_position (BlurOverlay    *overlay,
     case GTK_ALIGN_END:
       alloc->y += height - alloc->height;
       break;
-    case GTK_ALIGN_BASELINE_FILL:
-    case GTK_ALIGN_BASELINE_CENTER:
+    case GTK_ALIGN_BASELINE:
     default:
       g_assert_not_reached ();
       break;
@@ -300,13 +297,12 @@ blur_overlay_snapshot (GtkWidget   *widget,
   GtkWidget *main_widget;
   GskRenderNode *main_widget_node = NULL;
   GtkWidget *child;
-  int width, height;
+  GtkAllocation main_alloc;
   cairo_region_t *clip = NULL;
   int i;
 
   main_widget = BLUR_OVERLAY (widget)->main_widget;
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
+  gtk_widget_get_allocation (widget, &main_alloc);
 
   for (child = gtk_widget_get_first_child (widget);
        child != NULL;
@@ -319,7 +315,7 @@ blur_overlay_snapshot (GtkWidget   *widget,
 
       if (blur > 0)
         {
-          cairo_rectangle_int_t rect;
+          GtkAllocation alloc;
           graphene_rect_t bounds;
 
           if (main_widget_node == NULL)
@@ -331,8 +327,8 @@ blur_overlay_snapshot (GtkWidget   *widget,
               main_widget_node = gtk_snapshot_free_to_node (child_snapshot);
             }
 
-          if (!gtk_widget_compute_bounds (child, gtk_widget_get_parent (child), &bounds))
-            graphene_rect_init (&bounds, 0, 0, 0, 0);
+          gtk_widget_get_allocation (child, &alloc);
+          graphene_rect_init (&bounds, alloc.x, alloc.y, alloc.width, alloc.height);
           gtk_snapshot_push_blur (snapshot, blur);
           gtk_snapshot_push_clip (snapshot, &bounds);
           gtk_snapshot_append_node (snapshot, main_widget_node);
@@ -341,17 +337,13 @@ blur_overlay_snapshot (GtkWidget   *widget,
 
           if (clip == NULL)
             {
+              cairo_rectangle_int_t rect;
               rect.x = rect.y = 0;
-              rect.width = width;
-              rect.height = height;
+              rect.width = main_alloc.width;
+              rect.height = main_alloc.height;
               clip = cairo_region_create_rectangle (&rect);
             }
-
-          rect.x = floor (bounds.origin.x);
-          rect.y = floor (bounds.origin.y);
-          rect.width = ceil (bounds.origin.x + bounds.size.width - rect.x);
-          rect.height = ceil (bounds.origin.y + bounds.size.height - rect.y);
-          cairo_region_subtract_rectangle (clip, &rect);
+          cairo_region_subtract_rectangle (clip, (cairo_rectangle_int_t *)&alloc);
         }
     }
 

demos/gtk-demo/bluroverlay.h

@@ -51,11 +51,15 @@ struct _BlurOverlayClass
                                   GtkAllocation *allocation);
 };
 
+GDK_AVAILABLE_IN_ALL
 GType      blur_overlay_get_type    (void) G_GNUC_CONST;
+GDK_AVAILABLE_IN_ALL
 GtkWidget *blur_overlay_new         (void);
+GDK_AVAILABLE_IN_ALL
 void       blur_overlay_add_overlay (BlurOverlay *overlay,
                                      GtkWidget   *widget,
                                      double       blur);
+GDK_AVAILABLE_IN_ALL
 void       blur_overlay_set_child   (BlurOverlay *overlay,
                                      GtkWidget   *widget);
 

demos/gtk-demo/builder.c

@@ -37,8 +37,6 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static gboolean
 pop_status (gpointer data)
 {
@@ -59,8 +57,6 @@ status_message (GtkStatusbar *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,

demos/gtk-demo/clipboard.c

@@ -244,9 +244,8 @@ open_file_cb (GtkWidget *button)
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
                         NULL,
+                        NULL,
                         file_chooser_response, button);
-
-  g_object_unref (dialog);
 }
 
 static void
@@ -278,11 +277,9 @@ open_folder_cb (GtkWidget *button)
   gtk_file_dialog_select_folder (dialog,
                                  GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
                                  NULL,
+                                 NULL,
                                  folder_chooser_response, button);
-
-  g_object_unref (dialog);
 }
-
 static void
 update_paste_button_sensitivity (GdkClipboard *clipboard,
                                  GtkWidget    *paste_button)

demos/gtk-demo/css_blendmodes.c

@@ -50,7 +50,7 @@ update_css_for_blend_mode (GtkCssProvider *provider,
                          blend_mode,
                          blend_mode);
 
-  gtk_css_provider_load_from_string (provider, css);
+  gtk_css_provider_load_from_data (provider, css, -1);
 
   g_bytes_unref (bytes);
   g_free (css);

demos/gtk-demo/demo.gresource.xml

@@ -43,7 +43,7 @@
     <file>cssview.css</file>
     <file>reset.css</file>
   </gresource>
-  <gresource prefix="/listview_selections">
+  <gresource prefix="/dropdown">
     <file>suggestionentry.h</file>
     <file>suggestionentry.c</file>
     <file>suggestionentry.css</file>
@@ -195,9 +195,6 @@
   <gresource prefix="/listview_settings">
     <file>listview_settings.ui</file>
   </gresource>
-  <gresource prefix="/listview_settings2">
-    <file>listview_settings2.ui</file>
-  </gresource>
   <gresource prefix="/listview_ucd_data/">
     <file>ucdnames.data</file>
   </gresource>
@@ -218,12 +215,6 @@
     <file>demo3widget.h</file>
     <file>demo3widget.ui</file>
   </gresource>
-  <gresource prefix="/mask">
-    <file>demo4widget.c</file>
-    <file>demo4widget.h</file>
-    <file>hsla.h</file>
-    <file>hsla.c</file>
-  </gresource>
   <gresource prefix="/paintable_svg">
     <file>svgpaintable.h</file>
     <file>svgpaintable.c</file>
@@ -277,6 +268,7 @@
     <file>cursors.c</file>
     <file>dialog.c</file>
     <file>drawingarea.c</file>
+    <file>dropdown.c</file>
     <file>dnd.c</file>
     <file>editable_cells.c</file>
     <file>entry_completion.c</file>
@@ -300,7 +292,6 @@
     <file>iconscroll.c</file>
     <file>iconview.c</file>
     <file>iconview_edit.c</file>
-    <file>image_scaling.c</file>
     <file>images.c</file>
     <file>infobar.c</file>
     <file>layoutmanager.c</file>
@@ -313,16 +304,14 @@
     <file>listview_clocks.c</file>
     <file>listview_filebrowser.c</file>
     <file>listview_minesweeper.c</file>
-    <file>listview_selections.c</file>
     <file>listview_settings.c</file>
-    <file>listview_settings2.c</file>
     <file>listview_ucd.c</file>
     <file>listview_weather.c</file>
     <file>listview_words.c</file>
     <file>list_store.c</file>
     <file>main.c</file>
     <file>markup.c</file>
-    <file>mask.c</file>
+    <file>menu.c</file>
     <file>overlay.c</file>
     <file>overlay_decorative.c</file>
     <file>paint.c</file>

demos/gtk-demo/demo3widget.c

@@ -3,20 +3,16 @@
 
 enum
 {
-  PROP_TEXTURE = 1,
-  PROP_FILTER,
-  PROP_SCALE,
-  PROP_ANGLE,
+  PROP_PAINTABLE = 1,
+  PROP_SCALE
 };
 
 struct _Demo3Widget
 {
   GtkWidget parent_instance;
 
-  GdkTexture *texture;
+  GdkPaintable *paintable;
   float scale;
-  float angle;
-  GskScalingFilter filter;
 
   GtkWidget *menu;
 };
@@ -28,86 +24,10 @@ struct _Demo3WidgetClass
 
 G_DEFINE_TYPE (Demo3Widget, demo3_widget, GTK_TYPE_WIDGET)
 
-static gboolean
-query_tooltip (GtkWidget  *widget,
-               int         x,
-               int         y,
-               gboolean    keyboard_mode,
-               GtkTooltip *tooltip,
-               gpointer    data)
-{
-  Demo3Widget *self = DEMO3_WIDGET (widget);
-  GtkWidget *grid;
-  GtkWidget *label;
-  char *s, *s2;
-  const char *filter[] = { "Linear", "Nearest", "Trilinear" };
-  int precision, l;
-
-  grid = gtk_grid_new ();
-  gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
-  gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
-  label = gtk_label_new ("Texture");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
-  s = g_strdup_printf ("%d\342\200\206\303\227\342\200\206%d",
-                       gdk_texture_get_width (self->texture),
-                       gdk_texture_get_height (self->texture));
-  label = gtk_label_new (s);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
-
-  label = gtk_label_new ("Rotation");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
-  s = g_strdup_printf ("%.1f", self->angle);
-  if (g_str_has_suffix (s, ".0"))
-    s[strlen (s) - 2] = '\0';
-  s2 = g_strconcat (s, "\302\260", NULL);
-  label = gtk_label_new (s2);
-  g_free (s2);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
-
-  label = gtk_label_new ("Scale");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
-
-  precision = 1;
-  do {
-    s = g_strdup_printf ("%.*f", precision, self->scale);
-    l = strlen (s) - 1;
-    while (s[l] == '0')
-      l--;
-    if (s[l] == '.')
-      s[l] = '\0';
-    precision++;
-  } while (strcmp (s, "0") == 0);
-
-  label = gtk_label_new (s);
-  g_free (s);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 1, 1);
-
-  label = gtk_label_new ("Filter");
-  gtk_label_set_xalign (GTK_LABEL (label), 0);
-  gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
-  label = gtk_label_new (filter[self->filter]);
-  gtk_label_set_xalign (GTK_LABEL (label), 1);
-  gtk_grid_attach (GTK_GRID (grid), label, 1, 3, 1, 1);
-
-  gtk_tooltip_set_custom (tooltip, grid);
-
-  return TRUE;
-}
-
 static void
 demo3_widget_init (Demo3Widget *self)
 {
   self->scale = 1.f;
-  self->angle = 0.f;
-  self->filter = GSK_SCALING_FILTER_LINEAR;
   gtk_widget_init_template (GTK_WIDGET (self));
 }
 
@@ -116,7 +36,7 @@ demo3_widget_dispose (GObject *object)
 {
   Demo3Widget *self = DEMO3_WIDGET (object);
 
-  g_clear_object (&self->texture);
+  g_clear_object (&self->paintable);
 
   gtk_widget_dispose_template (GTK_WIDGET (self), DEMO3_TYPE_WIDGET);
 
@@ -129,35 +49,21 @@ demo3_widget_snapshot (GtkWidget   *widget,
 {
   Demo3Widget *self = DEMO3_WIDGET (widget);
   int x, y, width, height;
-  double w, h, w2, h2;
+  double w, h;
 
   width = gtk_widget_get_width (widget);
   height = gtk_widget_get_height (widget);
 
-  w2 = w = self->scale * gdk_texture_get_width (self->texture);
-  h2 = h = self->scale * gdk_texture_get_height (self->texture);
+  w = self->scale * gdk_paintable_get_intrinsic_width (self->paintable);
+  h = self->scale * gdk_paintable_get_intrinsic_height (self->paintable);
 
-  if (G_APPROX_VALUE (self->angle, 90.f, FLT_EPSILON) ||
-      G_APPROX_VALUE (self->angle, 270.f, FLT_EPSILON))
-    {
-      double s = w2;
-      w2 = h2;
-      h2 = s;
-    }
-
-  x = (width - ceil (w2)) / 2;
-  y = (height - ceil (h2)) / 2;
+  x = MAX (0, (width - ceil (w)) / 2);
+  y = MAX (0, (height - ceil (h)) / 2);
 
   gtk_snapshot_push_clip (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
   gtk_snapshot_save (snapshot);
   gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (x, y));
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (w2 / 2, h2 / 2));
-  gtk_snapshot_rotate (snapshot, self->angle);
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- w / 2, - h / 2));
-  gtk_snapshot_append_scaled_texture (snapshot,
-                                      self->texture,
-                                      self->filter,
-                                      &GRAPHENE_RECT_INIT (0, 0, w, h));
+  gdk_paintable_snapshot (self->paintable, snapshot, w, h);
   gtk_snapshot_restore (snapshot);
   gtk_snapshot_pop (snapshot);
 }
@@ -172,26 +78,14 @@ demo3_widget_measure (GtkWidget      *widget,
                       int            *natural_baseline)
 {
   Demo3Widget *self = DEMO3_WIDGET (widget);
-  int width, height;
   int size;
 
-  width = gdk_texture_get_width (self->texture);
-  height = gdk_texture_get_height (self->texture);
-
-  if (G_APPROX_VALUE (self->angle, 90.f, FLT_EPSILON) ||
-      G_APPROX_VALUE (self->angle, 270.f, FLT_EPSILON))
-    {
-      int s = width;
-      width = height;
-      height = s;
-    }
-
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    size = width;
+    size = gdk_paintable_get_intrinsic_width (self->paintable);
   else
-    size = height;
+    size = gdk_paintable_get_intrinsic_height (self->paintable);
 
-  *minimum = *natural = (int) ceil (self->scale * size);
+  *minimum = *natural = self->scale * size;
 }
 
 static void
@@ -209,8 +103,6 @@ demo3_widget_size_allocate (GtkWidget *widget,
   gtk_popover_present (GTK_POPOVER (self->menu));
 }
 
-static void update_actions (Demo3Widget *self);
-
 static void
 demo3_widget_set_property (GObject      *object,
                            guint         prop_id,
@@ -221,32 +113,14 @@ demo3_widget_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_TEXTURE:
-      g_clear_object (&self->texture);
-      self->texture = g_value_dup_object (value);
-      self->scale = 1.f;
-      self->angle = 0.f;
-      self->filter = GSK_SCALING_FILTER_LINEAR;
-      update_actions (self);
+    case PROP_PAINTABLE:
+      g_clear_object (&self->paintable);
+      self->paintable = g_value_dup_object (value);
       gtk_widget_queue_resize (GTK_WIDGET (object));
-      g_object_notify (object, "scale");
-      g_object_notify (object, "angle");
-      g_object_notify (object, "filter");
       break;
 
     case PROP_SCALE:
       self->scale = g_value_get_float (value);
-      update_actions (self);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
-    case PROP_ANGLE:
-      self->angle = fmodf (g_value_get_float (value), 360.f);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
-    case PROP_FILTER:
-      self->filter = g_value_get_enum (value);
       gtk_widget_queue_resize (GTK_WIDGET (object));
       break;
 
@@ -266,22 +140,14 @@ demo3_widget_get_property (GObject     *object,
 
   switch (prop_id)
     {
-    case PROP_TEXTURE:
-      g_value_set_object (value, self->texture);
+    case PROP_PAINTABLE:
+      g_value_set_object (value, self->paintable);
       break;
 
     case PROP_SCALE:
       g_value_set_float (value, self->scale);
       break;
 
-    case PROP_ANGLE:
-      g_value_set_float (value, self->angle);
-      break;
-
-    case PROP_FILTER:
-      g_value_set_enum (value, self->filter);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -303,14 +169,6 @@ pressed_cb (GtkGestureClick *gesture,
   gtk_popover_popup (GTK_POPOVER (self->menu));
 }
 
-static void
-update_actions (Demo3Widget *self)
-{
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.in", self->scale < 1024.);
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.out", self->scale > 1./1024.);
-  gtk_widget_action_set_enabled (GTK_WIDGET (self), "zoom.reset", self->scale != 1.);
-}
-
 static void
 zoom_cb (GtkWidget  *widget,
          const char *action_name,
@@ -320,30 +178,19 @@ zoom_cb (GtkWidget  *widget,
   float scale;
 
   if (g_str_equal (action_name, "zoom.in"))
-    scale = MIN (1024., self->scale * M_SQRT2);
+    scale = MIN (10, self->scale * M_SQRT2);
   else if (g_str_equal (action_name, "zoom.out"))
-    scale = MAX (1./1024., self->scale / M_SQRT2);
-  else if (g_str_equal (action_name, "zoom.reset"))
-    scale = 1.0;
+    scale = MAX (0.01, self->scale / M_SQRT2);
   else
-    g_assert_not_reached ();
+    scale = 1.0;
+
+  gtk_widget_action_set_enabled (widget, "zoom.in", scale < 10);
+  gtk_widget_action_set_enabled (widget, "zoom.out", scale > 0.01);
+  gtk_widget_action_set_enabled (widget, "zoom.reset", scale != 1);
 
   g_object_set (widget, "scale", scale, NULL);
 }
 
-static void
-rotate_cb (GtkWidget  *widget,
-           const char *action_name,
-           GVariant   *parameter)
-{
-  Demo3Widget *self = DEMO3_WIDGET (widget);
-  int angle;
-
-  g_variant_get (parameter, "i", &angle);
-
-  g_object_set (widget, "angle", fmodf (self->angle + angle, 360.f), NULL);
-}
-
 static void
 demo3_widget_class_init (Demo3WidgetClass *class)
 {
@@ -358,31 +205,20 @@ demo3_widget_class_init (Demo3WidgetClass *class)
   widget_class->measure = demo3_widget_measure;
   widget_class->size_allocate = demo3_widget_size_allocate;
 
-  g_object_class_install_property (object_class, PROP_TEXTURE,
-      g_param_spec_object ("texture", NULL, NULL,
-                           GDK_TYPE_TEXTURE,
+  g_object_class_install_property (object_class, PROP_PAINTABLE,
+      g_param_spec_object ("paintable", "Paintable", "Paintable",
+                           GDK_TYPE_PAINTABLE,
                            G_PARAM_READWRITE));
 
   g_object_class_install_property (object_class, PROP_SCALE,
-      g_param_spec_float ("scale", NULL, NULL,
-                          1./1024., 1024., 1.0,
+      g_param_spec_float ("scale", "Scale", "Scale",
+                          0.0, 10.0, 1.0,
                           G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, PROP_ANGLE,
-      g_param_spec_float ("angle", NULL, NULL,
-                          0.0, 360.0, 0.0,
-                          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_FILTER,
-      g_param_spec_enum ("filter", NULL, NULL,
-                         GSK_TYPE_SCALING_FILTER, GSK_SCALING_FILTER_LINEAR,
-                         G_PARAM_READWRITE));
-
   /* These are the actions that we are using in the menu */
   gtk_widget_class_install_action (widget_class, "zoom.in", NULL, zoom_cb);
   gtk_widget_class_install_action (widget_class, "zoom.out", NULL, zoom_cb);
   gtk_widget_class_install_action (widget_class, "zoom.reset", NULL, zoom_cb);
-  gtk_widget_class_install_action (widget_class, "rotate", "i", rotate_cb);
 
   gtk_widget_class_set_template_from_resource (widget_class, "/menu/demo3widget.ui");
   gtk_widget_class_bind_template_child (widget_class, Demo3Widget, menu);
@@ -393,18 +229,16 @@ GtkWidget *
 demo3_widget_new (const char *resource)
 {
   Demo3Widget *self;
-  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
+  GdkPaintable *paintable;
 
-  texture = gdk_texture_new_from_resource (resource);
+  pixbuf = gdk_pixbuf_new_from_resource (resource, NULL);
+  paintable = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (pixbuf));
 
-  self = g_object_new (DEMO3_TYPE_WIDGET,
-                       "texture", texture,
-                       "has-tooltip", TRUE,
-                       NULL);
+  self = g_object_new (DEMO3_TYPE_WIDGET, "paintable", paintable, NULL);
 
-  g_signal_connect (self, "query-tooltip", G_CALLBACK (query_tooltip), NULL);
-
-  g_object_unref (texture);
+  g_object_unref (pixbuf);
+  g_object_unref (paintable);
 
   return GTK_WIDGET (self);
 }

demos/gtk-demo/demo3widget.ui

@@ -12,11 +12,6 @@
       <attribute name="label">1∶1</attribute>
       <attribute name="action">zoom.reset</attribute>
     </item>
-    <item>
-      <attribute name="label">Rotate</attribute>
-      <attribute name="action">rotate</attribute>
-      <attribute name="target" type="i">90</attribute>
-    </item>
   </menu>
   <template class="Demo3Widget">
     <child>

demos/gtk-demo/demo4widget.c

@@ -1,226 +0,0 @@
-#include <math.h>
-#include "demo4widget.h"
-#include "hsla.h"
-
-enum
-{
-  PROP_0,
-  PROP_PROGRESS,
-};
-
-struct _Demo4Widget
-{
-  GtkWidget parent_instance;
-  PangoLayout *layout;
-  GskColorStop stops[8];
-  gsize n_stops;
-  double progress;
-
-  guint tick;
-};
-
-struct _Demo4WidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (Demo4Widget, demo4_widget, GTK_TYPE_WIDGET)
-
-static void
-rotate_color (GdkRGBA *rgba)
-{
-  GdkHSLA hsla;
-
-  _gdk_hsla_init_from_rgba (&hsla, rgba);
-  hsla.hue -= 1;
-  _gdk_rgba_init_from_hsla (rgba, &hsla);
-}
-
-static gboolean
-rotate_colors (GtkWidget     *widget,
-               GdkFrameClock *clock,
-               gpointer       user_data)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-
-  for (unsigned int i = 0; i < self->n_stops; i++)
-    rotate_color (&self->stops[i].color);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-demo4_widget_init (Demo4Widget *self)
-{
-  PangoFontDescription *desc;
-
-  self->progress = 0.5;
-
-  self->n_stops = 8;
-  self->stops[0].offset = 0;
-  self->stops[0].color = (GdkRGBA) { 1, 0, 0, 1 };
-
-  for (unsigned int i = 1; i < self->n_stops; i++)
-    {
-      GdkHSLA hsla;
-
-      self->stops[i].offset = i / (double)(self->n_stops - 1);
-      _gdk_hsla_init_from_rgba (&hsla, &self->stops[i - 1].color);
-      hsla.hue += 360.0 / (double)(self->n_stops - 1);
-      _gdk_rgba_init_from_hsla (&self->stops[i].color, &hsla);
-    }
-
-  self->layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "123");
-  desc = pango_font_description_from_string ("Cantarell Bold 210");
-  pango_layout_set_font_description (self->layout, desc);
-  pango_font_description_free (desc);
-
-  self->tick = gtk_widget_add_tick_callback (GTK_WIDGET (self), rotate_colors, NULL, NULL);
-}
-
-static void
-demo4_widget_dispose (GObject *object)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  g_clear_object (&self->layout);
-  gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick);
-
-  G_OBJECT_CLASS (demo4_widget_parent_class)->dispose (object);
-}
-
-static void
-demo4_widget_snapshot_content (GtkWidget   *widget,
-                               GtkSnapshot *snapshot,
-                               GskMaskMode  mode)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height, layout_width, layout_height;
-  double scale;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, mode);
-  pango_layout_get_pixel_size (self->layout, &layout_width, &layout_height);
-  scale = MIN ((double) width / layout_width, (double) height / layout_height);
-  gtk_snapshot_translate (snapshot,
-                          &GRAPHENE_POINT_INIT ((width - scale * layout_width) / 2,
-                                                (height - scale * layout_height) / 2));
-  gtk_snapshot_scale (snapshot, scale, scale);
-  gtk_snapshot_append_layout (snapshot, self->layout, &(GdkRGBA) { 0, 0, 0, 1 });
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, height),
-                                       self->stops,
-                                       self->n_stops);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_INVERTED_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_INVERTED_ALPHA);
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_ALPHA);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      self->progress = g_value_get_double (value);
-      gtk_widget_queue_draw (GTK_WIDGET (object));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_get_property (GObject     *object,
-                           guint        prop_id,
-                           GValue      *value,
-                           GParamSpec  *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      g_value_set_double (value, self->progress);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_class_init (Demo4WidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo4_widget_dispose;
-  object_class->get_property = demo4_widget_get_property;
-  object_class->set_property = demo4_widget_set_property;
-
-  widget_class->snapshot = demo4_widget_snapshot;
-
-  g_object_class_install_property (object_class, PROP_PROGRESS,
-      g_param_spec_double ("progress", NULL, NULL,
-                           0.0, 1.0, 0.5,
-                           G_PARAM_READWRITE));
-}
-
-GtkWidget *
-demo4_widget_new (void)
-{
-  return g_object_new (DEMO4_TYPE_WIDGET, NULL);
-}
-

demos/gtk-demo/demo4widget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define DEMO4_TYPE_WIDGET (demo4_widget_get_type ())
-G_DECLARE_FINAL_TYPE (Demo4Widget, demo4_widget, DEMO4, WIDGET, GtkWidget)
-
-GtkWidget * demo4_widget_new (void);

demos/gtk-demo/dnd.c

@@ -70,7 +70,7 @@ set_color (CanvasItem *item,
   css = g_strdup_printf ("#%s { background: %s; }", name, str);
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_string (provider, css);
+  gtk_css_provider_load_from_data (provider, css, -1);
   gtk_style_context_add_provider_for_display (gtk_widget_get_display (item->label), GTK_STYLE_PROVIDER (provider), 700);
   item->provider = GTK_STYLE_PROVIDER (provider);
 
@@ -109,21 +109,15 @@ static void
 apply_transform (CanvasItem *item)
 {
   GskTransform *transform;
-  graphene_rect_t bounds;
   double x, y;
 
-  /* Add css padding and margin */
-  if (!gtk_widget_compute_bounds (item->label, item->label, &bounds))
-    return;
-
-  x = bounds.size.width / 2.;
-  y = bounds.size.height / 2.;
-
-  item->r = sqrt (x * x + y * y);
+  x = gtk_widget_get_allocated_width (item->label) / 2.0;
+  y = gtk_widget_get_allocated_height (item->label) / 2.0;
+  item->r = sqrt (x*x + y*y);
 
   transform = gsk_transform_translate (NULL, &(graphene_point_t) { item->r, item->r });
   transform = gsk_transform_rotate (transform, item->angle + item->delta);
-  transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (-x, -y));
+  transform = gsk_transform_translate (transform, &(graphene_point_t) { -x, -y });
 
   gtk_fixed_set_child_transform (GTK_FIXED (item->fixed), item->label, transform);
   gsk_transform_unref (transform);
@@ -330,7 +324,7 @@ canvas_item_start_editing (CanvasItem *item)
   GtkWidget *canvas = gtk_widget_get_parent (GTK_WIDGET (item));
   GtkWidget *entry;
   GtkWidget *scale;
-  graphene_point_t p;
+  double x, y;
 
   if (item->editor)
     return;
@@ -356,17 +350,12 @@ canvas_item_start_editing (CanvasItem *item)
 
   gtk_box_append (GTK_BOX (item->editor), scale);
 
-  if (!gtk_widget_compute_point (GTK_WIDGET (item), canvas, &GRAPHENE_POINT_INIT (0, 0), &p))
-    graphene_point_init (&p, 0, 0);
-  gtk_fixed_put (GTK_FIXED (canvas), item->editor, p.x, p.y + 2 * item->r);
+  gtk_widget_translate_coordinates (GTK_WIDGET (item), canvas, 0, 0, &x, &y);
+  gtk_fixed_put (GTK_FIXED (canvas), item->editor, x, y + 2 * item->r);
   gtk_widget_grab_focus (entry);
 
 }
 
-typedef struct {
-  double x, y;
-} Hotspot;
-
 static GdkContentProvider *
 prepare (GtkDragSource *source,
          double         x,
@@ -374,8 +363,6 @@ prepare (GtkDragSource *source,
 {
   GtkWidget *canvas;
   GtkWidget *item;
-  Hotspot *hotspot;
-  graphene_point_t p;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
@@ -386,13 +373,6 @@ prepare (GtkDragSource *source,
 
   g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
 
-  hotspot = g_new (Hotspot, 1);
-  if (!gtk_widget_compute_point (canvas, item, &GRAPHENE_POINT_INIT (x, y), &p))
-    graphene_point_init (&p, x, y);
-  hotspot->x = p.x;
-  hotspot->y = p.y;
-  g_object_set_data_full (G_OBJECT (canvas), "hotspot", hotspot, g_free);
-
   return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
 }
 
@@ -403,14 +383,12 @@ drag_begin (GtkDragSource *source,
   GtkWidget *canvas;
   CanvasItem *item;
   GdkPaintable *paintable;
-  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
-  hotspot = (Hotspot *) g_object_get_data (G_OBJECT (canvas), "hotspot");
 
   paintable = canvas_item_get_drag_icon (item);
-  gtk_drag_source_set_icon (source, paintable, hotspot->x, hotspot->y);
+  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
   g_object_unref (paintable);
 
   gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);
@@ -765,7 +743,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
         g_string_append_printf (css, ".canvasitem.%s { background: %s; }\n", colors[i], colors[i]);
 
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_string (provider, css->str);
+      gtk_css_provider_load_from_data (provider, css->str, css->len);
       gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                                   GTK_STYLE_PROVIDER (provider),
                                                   800);

demos/gtk-demo/drawingarea.c

@@ -362,7 +362,7 @@ do_drawingarea (GtkWidget *do_widget)
                         G_CALLBACK (scribble_resize), NULL);
 
       drag = gtk_gesture_drag_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), 0);
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
       gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
 
       g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);

demos/gtk-demo/dropdown.c

@@ -369,7 +369,7 @@ match_func (MatchObject *obj,
 }
 
 GtkWidget *
-do_listview_selections (GtkWidget *do_widget)
+do_dropdown (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *button, *box, *spin, *check, *hbox, *label, *entry;

demos/gtk-demo/fishbowl.c

@@ -301,7 +301,7 @@ do_fishbowl (GtkWidget *do_widget)
   if (provider == NULL)
     {
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_string (provider, css);
+      gtk_css_provider_load_from_data (provider, css, -1);
       gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                                   GTK_STYLE_PROVIDER (provider),
                                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

demos/gtk-demo/font_features.c

@@ -1294,18 +1294,18 @@ add_axis (hb_face_t             *hb_face,
 
   axis_label = gtk_label_new (name);
   gtk_widget_set_halign (axis_label, GTK_ALIGN_START);
-  gtk_widget_set_valign (axis_label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (axis_label, GTK_ALIGN_BASELINE);
   gtk_grid_attach (GTK_GRID (demo->variations_grid), axis_label, 0, i, 1, 1);
   adjustment = gtk_adjustment_new (value, ax->min_value, ax->max_value,
                                    1.0, 10.0, 0.0);
   axis_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
   gtk_scale_add_mark (GTK_SCALE (axis_scale), ax->default_value, GTK_POS_TOP, NULL);
-  gtk_widget_set_valign (axis_scale, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (axis_scale, GTK_ALIGN_BASELINE);
   gtk_widget_set_hexpand (axis_scale, TRUE);
   gtk_widget_set_size_request (axis_scale, 100, -1);
   gtk_grid_attach (GTK_GRID (demo->variations_grid), axis_scale, 1, i, 1, 1);
   axis_entry = gtk_entry_new ();
-  gtk_widget_set_valign (axis_entry, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (axis_entry, GTK_ALIGN_BASELINE);
   gtk_editable_set_width_chars (GTK_EDITABLE (axis_entry), 4);
   gtk_editable_set_max_width_chars (GTK_EDITABLE (axis_entry), 4);
   gtk_widget_set_hexpand (axis_entry, FALSE);
@@ -1562,14 +1562,14 @@ update_font_variations (void)
       label = gtk_label_new ("Instance");
       gtk_label_set_xalign (GTK_LABEL (label), 0);
       gtk_widget_set_halign (label, GTK_ALIGN_START);
-      gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+      gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
       gtk_grid_attach (GTK_GRID (demo->variations_grid), label, 0, -1, 1, 1);
 
       strings = gtk_string_list_new (NULL);
       combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
 
       gtk_widget_set_halign (combo, GTK_ALIGN_START);
-      gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE_FILL);
+      gtk_widget_set_valign (combo, GTK_ALIGN_BASELINE);
 
       gtk_string_list_append (strings, "");
 

demos/gtk-demo/fontplane.c

@@ -42,8 +42,8 @@ val_to_xy (GtkFontPlane *plane,
   double u, v;
   int width, height;
 
-  width = gtk_widget_get_width (GTK_WIDGET (plane));
-  height = gtk_widget_get_height (GTK_WIDGET (plane));
+  width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
+  height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
 
   u = adjustment_get_normalized_value (plane->width_adj);
   v = adjustment_get_normalized_value (plane->weight_adj);
@@ -62,8 +62,8 @@ plane_snapshot (GtkWidget   *widget,
   cairo_t *cr;
 
   val_to_xy (plane, &x, &y);
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
+  width = gtk_widget_get_allocated_width (widget);
+  height = gtk_widget_get_allocated_height (widget);
 
   cr = gtk_snapshot_append_cairo (snapshot,
                                   &GRAPHENE_RECT_INIT (0, 0, width, height));
@@ -131,8 +131,8 @@ update_value (GtkFontPlane *plane,
   GtkWidget *widget = GTK_WIDGET (plane);
   double u, v;
 
-  u = CLAMP (x * (1.0 / gtk_widget_get_width (widget)), 0, 1);
-  v = CLAMP (1 - y * (1.0 / gtk_widget_get_height (widget)), 0, 1);
+  u = CLAMP (x * (1.0 / gtk_widget_get_allocated_width (widget)), 0, 1);
+  v = CLAMP (1 - y * (1.0 / gtk_widget_get_allocated_height (widget)), 0, 1);
 
   adjustment_set_normalized_value (plane->width_adj, u);
   adjustment_set_normalized_value (plane->weight_adj, v);

demos/gtk-demo/fontrendering.c

@@ -43,7 +43,6 @@ update_image (void)
   cairo_t *cr;
   GdkPixbuf *pixbuf;
   GdkPixbuf *pixbuf2;
-  GdkTexture *texture;
   cairo_font_options_t *fopt;
   cairo_hint_style_t hintstyle;
   cairo_hint_metrics_t hintmetrics;
@@ -121,17 +120,8 @@ update_image (void)
       cairo_destroy (cr);
       g_object_unref (layout);
 
-      pixbuf = gdk_pixbuf_new_from_data (cairo_image_surface_get_data (surface),
-                                         GDK_COLORSPACE_RGB, TRUE, 8,
-                                         cairo_image_surface_get_width (surface),
-                                         cairo_image_surface_get_height (surface),
-                                         cairo_image_surface_get_stride (surface),
-                                         NULL, NULL);
-
-      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf,
-                                         gdk_pixbuf_get_width (pixbuf) * scale,
-                                         gdk_pixbuf_get_height (pixbuf) * scale,
-                                         GDK_INTERP_NEAREST);
+      pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, cairo_image_surface_get_width (surface), cairo_image_surface_get_height (surface));
+      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf, gdk_pixbuf_get_width (pixbuf) * scale, gdk_pixbuf_get_height (pixbuf) * scale, GDK_INTERP_NEAREST);
 
       g_object_unref (pixbuf);
       cairo_surface_destroy (surface);
@@ -288,24 +278,14 @@ retry:
       pango_layout_iter_free (iter);
       g_object_unref (layout);
 
-      pixbuf = gdk_pixbuf_new_from_data (cairo_image_surface_get_data (surface),
-                                         GDK_COLORSPACE_RGB, TRUE, 8,
-                                         cairo_image_surface_get_width (surface),
-                                         cairo_image_surface_get_height (surface),
-                                         cairo_image_surface_get_stride (surface),
-                                         NULL, NULL);
-
-      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf,
-                                         gdk_pixbuf_get_width (pixbuf) * scale,
-                                         gdk_pixbuf_get_height (pixbuf) * scale,
-                                         GDK_INTERP_NEAREST);
+      pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, cairo_image_surface_get_width (surface), cairo_image_surface_get_height (surface));
+      pixbuf2 = gdk_pixbuf_scale_simple (pixbuf, gdk_pixbuf_get_width (pixbuf) * scale, gdk_pixbuf_get_height (pixbuf) * scale, GDK_INTERP_NEAREST);
       g_object_unref (pixbuf);
       cairo_surface_destroy (surface);
     }
 
-  texture = gdk_texture_new_for_pixbuf (pixbuf2);
-  gtk_picture_set_paintable (GTK_PICTURE (image), GDK_PAINTABLE (texture));
-  g_object_unref (pixbuf2);
+  gtk_picture_set_pixbuf (GTK_PICTURE (image), pixbuf2);
+
   g_object_unref (pixbuf2);
 }
 

demos/gtk-demo/glarea.c

@@ -221,13 +221,16 @@ static void
 realize (GtkWidget *widget)
 {
   const char *vertex_path, *fragment_path;
+  GdkGLContext *context;
 
   gtk_gl_area_make_current (GTK_GL_AREA (widget));
 
   if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
     return;
 
-  if (gtk_gl_area_get_api (GTK_GL_AREA (widget)) == GDK_GL_API_GLES)
+  context = gtk_gl_area_get_context (GTK_GL_AREA (widget));
+
+  if (gdk_gl_context_get_use_es (context))
     {
       vertex_path = "/glarea/glarea-gles.vs.glsl";
       fragment_path = "/glarea/glarea-gles.fs.glsl";

demos/gtk-demo/gltransition.c

@@ -337,7 +337,7 @@ create_gltransition_window (GtkWidget *do_widget)
                    1, 1, 1, 1);
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_string (provider, "button.small { padding: 0; }");
+  gtk_css_provider_load_from_data (provider, "button.small { padding: 0; }", -1);
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

demos/gtk-demo/gskshaderpaintable.h

@@ -27,17 +27,24 @@ G_BEGIN_DECLS
 
 #define GSK_TYPE_SHADER_PAINTABLE (gsk_shader_paintable_get_type ())
 
+GDK_AVAILABLE_IN_ALL
 G_DECLARE_FINAL_TYPE (GskShaderPaintable, gsk_shader_paintable, GSK, SHADER_PAINTABLE, GObject)
 
+GDK_AVAILABLE_IN_ALL
 GdkPaintable *   gsk_shader_paintable_new              (GskGLShader        *shader,
                                                         GBytes             *data);
 
+GDK_AVAILABLE_IN_ALL
 GskGLShader *    gsk_shader_paintable_get_shader       (GskShaderPaintable *self);
+GDK_AVAILABLE_IN_ALL
 void             gsk_shader_paintable_set_shader       (GskShaderPaintable *self,
                                                         GskGLShader        *shader);
+GDK_AVAILABLE_IN_ALL
 GBytes *         gsk_shader_paintable_get_args         (GskShaderPaintable *self);
+GDK_AVAILABLE_IN_ALL
 void             gsk_shader_paintable_set_args         (GskShaderPaintable *self,
                                                         GBytes             *data);
+GDK_AVAILABLE_IN_ALL
 void             gsk_shader_paintable_update_time      (GskShaderPaintable *self,
                                                         int                 time_idx,
                                                         gint64              frame_time);

demos/gtk-demo/gtkgears.c

@@ -48,16 +48,14 @@
 #define VERTICES_PER_TOOTH 34
 #define GEAR_VERTEX_STRIDE 6
 
-static inline void
-_sincos (double x, double *_sin, double *_cos)
+#ifndef HAVE_SINCOS
+static void
+sincos (double x, double *_sin, double *_cos)
 {
-#ifdef HAVE_SINCOS
-  sincos (x, _sin, _cos);
-#else
   *_sin = sin (x);
   *_cos = cos (x);
-#endif
 }
+#endif
 
 /**
  * Struct describing the vertices in triangle strip
@@ -309,11 +307,11 @@ create_gear (GLfloat inner_radius,
     struct point p[7];
 
     /* Calculate needed sin/cos for various angles */
-    _sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
+    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
+    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
+    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
+    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
+    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
 
     GEAR_POINT(p[0], r2, 1);
     GEAR_POINT(p[1], r2, 2);
@@ -522,7 +520,7 @@ void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloa
    identity(tmp);
 
    deltaZ = zFar - zNear;
-   _sincos(radians, &sine, &cosine);
+   sincos(radians, &sine, &cosine);
 
    if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
       return;
@@ -737,6 +735,7 @@ gtk_gears_realize (GtkWidget *widget)
   GtkGLArea *glarea = GTK_GL_AREA (widget);
   GtkGears *gears = GTK_GEARS (widget);
   GtkGearsPrivate *priv = gtk_gears_get_instance_private (gears);
+  GdkGLContext *context;
   GLuint vao, v, f, program;
   const char *p;
   char msg[512];
@@ -747,6 +746,8 @@ gtk_gears_realize (GtkWidget *widget)
   if (gtk_gl_area_get_error (glarea) != NULL)
     return;
 
+  context = gtk_gl_area_get_context (glarea);
+
   glEnable (GL_CULL_FACE);
   glEnable (GL_DEPTH_TEST);
 
@@ -756,7 +757,7 @@ gtk_gears_realize (GtkWidget *widget)
   priv->vao = vao;
 
   /* Compile the vertex shader */
-  if (gtk_gl_area_get_api (glarea) == GDK_GL_API_GLES)
+  if (gdk_gl_context_get_use_es (context))
     p = vertex_shader_gles;
   else
     p = vertex_shader_gl;
@@ -767,7 +768,7 @@ gtk_gears_realize (GtkWidget *widget)
   g_debug ("vertex shader info: %s\n", msg);
 
   /* Compile the fragment shader */
-  if (gtk_gl_area_get_api (glarea) == GDK_GL_API_GLES)
+  if (gdk_gl_context_get_use_es (context))
     p = fragment_shader_gles;
   else
     p = fragment_shader_gl;

demos/gtk-demo/hsla.c

@@ -1,146 +0,0 @@
-#include <gdk/gdk.h>
-#include "hsla.h"
-
-void
-_gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
-                          const GdkRGBA *rgba)
-{
-  float min;
-  float max;
-  float red;
-  float green;
-  float blue;
-  float delta;
-
-  g_return_if_fail (hsla != NULL);
-  g_return_if_fail (rgba != NULL);
-
-  red = rgba->red;
-  green = rgba->green;
-  blue = rgba->blue;
-
-  if (red > green)
-    {
-      if (red > blue)
-        max = red;
-      else
-        max = blue;
-
-      if (green < blue)
-        min = green;
-      else
-        min = blue;
-    }
-  else
-    {
-      if (green > blue)
-        max = green;
-      else
-        max = blue;
-
-      if (red < blue)
-        min = red;
-      else
-        min = blue;
-    }
-
-  hsla->lightness = (max + min) / 2;
-  hsla->saturation = 0;
-  hsla->hue = 0;
-  hsla->alpha = rgba->alpha;
-
-  if (max != min)
-    {
-      if (hsla->lightness <= 0.5)
-        hsla->saturation = (max - min) / (max + min);
-      else
-        hsla->saturation = (max - min) / (2 - max - min);
-
-      delta = max -min;
-      if (red == max)
-        hsla->hue = (green - blue) / delta;
-      else if (green == max)
-        hsla->hue = 2 + (blue - red) / delta;
-      else if (blue == max)
-        hsla->hue = 4 + (red - green) / delta;
-
-      hsla->hue *= 60;
-      if (hsla->hue < 0.0)
-        hsla->hue += 360;
-    }
-}
-
-void
-_gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
-                          const GdkHSLA *hsla)
-{
-  float hue;
-  float lightness;
-  float saturation;
-  float m1, m2;
-
-  lightness = hsla->lightness;
-  saturation = hsla->saturation;
-
-  if (lightness <= 0.5)
-    m2 = lightness * (1 + saturation);
-  else
-    m2 = lightness + saturation - lightness * saturation;
-  m1 = 2 * lightness - m2;
-
-  rgba->alpha = hsla->alpha;
-
-  if (saturation == 0)
-    {
-      rgba->red = lightness;
-      rgba->green = lightness;
-      rgba->blue = lightness;
-    }
-  else
-    {
-      hue = hsla->hue + 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->red = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->red = m2;
-      else if (hue < 240)
-        rgba->red = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->red = m1;
-
-      hue = hsla->hue;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->green = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->green = m2;
-      else if (hue < 240)
-        rgba->green = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->green = m1;
-
-      hue = hsla->hue - 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->blue = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->blue = m2;
-      else if (hue < 240)
-        rgba->blue = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->blue = m1;
-    }
-}

demos/gtk-demo/hsla.h

@@ -1,15 +0,0 @@
-#pragma once
-
-typedef struct _GdkHSLA GdkHSLA;
-
-struct _GdkHSLA {
-  float hue;
-  float saturation;
-  float lightness;
-  float alpha;
-};
-
-void            _gdk_hsla_init_from_rgba    (GdkHSLA          *hsla,
-                                             const GdkRGBA    *rgba);
-void            _gdk_rgba_init_from_hsla    (GdkRGBA          *rgba,
-                                             const GdkHSLA    *hsla);

demos/gtk-demo/iconscroll.c

@@ -370,7 +370,7 @@ do_iconscroll (GtkWidget *do_widget)
       set_widget_type (0);
 
       label = GTK_WIDGET (gtk_builder_get_object (builder, "fps_label"));
-      id = g_timeout_add_full (G_PRIORITY_HIGH, 500, update_fps, label, NULL);
+      id = g_timeout_add (500, update_fps, label);
       g_object_set_data_full (G_OBJECT (label), "timeout",
                               GUINT_TO_POINTER (id), remove_timeout);
 

demos/gtk-demo/image_scaling.c

@@ -1,191 +0,0 @@
-/* Image Scaling
- * #Keywords: zoom, scale, filter, action, menu
- *
- * The custom widget we create here is similar to a GtkPicture,
- * but allows setting a zoom level and filtering mode for the
- * displayed paintable.
- *
- * It also demonstrates how to add a context menu to a custom
- * widget and connect it with widget actions.
- *
- * The context menu has items to change the zoom level.
- */
-
-#include <gtk/gtk.h>
-#include "demo3widget.h"
-
-static void
-file_opened (GObject      *source,
-             GAsyncResult *result,
-             void         *data)
-{
-  GFile *file;
-  GError *error = NULL;
-  GdkTexture *texture;
-
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
-
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  texture = gdk_texture_new_from_file (file, &error);
-  g_object_unref (file);
-  if (!texture)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  g_object_set (G_OBJECT (data), "texture", texture, NULL);
-  g_object_unref (texture);
-}
-
-static void
-open_file (GtkWidget *picker,
-           GtkWidget *demo)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (picker));
-  GtkFileDialog *dialog;
-  GtkFileFilter *filter;
-  GListStore *filters;
-
-  dialog = gtk_file_dialog_new ();
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, "Images");
-  gtk_file_filter_add_pixbuf_formats (filter);
-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
-  g_object_unref (filters);
-
-  gtk_file_dialog_open (dialog, parent, NULL, file_opened, demo);
-
-  g_object_unref (dialog);
-}
-
-static void
-rotate (GtkWidget *button,
-        GtkWidget *demo)
-{
-  float angle;
-
-  g_object_get (demo, "angle", &angle, NULL);
-
-  angle = fmodf (angle + 90.f, 360.f);
-
-  g_object_set (demo, "angle", angle, NULL);
-}
-
-static gboolean
-transform_to (GBinding     *binding,
-              const GValue *src,
-              GValue       *dest,
-              gpointer      user_data)
-{
-  double from;
-  float to;
-
-  from = g_value_get_double (src);
-  to = (float) pow (2., from);
-  g_value_set_float (dest, to);
-
-  return TRUE;
-}
-
-static gboolean
-transform_from (GBinding     *binding,
-                const GValue *src,
-                GValue       *dest,
-                gpointer      user_data)
-{
-  float to;
-  double from;
-
-  to = g_value_get_float (src);
-  from = log2 (to);
-  g_value_set_double (dest, from);
-
-  return TRUE;
-}
-
-GtkWidget *
-do_image_scaling (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *box2;
-      GtkWidget *sw;
-      GtkWidget *widget;
-      GtkWidget *scale;
-      GtkWidget *dropdown;
-      GtkWidget *button;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Image Scaling");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      sw = gtk_scrolled_window_new ();
-      gtk_widget_set_vexpand (sw, TRUE);
-      gtk_box_append (GTK_BOX (box), sw);
-
-      widget = demo3_widget_new ("/transparent/portland-rose.jpg");
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);
-
-      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), box2);
-
-      button = gtk_button_new_from_icon_name ("document-open-symbolic");
-      gtk_widget_set_tooltip_text (button, "Open File");
-      g_signal_connect (button, "clicked", G_CALLBACK (open_file), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      button = gtk_button_new_from_icon_name ("object-rotate-right-symbolic");
-      gtk_widget_set_tooltip_text (button, "Rotate");
-      g_signal_connect (button, "clicked", G_CALLBACK (rotate), widget);
-      gtk_box_append (GTK_BOX (box2), button);
-
-      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_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_box_append (GTK_BOX (box2), dropdown);
-
-      g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);
-
-      g_object_bind_property_full (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
-                                   widget, "scale",
-                                   G_BINDING_BIDIRECTIONAL,
-                                   transform_to,
-                                   transform_from,
-                                   NULL, NULL);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/images.c

@@ -30,7 +30,6 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
 {
   GdkPixbuf *pixbuf;
   GtkWidget *picture;
-  GdkTexture *texture;
 
   picture = GTK_WIDGET (data);
 
@@ -41,9 +40,7 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
    */
   gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
 
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
-  gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
+  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
 }
 
 static void
@@ -54,18 +51,22 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                               int                  height,
                               gpointer     data)
 {
-  GtkWidget *picture = GTK_WIDGET (data);
-  GdkTexture *texture;
+  GtkWidget *picture;
+  GdkPixbuf *pixbuf;
 
-  texture = gdk_texture_new_for_pixbuf (gdk_pixbuf_loader_get_pixbuf (loader));
-  gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
+  picture = GTK_WIDGET (data);
+
+  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+  gtk_picture_set_pixbuf (GTK_PICTURE (picture), NULL);
+  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
 }
 
 static int
 progressive_timeout (gpointer data)
 {
-  GtkWidget *picture = GTK_WIDGET (data);
+  GtkWidget *picture;
+
+  picture = GTK_WIDGET (data);
 
   /* This shows off fully-paranoid error handling, so looks scary.
    * You could factor out the error handling code into a nice separate
@@ -86,7 +87,7 @@ progressive_timeout (gpointer data)
 
           dialog = gtk_alert_dialog_new ("Failure reading image file 'alphatest.png': %s",
                                          error->message);
-          gtk_alert_dialog_show (dialog, NULL);
+          gtk_alert_dialog_show (dialog, NULL, NULL);
           g_object_unref (dialog);
           g_error_free (error);
 
@@ -106,7 +107,7 @@ progressive_timeout (gpointer data)
 
           dialog = gtk_alert_dialog_new ("Failed to load image: %s",
                                          error->message);
-          gtk_alert_dialog_show (dialog, NULL);
+          gtk_alert_dialog_show (dialog, NULL, NULL);
           g_object_unref (dialog);
           g_error_free (error);
 
@@ -131,7 +132,7 @@ progressive_timeout (gpointer data)
 
               dialog = gtk_alert_dialog_new ("Failed to load image: %s",
                                              error->message);
-              gtk_alert_dialog_show (dialog, NULL);
+              gtk_alert_dialog_show (dialog, NULL, NULL);
               g_object_unref (dialog);
               g_error_free (error);
 
@@ -159,7 +160,7 @@ progressive_timeout (gpointer data)
 
               dialog = gtk_alert_dialog_new ("Failed to load image: %s",
                                              error->message);
-              gtk_alert_dialog_show (dialog, NULL);
+              gtk_alert_dialog_show (dialog, NULL, NULL);
               g_object_unref (dialog);
               g_error_free (error);
 
@@ -187,7 +188,7 @@ progressive_timeout (gpointer data)
 
           dialog = gtk_alert_dialog_new ("%s",
                                          error->message);
-          gtk_alert_dialog_show (dialog, NULL);
+          gtk_alert_dialog_show (dialog, NULL, NULL);
           g_object_unref (dialog);
           g_error_free (error);
 

demos/gtk-demo/infobar.c

@@ -27,7 +27,7 @@ on_bar_response (GtkInfoBar *info_bar,
   detail = g_strdup_printf ("Your response has been %d", response_id);
   gtk_alert_dialog_set_detail (dialog, detail);
   g_free (detail);
-  gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (info_bar))));
+  gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (info_bar))), NULL);
   g_object_unref (dialog);
 }
 

demos/gtk-demo/links.c

@@ -21,7 +21,7 @@ activate_link (GtkWidget  *label,
                                    "The term ‘keynav’ is a shorthand for "
                                    "keyboard navigation and refers to the process of using "
                                    "a program (exclusively) via keyboard input.");
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (label)));
+      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (label)), NULL);
       g_object_unref (dialog);
 
       return TRUE;

demos/gtk-demo/listbox.ui

@@ -64,8 +64,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="short_time_label">
-                <property name="hexpand">1</property>
-                <property name="xalign">1</property>
                 <property name="valign">baseline</property>
                 <property name="label" translatable="yes">38m</property>
                 <style>

demos/gtk-demo/listbox_controls.ui

@@ -30,86 +30,90 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkListBox">
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="row_activated"/>
-                    <style>
-                      <class name="rich-list"/>
-                      <class name="boxed-list"/>
-                    </style>
-
+                  <object class="GtkFrame">
                     <child>
-                      <object class="GtkListBoxRow">
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+                        <property name="show-separators">1</property>
+                        <signal name="row-activated" handler="row_activated"/>
+                        <style>
+                          <class name="rich-list"/>
+                        </style>
+
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="switch_label">
-                                <property name="label" translatable="yes">Switch</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="switch">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="switch_label">
+                                    <property name="label" translatable="yes">Switch</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSwitch" id="switch">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
 
-                    <child>
-                      <object class="GtkListBoxRow">
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="check_label">
-                                <property name="label" translatable="yes">Check</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="check">
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="active">1</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="check_label">
+                                    <property name="label" translatable="yes">Check</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="check">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="active">1</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
                         </child>
-                      </object>
-                    </child>
 
-                    <child>
-                      <object class="GtkListBoxRow">
                         <child>
-                          <object class="GtkBox">
+                          <object class="GtkListBoxRow">
                             <child>
-                              <object class="GtkLabel" id="image_label">
-                                <property name="label" translatable="yes">Click here!</property>
-                                <property name="xalign">0</property>
-                                <property name="halign">start</property>
-                                <property name="valign">center</property>
-                                <property name="hexpand">1</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkImage" id="image">
-                                <property name="icon-name">object-select-symbolic</property>
-                                <property name="halign">end</property>
-                                <property name="valign">center</property>
-                                <property name="margin-start">10</property>
-                                <property name="margin-end">10</property>
-                                <property name="opacity">0</property>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="image_label">
+                                    <property name="label" translatable="yes">Click here!</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkImage" id="image">
+                                    <property name="icon-name">object-select-symbolic</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">10</property>
+                                    <property name="margin-end">10</property>
+                                    <property name="opacity">0</property>
+                                  </object>
+                                </child>
                               </object>
                             </child>
                           </object>
@@ -130,142 +134,146 @@
                     </style>
                   </object>
                 </child>
-                  <child>
-                    <object class="GtkListBox">
-                      <property name="selection-mode">none</property>
-                      <style>
-                        <class name="rich-list"/>
-                        <class name="boxed-list"/>
-                      </style>
+                <child>
+                  <object class="GtkFrame">
+                    <child>
+                      <object class="GtkListBox">
+                        <property name="selection-mode">none</property>
+                        <property name="show-separators">1</property>
+                        <style>
+                          <class name="rich-list"/>
+                        </style>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="scale_label">
-                                  <property name="label" translatable="yes">Scale</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkScale">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="draw-value">0</property>
-                                  <property name="width-request">150</property>
-                                  <property name="adjustment">
-                                    <object class="GtkAdjustment">
-                                      <property name="upper">100</property>
-                                      <property name="value">50</property>
-                                      <property name="step-increment">1</property>
-                                      <property name="page-increment">10</property>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="scale_label">
+                                    <property name="label" translatable="yes">Scale</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkScale">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="draw-value">0</property>
+                                    <property name="width-request">150</property>
+                                    <property name="adjustment">
+                                      <object class="GtkAdjustment">
+                                        <property name="upper">100</property>
+                                        <property name="value">50</property>
+                                        <property name="step-increment">1</property>
+                                        <property name="page-increment">10</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="spin_label">
-                                  <property name="label" translatable="yes">Spinbutton</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkSpinButton">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="adjustment">
-                                    <object class="GtkAdjustment">
-                                      <property name="upper">100</property>
-                                      <property name="value">50</property>
-                                      <property name="step-increment">1</property>
-                                      <property name="page-increment">10</property>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="dropdown_label">
-                                  <property name="label" translatable="yes">Dropdown</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkDropDown">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="model">
-                                    <object class="GtkStringList">
-                                      <items>
-                                        <item>Choice 1</item>
-                                        <item>Choice 2</item>
-                                        <item>Choice 3</item>
-                                        <item>Choice 4</item>
-                                      </items>
-                                    </object>
-                                  </property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="spin_label">
+                                    <property name="label" translatable="yes">Spinbutton</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="adjustment">
+                                      <object class="GtkAdjustment">
+                                        <property name="upper">100</property>
+                                        <property name="value">50</property>
+                                        <property name="step-increment">1</property>
+                                        <property name="page-increment">10</property>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="dropdown_label">
+                                    <property name="label" translatable="yes">Dropdown</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkDropDown">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="model">
+                                      <object class="GtkStringList">
+                                        <items>
+                                          <item>Choice 1</item>
+                                          <item>Choice 2</item>
+                                          <item>Choice 3</item>
+                                          <item>Choice 4</item>
+                                        </items>
+                                      </object>
+                                    </property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
-                      <child>
-                        <object class="GtkListBoxRow">
-                          <property name="activatable">0</property>
-                          <child>
-                            <object class="GtkBox">
-                              <child>
-                                <object class="GtkLabel" id="entry_label">
-                                  <property name="label" translatable="yes">Entry</property>
-                                  <property name="xalign">0</property>
-                                  <property name="halign">start</property>
-                                  <property name="valign">center</property>
-                                  <property name="hexpand">1</property>
-                                </object>
-                              </child>
-                              <child>
-                                <object class="GtkEntry">
-                                  <property name="halign">end</property>
-                                  <property name="valign">center</property>
-                                  <property name="placeholder-text">Type here…</property>
-                                </object>
-                              </child>
-                            </object>
-                          </child>
-                        </object>
-                      </child>
+                        <child>
+                          <object class="GtkListBoxRow">
+                            <property name="activatable">0</property>
+                            <child>
+                              <object class="GtkBox">
+                                <child>
+                                  <object class="GtkLabel" id="entry_label">
+                                    <property name="label" translatable="yes">Entry</property>
+                                    <property name="xalign">0</property>
+                                    <property name="halign">start</property>
+                                    <property name="valign">center</property>
+                                    <property name="hexpand">1</property>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry">
+                                    <property name="halign">end</property>
+                                    <property name="valign">center</property>
+                                    <property name="placeholder-text">Type here…</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
 
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>

demos/gtk-demo/listview_applauncher.c

@@ -124,7 +124,7 @@ activate_cb (GtkListView  *list,
        */
       dialog = gtk_alert_dialog_new ("Could not launch %s", g_app_info_get_display_name (app_info));
       gtk_alert_dialog_set_detail (dialog, error->message);
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (list))));
+      gtk_alert_dialog_show (dialog, GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (list))), NULL);
       g_object_unref (dialog);
       g_clear_error (&error);
     }

demos/gtk-demo/listview_settings.c

@@ -14,15 +14,145 @@
 
 #include <gtk/gtk.h>
 
-#include "settings-key.h"
+#include <stdlib.h>
+
+/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
+typedef struct _SettingsKey SettingsKey;
+struct _SettingsKey
+{
+  GObject parent_instance;
+
+  GSettings *settings;
+  GSettingsSchemaKey *key;
+};
+
+enum {
+  PROP_0,
+  PROP_NAME,
+  PROP_SUMMARY,
+  PROP_DESCRIPTION,
+  PROP_VALUE,
+  PROP_TYPE,
+  PROP_DEFAULT_VALUE,
+
+  N_PROPS
+};
+
+#define SETTINGS_TYPE_KEY (settings_key_get_type ())
+G_DECLARE_FINAL_TYPE (SettingsKey, settings_key, SETTINGS, KEY, GObject);
+
+G_DEFINE_TYPE (SettingsKey, settings_key, G_TYPE_OBJECT);
+static GParamSpec *properties[N_PROPS] = { NULL, };
 
 static void
-item_value_changed (GtkEditableLabel  *label,
-                    GParamSpec        *pspec,
-                    GtkColumnViewCell *cell)
+settings_key_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  SettingsKey *self = SETTINGS_KEY (object);
+
+  switch (property_id)
+    {
+    case PROP_DESCRIPTION:
+      g_value_set_string (value, g_settings_schema_key_get_description (self->key));
+      break;
+
+    case PROP_NAME:
+      g_value_set_string (value, g_settings_schema_key_get_name (self->key));
+      break;
+
+    case PROP_SUMMARY:
+      g_value_set_string (value, g_settings_schema_key_get_summary (self->key));
+      break;
+
+    case PROP_VALUE:
+      {
+        GVariant *variant = g_settings_get_value (self->settings, g_settings_schema_key_get_name (self->key));
+        g_value_take_string (value, g_variant_print (variant, FALSE));
+        g_variant_unref (variant);
+      }
+      break;
+
+    case PROP_TYPE:
+      {
+        const GVariantType *type = g_settings_schema_key_get_value_type (self->key);
+        g_value_set_string (value, g_variant_type_peek_string (type));
+      }
+      break;
+
+    case PROP_DEFAULT_VALUE:
+      {
+        GVariant *variant = g_settings_schema_key_get_default_value (self->key);
+        g_value_take_string (value, g_variant_print (variant, FALSE));
+        g_variant_unref (variant);
+      }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+settings_key_finalize (GObject *object)
+{
+  SettingsKey *self = SETTINGS_KEY (object);
+
+  g_object_unref (self->settings);
+  g_settings_schema_key_unref (self->key);
+
+  G_OBJECT_CLASS (settings_key_parent_class)->finalize (object);
+}
+
+static void
+settings_key_class_init (SettingsKeyClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = settings_key_finalize;
+  gobject_class->get_property = settings_key_get_property;
+
+  properties[PROP_DESCRIPTION] =
+    g_param_spec_string ("description", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_NAME] =
+    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_SUMMARY] =
+    g_param_spec_string ("summary", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_VALUE] =
+    g_param_spec_string ("value", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_TYPE] =
+    g_param_spec_string ("type", NULL, NULL, NULL, G_PARAM_READABLE);
+  properties[PROP_DEFAULT_VALUE] =
+    g_param_spec_string ("default-value", NULL, NULL, NULL, G_PARAM_READABLE);
+
+  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+}
+
+static void
+settings_key_init (SettingsKey *self)
+{
+}
+
+static SettingsKey *
+settings_key_new (GSettings          *settings,
+                  GSettingsSchemaKey *key)
+{
+  SettingsKey *result = g_object_new (SETTINGS_TYPE_KEY, NULL);
+
+  result->settings = g_object_ref (settings);
+  result->key = g_settings_schema_key_ref (key);
+
+  return result;
+}
+
+static void
+item_value_changed (GtkEditableLabel *label,
+                    GParamSpec       *pspec,
+                    GtkListItem      *item)
 {
   SettingsKey *self;
-  GSettingsSchemaKey *key;
   const char *text;
   const GVariantType *type;
   GVariant *variant;
@@ -32,11 +162,11 @@ item_value_changed (GtkEditableLabel  *label,
 
   text = gtk_editable_get_text (GTK_EDITABLE (label));
 
-  self = gtk_column_view_cell_get_item (cell);
-  key = settings_key_get_key (self);
+  g_object_get (item, "item", &self, NULL);
+  g_object_unref (self);
 
-  type = g_settings_schema_key_get_value_type (key);
-  name = g_settings_schema_key_get_name (key);
+  type = g_settings_schema_key_get_value_type (self->key);
+  name = g_settings_schema_key_get_name (self->key);
 
   variant = g_variant_parse (type, text, NULL, NULL, &error);
   if (!variant)
@@ -46,13 +176,13 @@ item_value_changed (GtkEditableLabel  *label,
       goto revert;
     }
 
-  if (!g_settings_schema_key_range_check (key, variant))
+  if (!g_settings_schema_key_range_check (self->key, variant))
     {
       g_warning ("Not a valid value for %s", name);
       goto revert;
     }
 
-  g_settings_set_value (settings_key_get_settings (self), name, variant);
+  g_settings_set_value (self->settings, name, variant);
   g_variant_unref (variant);
   return;
 

demos/gtk-demo/listview_settings.ui

@@ -20,7 +20,6 @@
           <object class="GtkScrolledWindow">
             <child>
               <object class="GtkListView" id="listview">
-                <property name="tab-behavior">item</property>
                 <style>
                   <class name="navigation-sidebar"/>
                 </style>
@@ -77,7 +76,6 @@
                 <property name="vexpand">1</property>
                 <child>
                   <object class="GtkColumnView" id="columnview">
-                    <property name="tab-behavior">cell</property>
                     <style>
                       <class name="data-table"/>
                     </style>
@@ -90,13 +88,13 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <binding name="label">
           <lookup name="name" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>
@@ -118,12 +116,12 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkEditableLabel">
         <binding name="text">
           <lookup name="value" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
         <signal name="notify::label" handler="item_value_changed"/>
@@ -146,13 +144,13 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <binding name="label">
           <lookup name="type" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>
@@ -175,13 +173,13 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <binding name="label">
           <lookup name="default-value" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>
@@ -205,14 +203,14 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <property name="wrap">1</property>
         <binding name="label">
           <lookup name="summary" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>
@@ -236,14 +234,14 @@
                             <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkColumnViewCell">
+  <template class="GtkListItem">
     <property name="child">
       <object class="GtkLabel">
         <property name="xalign">0</property>
         <property name="wrap">1</property>
         <binding name="label">
           <lookup name="description" type="SettingsKey">
-            <lookup name="item">GtkColumnViewCell</lookup>
+            <lookup name="item">GtkListItem</lookup>
           </lookup>
         </binding>
       </object>

demos/gtk-demo/listview_settings2.c

@@ -1,230 +0,0 @@
-/* Lists/Alternative Settings
- * #Keywords: GtkListHeaderFactory, GtkSectionModel
- *
- * This demo shows an alternative settings viewer for GSettings.
- *
- * It demonstrates how to implement support for sections with GtkListView.
- *
- * It also shows how to quickly flatten a large tree of items into a list
- * that can be filtered to find the items one is looking for.
- */
-
-#include <gtk/gtk.h>
-
-#include "settings-key.h"
-
-static void
-item_value_changed (GtkEditableLabel  *label,
-                    GParamSpec        *pspec,
-                    GtkColumnViewCell *cell)
-{
-  SettingsKey *self;
-  GSettingsSchemaKey *key;
-  const char *text;
-  const GVariantType *type;
-  GVariant *variant;
-  GError *error = NULL;
-  const char *name;
-  char *value;
-
-  text = gtk_editable_get_text (GTK_EDITABLE (label));
-
-  self = gtk_column_view_cell_get_item (cell);
-  key = settings_key_get_key (self);
-
-  type = g_settings_schema_key_get_value_type (key);
-  name = g_settings_schema_key_get_name (key);
-
-  variant = g_variant_parse (type, text, NULL, NULL, &error);
-  if (!variant)
-    {
-      g_warning ("%s", error->message);
-      g_clear_error (&error);
-      goto revert;
-    }
-
-  if (!g_settings_schema_key_range_check (key, variant))
-    {
-      g_warning ("Not a valid value for %s", name);
-      goto revert;
-    }
-
-  g_settings_set_value (settings_key_get_settings (self), name, variant);
-  g_variant_unref (variant);
-  return;
-
-revert:
-  gtk_widget_error_bell (GTK_WIDGET (label));
-
-  g_object_get (self, "value", &value, NULL);
-  gtk_editable_set_text (GTK_EDITABLE (label), value);
-  g_free (value);
-}
-
-static int
-strvcmp (gconstpointer p1,
-         gconstpointer p2)
-{
-  const char * const *s1 = p1;
-  const char * const *s2 = p2;
-
-  return strcmp (*s1, *s2);
-}
-
-static gpointer
-map_settings_to_keys (gpointer item,
-                      gpointer unused)
-{
-  GSettings *settings = item;
-  GSettingsSchema *schema;
-  GListStore *store;
-  char **keys;
-  guint i;
-
-  g_object_get (settings, "settings-schema", &schema, NULL);
-
-  store = g_list_store_new (SETTINGS_TYPE_KEY);
-
-  keys = g_settings_schema_list_keys (schema);
-
-  for (i = 0; keys[i] != NULL; i++)
-    {
-      GSettingsSchemaKey *almost_there = g_settings_schema_get_key (schema, keys[i]);
-      SettingsKey *finally = settings_key_new (settings, almost_there);
-      g_list_store_append (store, finally);
-      g_object_unref (finally);
-      g_settings_schema_key_unref (almost_there);
-    }
-
-  g_strfreev (keys);
-  g_settings_schema_unref (schema);
-  g_object_unref (settings);
-
-  return store;
-}
-
-static GListModel *
-create_settings_model (gpointer item,
-                       gpointer unused)
-{
-  GSettings *settings = item;
-  char **schemas;
-  GListStore *result;
-  guint i;
-
-  if (settings == NULL)
-    {
-      g_settings_schema_source_list_schemas (g_settings_schema_source_get_default (),
-                                             TRUE,
-                                             &schemas,
-                                             NULL);
-    }
-  else
-    {
-      schemas = g_settings_list_children (settings);
-    }
-
-  if (schemas == NULL || schemas[0] == NULL)
-    {
-      g_free (schemas);
-      return NULL;
-    }
-
-  qsort (schemas, g_strv_length (schemas), sizeof (char *), strvcmp);
-
-  result = g_list_store_new (G_TYPE_SETTINGS);
-  for (i = 0;  schemas[i] != NULL; i++)
-    {
-      GSettings *child;
-
-      if (settings == NULL)
-        child = g_settings_new (schemas[i]);
-      else
-        child = g_settings_get_child (settings, schemas[i]);
-
-      g_list_store_append (result, child);
-      g_object_unref (child);
-    }
-
-  g_strfreev (schemas);
-
-  return G_LIST_MODEL (result);
-}
-
-static void
-search_enabled (GtkSearchEntry *entry)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-}
-
-static void
-stop_search (GtkSearchEntry *entry,
-             gpointer data)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_settings2 (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkListView *listview;
-      GListModel *model;
-      GtkTreeListModel *treemodel;
-      GtkNoSelection *selection;
-      GtkBuilderScope *scope;
-      GtkBuilder *builder;
-      GError *error = NULL;
-      GtkFilter *filter;
-
-      g_type_ensure (SETTINGS_TYPE_KEY);
-
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (scope, search_enabled);
-      gtk_builder_cscope_add_callback (scope, stop_search);
-      gtk_builder_cscope_add_callback (scope, settings_key_get_search_string);
-      gtk_builder_cscope_add_callback (scope, item_value_changed);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      g_object_unref (scope);
-
-      gtk_builder_add_from_resource (builder, "/listview_settings2/listview_settings2.ui", &error);
-      g_assert_no_error (error);
-
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      listview = GTK_LIST_VIEW (gtk_builder_get_object (builder, "listview"));
-      filter = GTK_FILTER (gtk_builder_get_object (builder, "filter"));
-
-      model = create_settings_model (NULL, NULL);
-      treemodel = gtk_tree_list_model_new (model,
-                                           TRUE,
-                                           TRUE,
-                                           create_settings_model,
-                                           NULL,
-                                           NULL);
-      model = G_LIST_MODEL (gtk_map_list_model_new (G_LIST_MODEL (treemodel), map_settings_to_keys, NULL, NULL));
-      model = G_LIST_MODEL (gtk_flatten_list_model_new (model));
-      model = G_LIST_MODEL (gtk_filter_list_model_new (model, g_object_ref (filter)));
-      selection = gtk_no_selection_new (model);
-
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), GTK_SELECTION_MODEL (selection));
-      g_object_unref (selection);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/listview_settings2.ui

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkStringFilter" id="filter">
-    <property name="expression">
-      <closure type="gchararray" function="settings_key_get_search_string" />
-    </property>
-    <property name="search" bind-source="entry" bind-property="text" />
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Settings</property>
-    <property name="default-width">640</property>
-    <property name="default-height">480</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <child type="end">
-          <object class="GtkToggleButton" id="search_button">
-            <property name="icon-name">system-search-symbolic</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkSearchBar">
-            <property name="search-mode-enabled" bind-source="search_button" bind-property="active" bind-flags="bidirectional"/>
-            <signal name="notify::search-mode-enabled" handler="search_enabled" object="entry"/>
-            <child>
-              <object class="GtkSearchEntry" id="entry">
-                <signal name="stop-search" handler="stop_search"/>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow">
-            <child>
-              <object class="GtkListView" id="listview">
-                <property name="vexpand">1</property>
-                <style>
-                  <class name="rich-list"/>
-                </style>
-                <property name="factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="xalign">0</property>
-                <binding name="label">
-                  <lookup name="name" type="SettingsKey">
-                    <lookup name="item">GtkListItem</lookup>
-                  </lookup>
-                </binding>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <style>
-                  <class name="dim-label"/>
-                </style>
-                <property name="xalign">0</property>
-                <property name="ellipsize">end</property>
-                <binding name="label">
-                  <lookup name="summary" type="SettingsKey">
-                    <lookup name="item">GtkListItem</lookup>
-                  </lookup>
-                </binding>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry">
-            <property name="hexpand">1</property>
-            <property name="halign">end</property>
-            <binding name="text">
-              <lookup name="value" type="SettingsKey">
-                <lookup name="item">GtkListItem</lookup>
-              </lookup>
-            </binding>
-            <signal name="notify::label" handler="item_value_changed"/>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-                    ]]></property>
-                  </object>
-                </property>
-                <property name="header-factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListHeader">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="schema" type="GSettings">
-            <lookup name="settings" type="SettingsKey">
-              <lookup name="item">GtkListHeader</lookup>
-            </lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                    ]]></property>
-                  </object>
-                </property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

demos/gtk-demo/listview_ucd.c

@@ -367,7 +367,7 @@ do_listview_ucd (GtkWidget *do_widget)
       gtk_label_set_width_chars (GTK_LABEL (label), 2);
       gtk_widget_add_css_class (label, "enormous");
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_string (provider, "label.enormous { font-size: 80px; }");
+      gtk_css_provider_load_from_data (provider, "label.enormous { font-size: 80px; }", -1);
       gtk_style_context_add_provider_for_display (gdk_display_get_default (), GTK_STYLE_PROVIDER (provider), 800);
       gtk_widget_set_hexpand (label, TRUE);
       gtk_box_append (GTK_BOX (box), label);

demos/gtk-demo/listview_words.c

@@ -167,6 +167,7 @@ file_open_cb (GtkWidget     *button,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_root (button)),
                         NULL,
+                        NULL,
                         open_response_cb, stringlist);
   g_object_unref (dialog);
 }

demos/gtk-demo/main-listitem.ui

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="GtkListItem">
-    <property name="focusable">0</property>
     <property name="child">
       <object class="GtkTreeExpander" id="expander">
         <binding name="list-row">

demos/gtk-demo/mask.c

@@ -1,53 +0,0 @@
-/* Masking
- *
- * Demonstrates mask nodes.
- *
- * This demo uses a text node as mask for
- * an animated linear gradient.
- */
-
-#include <gtk/gtk.h>
-#include "demo4widget.h"
-
-
-GtkWidget *
-do_mask (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *demo;
-      GtkWidget *scale;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Mask Nodes");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      demo = demo4_widget_new ();
-      gtk_widget_set_hexpand (demo, TRUE);
-      gtk_widget_set_vexpand (demo, TRUE);
-
-      gtk_box_append (GTK_BOX (box), demo);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 1, 0.1);
-      gtk_range_set_value (GTK_RANGE (scale), 0.5);
-      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value", demo, "progress", 0);
-
-      gtk_box_append (GTK_BOX (box), scale);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/menu.c

@@ -0,0 +1,61 @@
+/* Menu
+ * #Keywords: action, zoom
+ *
+ * Demonstrates how to add a context menu to a custom widget
+ * and connect it with widget actions.
+ *
+ * The custom widget we create here is similar to a GtkPicture,
+ * but allows setting a zoom level for the displayed paintable.
+ *
+ * Our context menu has items to change the zoom level.
+ */
+
+#include <gtk/gtk.h>
+#include "demo3widget.h"
+
+
+GtkWidget *
+do_menu (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+
+  if (!window)
+    {
+      GtkWidget *box;
+      GtkWidget *sw;
+      GtkWidget *widget;
+      GtkWidget *scale;
+
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Menu");
+      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_window_set_child (GTK_WINDOW (window), box);
+
+      sw = gtk_scrolled_window_new ();
+      gtk_widget_set_vexpand (sw, TRUE);
+      gtk_box_append (GTK_BOX (box), sw);
+
+      widget = demo3_widget_new ("/transparent/portland-rose.jpg");
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);
+
+      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.01, 10.0, 0.1);
+      gtk_range_set_value (GTK_RANGE (scale), 1.0);
+      gtk_box_append (GTK_BOX (box), scale);
+
+      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
+                              widget, "scale",
+                              G_BINDING_BIDIRECTIONAL);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_set_visible (window, TRUE);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/meson.build

@@ -39,7 +39,6 @@ demos = files([
   'iconscroll.c',
   'iconview.c',
   'iconview_edit.c',
-  'image_scaling.c',
   'images.c',
   'infobar.c',
   'layoutmanager.c',
@@ -47,7 +46,7 @@ demos = files([
   'links.c',
   'listbox.c',
   'listbox_controls.c',
-  'mask.c',
+  'menu.c',
   'flowbox.c',
   'list_store.c',
   'listview_applauncher.c',
@@ -55,9 +54,8 @@ demos = files([
   'listview_colors.c',
   'listview_filebrowser.c',
   'listview_minesweeper.c',
-  'listview_selections.c',
+  'dropdown.c',
   'listview_settings.c',
-  'listview_settings2.c',
   'listview_ucd.c',
   'listview_weather.c',
   'listview_words.c',
@@ -116,7 +114,6 @@ extra_demo_sources = files([
   'gtkshadertoy.c',
   'gtkshaderstack.c',
   'gskshaderpaintable.c',
-  'hsla.c',
   'puzzlepiece.c',
   'bluroverlay.c',
   'demoimage.c',
@@ -129,10 +126,8 @@ extra_demo_sources = files([
   'four_point_transform.c',
   'demo2widget.c',
   'demo3widget.c',
-  'demo4widget.c',
   'pixbufpaintable.c',
   'script-names.c',
-  'settings-key.c',
   'unicode-names.c',
   'suggestionentry.c',
   'language-names.c',
@@ -161,7 +156,7 @@ demos_h = custom_target('gtk4 demo header',
 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')
+  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
 endif
 
 ld = find_program('ld', required : false)
@@ -227,7 +222,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
 else
   gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
     'demo.gresource.xml',
-    source_dir: meson.current_source_dir()
+    source_dir: '.',
   )
 endif
 
@@ -235,7 +230,8 @@ endif
 demo_cflags = []
 foreach flag: common_cflags
   if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations']
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     demo_cflags += flag
   endif
 endforeach

demos/gtk-demo/paint.c

@@ -24,7 +24,6 @@ typedef struct
   GdkRGBA draw_color;
   GtkPadController *pad_controller;
   double brush_size;
-  GtkGesture *gesture;
 } DrawingArea;
 
 typedef struct
@@ -104,11 +103,13 @@ drawing_area_size_allocate (GtkWidget *widget,
 static void
 drawing_area_map (GtkWidget *widget)
 {
+  GtkAllocation allocation;
+
   GTK_WIDGET_CLASS (drawing_area_parent_class)->map (widget);
 
+  gtk_widget_get_allocation (widget, &allocation);
   drawing_area_ensure_surface ((DrawingArea *) widget,
-                               gtk_widget_get_width (widget),
-                               gtk_widget_get_height (widget));
+                               allocation.width, allocation.height);
 }
 
 static void
@@ -261,7 +262,7 @@ drawing_area_apply_stroke (DrawingArea   *area,
                            double         y,
                            double         pressure)
 {
-  if (tool && gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
+  if (gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
     {
       cairo_set_line_width (area->cr, 10 * pressure * area->brush_size);
       cairo_set_operator (area->cr, CAIRO_OPERATOR_DEST_OUT);
@@ -312,9 +313,7 @@ stylus_gesture_motion (GtkGestureStylus *gesture,
           drawing_area_apply_stroke (area, tool,
                                      backlog[i].axes[GDK_AXIS_X],
                                      backlog[i].axes[GDK_AXIS_Y],
-                                     backlog[i].flags & GDK_AXIS_FLAG_PRESSURE
-                                        ? backlog[i].axes[GDK_AXIS_PRESSURE]
-                                        : 1);
+                                     backlog[i].axes[GDK_AXIS_PRESSURE]);
         }
 
       g_free (backlog);
@@ -344,8 +343,6 @@ drawing_area_init (DrawingArea *area)
 
   area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
   area->brush_size = 1;
-
-  area->gesture = gesture;
 }
 
 static GtkWidget *
@@ -384,12 +381,6 @@ drawing_area_color_set (DrawingArea          *area,
   gtk_color_dialog_button_set_rgba (button, color);
 }
 
-static GtkGesture *
-drawing_area_get_gesture (DrawingArea *area)
-{
-  return area->gesture;
-}
-
 GtkWidget *
 do_paint (GtkWidget *toplevel)
 {
@@ -397,7 +388,7 @@ do_paint (GtkWidget *toplevel)
 
   if (!window)
     {
-      GtkWidget *draw_area, *headerbar, *button;
+      GtkWidget *draw_area, *headerbar, *colorbutton;
 
       window = gtk_window_new ();
 
@@ -406,22 +397,15 @@ do_paint (GtkWidget *toplevel)
 
       headerbar = gtk_header_bar_new ();
 
-      button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
-      g_signal_connect (button, "notify::rgba",
+      colorbutton = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+      g_signal_connect (colorbutton, "notify::rgba",
                         G_CALLBACK (color_button_color_set), draw_area);
       g_signal_connect (draw_area, "color-set",
-                        G_CALLBACK (drawing_area_color_set), button);
-      gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (button),
+                        G_CALLBACK (drawing_area_color_set), colorbutton);
+      gtk_color_dialog_button_set_rgba (GTK_COLOR_DIALOG_BUTTON (colorbutton),
                                         &(GdkRGBA) { 0, 0, 0, 1 });
 
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), button);
-
-      button = gtk_check_button_new_with_label ("Stylus only");
-      g_object_bind_property (button, "active",
-                              drawing_area_get_gesture ((DrawingArea *)draw_area), "stylus-only",
-                              G_BINDING_SYNC_CREATE);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (headerbar), button);
-
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
       gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
       gtk_window_set_title (GTK_WINDOW (window), "Paint");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

demos/gtk-demo/paintable_svg.c

@@ -55,6 +55,7 @@ show_file_open (GtkWidget  *button,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_root (button)),
                         NULL,
+                        NULL,
                         open_response_cb, picture);
 }
 

demos/gtk-demo/peg_solitaire.c

@@ -384,7 +384,7 @@ create_board (GtkWidget *window)
     "}";
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_string (provider, css);
+  gtk_css_provider_load_from_data (provider, css, -1);
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               800);

demos/gtk-demo/pickers.c

@@ -1,38 +1,15 @@
-/* Pickers and Launchers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkFileLauncher, GtkUriLauncher
+/* Pickers
+ * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog
  *
- * The dialogs are mainly intended for use in preference dialogs.
+ * These widgets are mainly intended for use in preference dialogs.
  * They allow to select colors, fonts and applications.
  *
- * The launchers let you open files or URIs in applications that
- * can handle them.
+ * This demo shows both the default appearance for these dialogs,
+ * as well as some of the customizations that are possible.
  */
 
 #include <gtk/gtk.h>
 
-static GtkWidget *app_picker;
-
-static void
-set_file (GFile    *file,
-          gpointer  data)
-{
-  char *name;
-
-  if (!file)
-    {
-      gtk_widget_set_sensitive (app_picker, FALSE);
-      g_object_set_data (G_OBJECT (app_picker), "file", NULL);
-      return;
-    }
-
-  name = g_file_get_basename (file);
-  gtk_label_set_label (GTK_LABEL (data), name);
-  g_free (name);
-
-  gtk_widget_set_sensitive (app_picker, TRUE);
-  g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
-}
-
 static void
 file_opened (GObject *source,
              GAsyncResult *result,
@@ -40,6 +17,7 @@ file_opened (GObject *source,
 {
   GFile *file;
   GError *error = NULL;
+  char *name;
 
   file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
 
@@ -47,9 +25,12 @@ file_opened (GObject *source,
     {
       g_print ("%s\n", error->message);
       g_error_free (error);
+      return;
     }
 
-  set_file (file, data);
+  name = g_file_get_basename (file);
+  gtk_label_set_label (GTK_LABEL (data), name);
+  g_free (name);
 }
 
 static gboolean
@@ -78,99 +59,24 @@ open_file (GtkButton *picker,
                               20,
                               abort_mission, g_object_ref (cancellable), g_object_unref);
 
-  gtk_file_dialog_open (dialog, parent, cancellable, file_opened, label);
+  gtk_file_dialog_open (dialog, parent, NULL, cancellable, file_opened, label);
 
   g_object_unref (cancellable);
   g_object_unref (dialog);
 }
 
-static void
-open_app_done (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GtkFileLauncher *launcher = GTK_FILE_LAUNCHER (source);
-  GError *error = NULL;
-
-  if (!gtk_file_launcher_launch_finish (launcher, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-open_app (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkFileLauncher *launcher;
-  GFile *file;
-
-  file = G_FILE (g_object_get_data (G_OBJECT (picker), "file"));
-  launcher = gtk_file_launcher_new (file);
-
-  gtk_file_launcher_launch (launcher, parent, NULL, open_app_done, NULL);
-
-  g_object_unref (launcher);
-}
-
-static void
-open_uri_done (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GtkUriLauncher *launcher = GTK_URI_LAUNCHER (source);
-  GError *error = NULL;
-
-  if (!gtk_uri_launcher_launch_finish (launcher, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-launch_uri (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkUriLauncher *launcher;
-
-  launcher = gtk_uri_launcher_new ("http://www.gtk.org");
-
-  gtk_uri_launcher_launch (launcher, parent, NULL, open_uri_done, NULL);
-
-  g_object_unref (launcher);
-}
-
-static gboolean
-on_drop (GtkDropTarget *target,
-         const GValue  *value,
-         double         x,
-         double         y,
-         gpointer       data)
-{
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      set_file (g_value_get_object (value), data);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 GtkWidget *
 do_pickers (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
   GtkWidget *table, *label, *picker, *button;
-  GtkDropTarget *drop_target;
 
   if (!window)
   {
     window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Pickers and Launchers");
+    gtk_window_set_title (GTK_WINDOW (window), "Pickers");
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
     table = gtk_grid_new ();
@@ -178,8 +84,8 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_margin_end (table, 20);
     gtk_widget_set_margin_top (table, 20);
     gtk_widget_set_margin_bottom (table, 20);
-    gtk_grid_set_row_spacing (GTK_GRID (table), 6);
-    gtk_grid_set_column_spacing (GTK_GRID (table), 6);
+    gtk_grid_set_row_spacing (GTK_GRID (table), 3);
+    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
     gtk_window_set_child (GTK_WINDOW (window), table);
 
     label = gtk_label_new ("Color:");
@@ -206,37 +112,30 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_hexpand (label, TRUE);
     gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
 
-    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
     button = gtk_button_new_from_icon_name ("document-open-symbolic");
-
     label = gtk_label_new ("None");
-
-    drop_target = gtk_drop_target_new (G_TYPE_FILE, GDK_ACTION_COPY);
-    g_signal_connect (drop_target, "drop", G_CALLBACK (on_drop), label);
-    gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (drop_target));
-
     gtk_label_set_xalign (GTK_LABEL (label), 0.);
     gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
     gtk_widget_set_hexpand (label, TRUE);
     g_signal_connect (button, "clicked", G_CALLBACK (open_file), label);
     gtk_box_append (GTK_BOX (picker), label);
     gtk_box_append (GTK_BOX (picker), button);
-    app_picker = gtk_button_new_from_icon_name ("emblem-system-symbolic");
-    gtk_widget_set_halign (app_picker, GTK_ALIGN_END);
-    gtk_widget_set_sensitive (app_picker, FALSE);
-    g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
-    gtk_box_append (GTK_BOX (picker), app_picker);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
-    label = gtk_label_new ("URI:");
+    label = gtk_label_new ("Mail:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);
     gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     gtk_widget_set_hexpand (label, TRUE);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
 
-    picker = gtk_button_new_with_label ("www.gtk.org");
-    g_signal_connect (picker, "clicked", G_CALLBACK (launch_uri), NULL);
+    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
+    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
+
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
   }
 

demos/gtk-demo/printing.c

@@ -180,7 +180,7 @@ do_printing (GtkWidget *do_widget)
       GtkAlertDialog *dialog;
 
       dialog = gtk_alert_dialog_new ("%s", error->message);
-      gtk_alert_dialog_show (dialog, GTK_WINDOW (do_widget));
+      gtk_alert_dialog_show (dialog, GTK_WINDOW (do_widget), NULL);
       g_object_unref (dialog);
       g_error_free (error);
     }

demos/gtk-demo/settings-key.c

@@ -1,165 +0,0 @@
-#include "settings-key.h"
-
-/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
-struct _SettingsKey
-{
-  GObject parent_instance;
-
-  GSettings *settings;
-  GSettingsSchemaKey *key;
-};
-
-enum {
-  PROP_0,
-  PROP_NAME,
-  PROP_SETTINGS,
-  PROP_SUMMARY,
-  PROP_DESCRIPTION,
-  PROP_VALUE,
-  PROP_TYPE,
-  PROP_DEFAULT_VALUE,
-
-  N_PROPS
-};
-
-G_DEFINE_TYPE (SettingsKey, settings_key, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-settings_key_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  switch (property_id)
-    {
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, g_settings_schema_key_get_description (self->key));
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, g_settings_schema_key_get_name (self->key));
-      break;
-
-    case PROP_SUMMARY:
-      g_value_set_string (value, g_settings_schema_key_get_summary (self->key));
-      break;
-
-    case PROP_VALUE:
-      {
-        GVariant *variant = g_settings_get_value (self->settings, g_settings_schema_key_get_name (self->key));
-        g_value_take_string (value, g_variant_print (variant, FALSE));
-        g_variant_unref (variant);
-      }
-      break;
-
-    case PROP_TYPE:
-      {
-        const GVariantType *type = g_settings_schema_key_get_value_type (self->key);
-        g_value_set_string (value, g_variant_type_peek_string (type));
-      }
-      break;
-
-    case PROP_DEFAULT_VALUE:
-      {
-        GVariant *variant = g_settings_schema_key_get_default_value (self->key);
-        g_value_take_string (value, g_variant_print (variant, FALSE));
-        g_variant_unref (variant);
-      }
-      break;
-
-    case PROP_SETTINGS:
-      g_value_set_object (value, self->settings);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-settings_key_finalize (GObject *object)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  g_object_unref (self->settings);
-  g_settings_schema_key_unref (self->key);
-
-  G_OBJECT_CLASS (settings_key_parent_class)->finalize (object);
-}
-
-static void
-settings_key_class_init (SettingsKeyClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = settings_key_finalize;
-  gobject_class->get_property = settings_key_get_property;
-
-  properties[PROP_DESCRIPTION] =
-    g_param_spec_string ("description", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_NAME] =
-    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_SETTINGS] =
-    g_param_spec_object ("settings", NULL, NULL, G_TYPE_SETTINGS, G_PARAM_READABLE);
-  properties[PROP_SUMMARY] =
-    g_param_spec_string ("summary", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_VALUE] =
-    g_param_spec_string ("value", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_TYPE] =
-    g_param_spec_string ("type", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_DEFAULT_VALUE] =
-    g_param_spec_string ("default-value", NULL, NULL, NULL, G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-settings_key_init (SettingsKey *self)
-{
-}
-
-SettingsKey *
-settings_key_new (GSettings          *settings,
-                  GSettingsSchemaKey *key)
-{
-  SettingsKey *result = g_object_new (SETTINGS_TYPE_KEY, NULL);
-
-  result->settings = g_object_ref (settings);
-  result->key = g_settings_schema_key_ref (key);
-
-  return result;
-}
-
-GSettingsSchemaKey *
-settings_key_get_key (SettingsKey *self)
-{
-  return self->key;
-}
-
-GSettings *
-settings_key_get_settings (SettingsKey *self)
-{
-  return self->settings;
-}
-
-char *
-settings_key_get_search_string (SettingsKey *self)
-{
-  char *schema, *result;
-
-  g_object_get (self->settings, "schema-id", &schema, NULL);
-
-  result = g_strconcat (g_settings_schema_key_get_name (self->key), " ",
-                        g_settings_schema_key_get_summary (self->key), " ",
-                        schema,
-                        NULL);
-
-  g_free (schema);
-
-  return result;
-}
-

demos/gtk-demo/settings-key.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#include <stdlib.h>
-
-/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
-typedef struct _SettingsKey SettingsKey;
-#define SETTINGS_TYPE_KEY (settings_key_get_type ())
-G_DECLARE_FINAL_TYPE (SettingsKey, settings_key, SETTINGS, KEY, GObject);
-
-SettingsKey *           settings_key_new                        (GSettings              *settings,
-                                                                 GSettingsSchemaKey     *key);
-
-GSettingsSchemaKey *    settings_key_get_key                    (SettingsKey            *self);
-GSettings *             settings_key_get_settings               (SettingsKey            *self);
-char *                  settings_key_get_search_string          (SettingsKey            *self);

demos/gtk-demo/shortcuts.c

@@ -22,7 +22,6 @@ show_shortcuts (GtkWidget   *window,
   gtk_window_set_transient_for (GTK_WINDOW (overlay), GTK_WINDOW (window));
   g_object_set (overlay, "view-name", view, NULL);
   g_object_unref (builder);
-  gtk_window_present (GTK_WINDOW (overlay));
 }
 
 G_MODULE_EXPORT void

demos/gtk-demo/sizegroup.c

@@ -28,14 +28,14 @@ add_row (GtkGrid      *table,
 
   label = gtk_label_new_with_mnemonic (label_text);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
   gtk_widget_set_hexpand (label, TRUE);
   gtk_grid_attach (table, label, 0, row, 1, 1);
 
   dropdown = gtk_drop_down_new_from_strings (options);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), dropdown);
   gtk_widget_set_halign (dropdown, GTK_ALIGN_END);
-  gtk_widget_set_valign (dropdown, GTK_ALIGN_BASELINE_FILL);
+  gtk_widget_set_valign (dropdown, GTK_ALIGN_BASELINE);
   gtk_size_group_add_widget (size_group, dropdown);
   gtk_grid_attach (table, dropdown, 1, row, 1, 1);
 }

demos/gtk-demo/suggestionentry.c

@@ -471,7 +471,7 @@ suggestion_entry_size_allocate (GtkWidget *widget,
                               &(GtkAllocation) { width - arrow_nat, 0, arrow_nat, height },
                               baseline);
 
-  gtk_widget_set_size_request (self->popup, gtk_widget_get_width (GTK_WIDGET (self)), -1);
+  gtk_widget_set_size_request (self->popup, gtk_widget_get_allocated_width (GTK_WIDGET (self)), -1);
   gtk_widget_queue_resize (self->popup);
 
   gtk_popover_present (GTK_POPOVER (self->popup));
@@ -849,7 +849,7 @@ suggestion_entry_init (SuggestionEntry *self)
       GtkCssProvider *provider;
 
       provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_resource (provider, "/listview_selections/suggestionentry.css");
+      gtk_css_provider_load_from_resource (provider, "/dropdown/suggestionentry.css");
       gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                                   GTK_STYLE_PROVIDER (provider),
                                                   800);

demos/gtk-demo/transparent.c

@@ -1,5 +1,5 @@
 /* Overlay/Transparency
- * #Keywords: GtkOverlay, GtkSnapshot, blur
+ * #Keywords: GtkOverlay, GtkSnapshot
  *
  * Blur the background behind an overlay.
  */

demos/gtk-demo/video_player.c

@@ -56,7 +56,7 @@ open_clicked_cb (GtkWidget *button,
   gtk_file_filter_set_name (filter, "Video");
   g_list_store_append (filters, filter);
 
-  gtk_file_dialog_set_default_filter (dialog, filter);
+  gtk_file_dialog_set_current_filter (dialog, filter);
   g_object_unref (filter);
 
   gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
@@ -65,6 +65,7 @@ open_clicked_cb (GtkWidget *button,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_root (button)),
                         NULL,
+                        NULL,
                         open_dialog_response_cb, video);
 }
 

demos/icon-browser/meson.build

@@ -8,7 +8,7 @@ iconbrowser_sources = [
 
 iconbrowser_resources = gnome.compile_resources('iconbrowser_resources',
   'iconbrowser.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-icon-browser',

demos/meson.build

@@ -1,5 +1,5 @@
 gen_demo_header = find_program('../build-aux/meson/gen-demo-header.py')
-demo_profile = get_option('demo-profile')
+demo_profile = get_option('profile')
 
 demo_conf_h = declare_dependency(
   sources: custom_target('demo-header',

demos/node-editor/gtkrendererpaintable.c

@@ -78,8 +78,6 @@ gtk_renderer_paintable_paintable_snapshot (GdkPaintable *paintable,
 
   gdk_paintable_snapshot (GDK_PAINTABLE (texture), snapshot, width, height);
   g_object_unref (texture);
-
-  gsk_render_node_unref (node);
 }
 
 static int

demos/node-editor/meson.build

@@ -7,7 +7,7 @@ node_editor_sources = [
 
 node_editor_resources = gnome.compile_resources('node_editor_resources',
   'node-editor.gresource.xml',
-  source_dir: meson.current_source_dir(),
+  source_dir: '.',
 )
 
 executable('gtk4-node-editor',

demos/node-editor/node-editor-application.c

@@ -201,7 +201,7 @@ node_editor_application_startup (GApplication *app)
 
 
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_string (provider, css);
+  gtk_css_provider_load_from_data (provider, css, -1);
   gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

demos/node-editor/node-editor-window.c

@@ -32,11 +32,6 @@
 #include "gsk/vulkan/gskvulkanrenderer.h"
 #endif
 
-#include <cairo.h>
-#ifdef CAIRO_HAS_SVG_SURFACE
-#include <cairo-svg.h>
-#endif
-
 typedef struct
 {
   gsize  start_chars;
@@ -64,7 +59,6 @@ struct _NodeEditorWindow
   GListStore *renderers;
   GskRenderNode *node;
 
-  GFile *file;
   GFileMonitor *file_monitor;
 
   GArray *errors;
@@ -175,7 +169,6 @@ text_changed (GtkTextBuffer    *buffer,
   GtkTextIter iter;
   GtkTextIter start, end;
   float scale;
-  GskRenderNode *big_node;
 
   g_array_remove_range (self->errors, 0, self->errors->len);
   text = get_current_text (self->text_buffer);
@@ -188,18 +181,13 @@ text_changed (GtkTextBuffer    *buffer,
   self->node = gsk_render_node_deserialize (bytes, deserialize_error_func, self);
 
   scale = gtk_scale_button_get_value (GTK_SCALE_BUTTON (self->scale_scale));
-  if (self->node && scale != 0.)
+  if (self->node && scale != 1.0)
     {
-      scale = pow (2., scale);
-      big_node = gsk_transform_node_new (self->node, gsk_transform_scale (NULL, scale, scale));
-    }
-  else if (self->node)
-    {
-      big_node = gsk_render_node_ref (self->node);
-    }
-  else
-    {
-      big_node = NULL;
+      GskRenderNode *node;
+
+      node = gsk_transform_node_new (self->node, gsk_transform_scale (NULL, scale, scale));
+      gsk_render_node_unref (self->node);
+      self->node = node;
     }
 
   g_bytes_unref (bytes);
@@ -211,27 +199,18 @@ text_changed (GtkTextBuffer    *buffer,
       graphene_rect_t bounds;
       guint i;
 
-      snapshot = gtk_snapshot_new ();
-      gsk_render_node_get_bounds (big_node, &bounds);
-      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
-      gtk_snapshot_append_node (snapshot, big_node);
-      paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
-      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
-      g_clear_object (&paintable);
-
       snapshot = gtk_snapshot_new ();
       gsk_render_node_get_bounds (self->node, &bounds);
       gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
       gtk_snapshot_append_node (snapshot, self->node);
       paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
-
+      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
       for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i++)
         {
           gpointer item = g_list_model_get_item (G_LIST_MODEL (self->renderers), i);
           gtk_renderer_paintable_set_paintable (item, paintable);
           g_object_unref (item);
         }
-
       g_clear_object (&paintable);
     }
   else
@@ -239,8 +218,6 @@ text_changed (GtkTextBuffer    *buffer,
       gtk_picture_set_paintable (GTK_PICTURE (self->picture), NULL);
     }
 
-  g_clear_pointer (&big_node, gsk_render_node_unref);
-
   gtk_text_buffer_get_start_iter (self->text_buffer, &iter);
 
   while (!gtk_text_iter_is_end (&iter))
@@ -545,14 +522,12 @@ node_editor_window_load (NodeEditorWindow *self,
 {
   GError *error = NULL;
 
-  g_clear_object (&self->file);
   g_clear_object (&self->file_monitor);
 
   if (!load_file_contents (self, file))
     return FALSE;
 
-  self->file = g_object_ref (file);
-  self->file_monitor = g_file_monitor_file (self->file, G_FILE_MONITOR_NONE, NULL, &error);
+  self->file_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
 
   if (error)
     {
@@ -589,23 +564,15 @@ static void
 show_open_filechooser (NodeEditorWindow *self)
 {
   GtkFileDialog *dialog;
+  GFile *cwd;
 
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Open node file");
-  if (self->file)
-    {
-      gtk_file_dialog_set_initial_file (dialog, self->file);
-    }
-  else
-    {
-      GFile *cwd;
-      cwd = g_file_new_for_path (".");
-      gtk_file_dialog_set_initial_folder (dialog, cwd);
-      g_object_unref (cwd);
-    }
-
+  cwd = g_file_new_for_path (".");
+  gtk_file_dialog_set_current_folder (dialog, cwd);
+  g_object_unref (cwd);
   gtk_file_dialog_open (dialog, GTK_WINDOW (self),
-                        NULL, open_response_cb, self);
+                        NULL, NULL, open_response_cb, self);
   g_object_unref (dialog);
 }
 
@@ -646,7 +613,8 @@ save_response_cb (GObject *source,
           alert = gtk_alert_dialog_new ("Saving failed");
           gtk_alert_dialog_set_detail (alert, error->message);
           gtk_alert_dialog_show (alert,
-                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))));
+                                 GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
+                                 NULL);
           g_object_unref (alert);
           g_error_free (error);
         }
@@ -661,56 +629,39 @@ save_cb (GtkWidget        *button,
          NodeEditorWindow *self)
 {
   GtkFileDialog *dialog;
+  GFile *cwd;
 
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Save node");
-  if (self->file)
-    {
-      gtk_file_dialog_set_initial_file (dialog, self->file);
-    }
-  else
-    {
-      GFile *cwd = g_file_new_for_path (".");
-      gtk_file_dialog_set_initial_folder (dialog, cwd);
-      gtk_file_dialog_set_initial_name (dialog, "demo.node");
-      g_object_unref (cwd);
-    }
-
+  cwd = g_file_new_for_path (".");
+  gtk_file_dialog_set_current_folder (dialog, cwd);
+  g_object_unref (cwd);
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
                         NULL,
+                        "demo.node",
+                        NULL,
                         save_response_cb, self);
   g_object_unref (dialog);
 }
 
-static GskRenderNode *
-create_node (NodeEditorWindow *self)
+static GdkTexture *
+create_texture (NodeEditorWindow *self)
 {
   GdkPaintable *paintable;
   GtkSnapshot *snapshot;
+  GskRenderer *renderer;
   GskRenderNode *node;
+  GdkTexture *texture;
 
   paintable = gtk_picture_get_paintable (GTK_PICTURE (self->picture));
   if (paintable == NULL ||
       gdk_paintable_get_intrinsic_width (paintable) <= 0 ||
       gdk_paintable_get_intrinsic_height (paintable) <= 0)
     return NULL;
-
   snapshot = gtk_snapshot_new ();
   gdk_paintable_snapshot (paintable, snapshot, gdk_paintable_get_intrinsic_width (paintable), gdk_paintable_get_intrinsic_height (paintable));
   node = gtk_snapshot_free_to_node (snapshot);
-
-  return node;
-}
-
-static GdkTexture *
-create_texture (NodeEditorWindow *self)
-{
-  GskRenderer *renderer;
-  GskRenderNode *node;
-  GdkTexture *texture;
-
-  node = create_node (self);
   if (node == NULL)
     return NULL;
 
@@ -721,58 +672,6 @@ create_texture (NodeEditorWindow *self)
   return texture;
 }
 
-#ifdef CAIRO_HAS_SVG_SURFACE
-static cairo_status_t
-cairo_serializer_write (gpointer             user_data,
-                        const unsigned char *data,
-                        unsigned int         length)
-{
-  g_byte_array_append (user_data, data, length);
-
-  return CAIRO_STATUS_SUCCESS;
-}
-
-static GBytes *
-create_svg (GskRenderNode  *node,
-            GError        **error)
-{
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  graphene_rect_t bounds;
-  GByteArray *array;
-
-  gsk_render_node_get_bounds (node, &bounds);
-  array = g_byte_array_new ();
-
-  surface = cairo_svg_surface_create_for_stream (cairo_serializer_write,
-                                                 array,
-                                                 bounds.size.width,
-                                                 bounds.size.height);
-  cairo_svg_surface_set_document_unit (surface, CAIRO_SVG_UNIT_PX);
-  cairo_surface_set_device_offset (surface, -bounds.origin.x, -bounds.origin.y);
-
-  cr = cairo_create (surface);
-  gsk_render_node_draw (node, cr);
-  cairo_destroy (cr);
-
-  cairo_surface_finish (surface);
-  if (cairo_surface_status (surface) == CAIRO_STATUS_SUCCESS)
-    {
-      cairo_surface_destroy (surface);
-      return g_byte_array_free_to_bytes (array);
-    }
-  else
-    {
-      g_set_error (error,
-                   G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "%s", cairo_status_to_string (cairo_surface_status (surface)));
-      cairo_surface_destroy (surface);
-      g_byte_array_unref (array);
-      return NULL;
-    }
-}
-#endif
-
 static GdkTexture *
 create_cairo_texture (NodeEditorWindow *self)
 {
@@ -805,140 +704,53 @@ create_cairo_texture (NodeEditorWindow *self)
 }
 
 static void
-export_image_saved_cb (GObject      *source,
-                       GAsyncResult *result,
-                       void         *user_data)
-{
-  GError *error = NULL;
-
-  if (!g_file_replace_contents_finish (G_FILE (source), result, NULL, &error))
-    {
-      GtkAlertDialog *alert;
-
-      alert = gtk_alert_dialog_new ("Exporting to image failed");
-      gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, NULL);
-      g_object_unref (alert);
-      g_clear_error (&error);
-    }
-}
-
-static void
-export_image_response_cb (GObject      *source,
+export_image_response_cb (GObject *source,
                           GAsyncResult *result,
-                          void         *user_data)
+                          void *user_data)
 {
   GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GskRenderNode *node = user_data;
+  GdkTexture *texture = user_data;
   GFile *file;
-  char *uri;
-  GBytes *bytes;
 
   file = gtk_file_dialog_save_finish (dialog, result, NULL);
-  if (file == NULL)
+  if (file)
     {
-      gsk_render_node_unref (node);
-      return;
-    }
-
-  uri = g_file_get_uri (file);
-#ifdef CAIRO_HAS_SVG_SURFACE
-  if (g_str_has_suffix (uri, "svg"))
-    {
-      GError *error = NULL;
-
-      bytes = create_svg (node, &error);
-      if (bytes == NULL)
+      if (!gdk_texture_save_to_png (texture, g_file_peek_path (file)))
         {
           GtkAlertDialog *alert;
 
           alert = gtk_alert_dialog_new ("Exporting to image failed");
-          gtk_alert_dialog_set_detail (alert, error->message);
-          gtk_alert_dialog_show (alert, NULL);
+          gtk_alert_dialog_show (alert,
+                                 GTK_WINDOW (gtk_window_get_transient_for (GTK_WINDOW (dialog))),
+                                 NULL);
           g_object_unref (alert);
-          g_clear_error (&error);
         }
-    }
-  else
-#endif
-    {
-      GdkTexture *texture;
-      GskRenderer *renderer;
 
-      renderer = gsk_gl_renderer_new ();
-      if (!gsk_renderer_realize (renderer, NULL, NULL))
-        {
-          g_object_unref (renderer);
-          renderer = gsk_cairo_renderer_new ();
-          if (!gsk_renderer_realize (renderer, NULL, NULL))
-            {
-              g_assert_not_reached ();
-            }
-        }
-      texture = gsk_renderer_render_texture (renderer, node, NULL);
-      gsk_renderer_unrealize (renderer);
-      g_object_unref (renderer);
-
-      if (g_str_has_suffix (uri, "tiff"))
-        bytes = gdk_texture_save_to_tiff_bytes (texture);
-      else
-        bytes = gdk_texture_save_to_png_bytes (texture);
-      g_object_unref (texture);
+      g_object_unref (file);
     }
-  g_free (uri);
 
-  if (bytes)
-    {
-      g_file_replace_contents_bytes_async (file,
-                                           bytes,
-                                           NULL,
-                                           FALSE,
-                                           0,
-                                           NULL,
-                                           export_image_saved_cb,
-                                           NULL);
-      g_bytes_unref (bytes);
-    }
-  gsk_render_node_unref (node);
-  g_object_unref (file);
+  g_object_unref (texture);
 }
 
 static void
 export_image_cb (GtkWidget        *button,
                  NodeEditorWindow *self)
 {
-  GskRenderNode *node;
+  GdkTexture *texture;
   GtkFileDialog *dialog;
-  GtkFileFilter *filter;
-  GListStore *filters;
 
-  node = create_node (self);
-  if (node == NULL)
+  texture = create_texture (self);
+  if (texture == NULL)
     return;
 
-  filters = g_list_store_new (GTK_TYPE_FILE_FILTER);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/png");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/svg+xml");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_mime_type (filter, "image/tiff");
-  g_list_store_append (filters, filter);
-  g_object_unref (filter);
-
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "");
-  gtk_file_dialog_set_initial_name (dialog, "example.png");
-  gtk_file_dialog_set_filters (dialog, G_LIST_MODEL (filters));
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
                         NULL,
-                        export_image_response_cb, node);
-  g_object_unref (filters);
+                        "example.png",
+                        NULL,
+                        export_image_response_cb, texture);
   g_object_unref (dialog);
 }
 
@@ -1052,19 +864,6 @@ testcase_save_clicked_cb (GtkWidget        *button,
     }
 
   text = get_current_text (self->text_buffer);
-  {
-    GBytes *bytes;
-    GskRenderNode *node;
-    gsize size;
-
-    bytes = g_bytes_new_take (text, strlen (text) + 1);
-    node = gsk_render_node_deserialize (bytes, NULL, NULL);
-    g_bytes_unref (bytes);
-    bytes = gsk_render_node_serialize (node);
-    gsk_render_node_unref (node);
-    text = g_bytes_unref_to_data (bytes, &size);
-  }
-
   if (!g_file_set_contents (node_file, text, -1, &error))
     {
       gtk_label_set_label (GTK_LABEL (self->testcase_error_label), error->message);
@@ -1109,8 +908,6 @@ node_editor_window_finalize (GObject *object)
 
   g_clear_pointer (&self->node, gsk_render_node_unref);
   g_clear_object (&self->renderers);
-  g_clear_object (&self->file_monitor);
-  g_clear_object (&self->file);
 
   G_OBJECT_CLASS (node_editor_window_parent_class)->finalize (object);
 }
@@ -1190,362 +987,11 @@ node_editor_window_unrealize (GtkWidget *widget)
   GTK_WIDGET_CLASS (node_editor_window_parent_class)->unrealize (widget);
 }
 
-typedef struct
-{
-  NodeEditorWindow *self;
-  GtkTextIter start, end;
-} Selection;
-
-static void
-color_cb (GObject *source,
-          GAsyncResult *result,
-          gpointer data)
-{
-  GtkColorDialog *dialog = GTK_COLOR_DIALOG (source);
-  Selection *selection = data;
-  NodeEditorWindow *self = selection->self;
-  GdkRGBA *color;
-  char *text;
-  GError *error = NULL;
-  GtkTextBuffer *buffer;
-
-  color = gtk_color_dialog_choose_rgba_finish (dialog, result, &error);
-  if (!color)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      g_free (selection);
-      return;
-    }
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-
-  text = gdk_rgba_to_string (color);
-  gtk_text_buffer_delete (buffer, &selection->start, &selection->end);
-  gtk_text_buffer_insert (buffer, &selection->start, text, -1);
-
-  g_free (text);
-  gdk_rgba_free (color);
-  g_free (selection);
-}
-
-static void
-font_cb (GObject *source,
-          GAsyncResult *result,
-          gpointer data)
-{
-  GtkFontDialog *dialog = GTK_FONT_DIALOG (source);
-  Selection *selection = data;
-  NodeEditorWindow *self = selection->self;
-  GError *error = NULL;
-  PangoFontDescription *desc;
-  GtkTextBuffer *buffer;
-  char *text;
-
-  desc = gtk_font_dialog_choose_font_finish (dialog, result, &error);
-  if (!desc)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      g_free (selection);
-      return;
-    }
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-
-  text = pango_font_description_to_string (desc);
-  gtk_text_buffer_delete (buffer, &selection->start, &selection->end);
-  gtk_text_buffer_insert (buffer, &selection->start, text, -1);
-
-  g_free (text);
-  pango_font_description_free (desc);
-  g_free (selection);
-}
-
-static void
-file_cb (GObject *source,
-          GAsyncResult *result,
-          gpointer data)
-{
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  Selection *selection = data;
-  NodeEditorWindow *self = selection->self;
-  GError *error = NULL;
-  GFile *file;
-  GtkTextBuffer *buffer;
-  char *text;
-
-  file = gtk_file_dialog_open_finish (dialog, result, &error);
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-      g_free (selection);
-      return;
-    }
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-
-  text = g_file_get_uri (file);
-  gtk_text_buffer_delete (buffer, &selection->start, &selection->end);
-  gtk_text_buffer_insert (buffer, &selection->start, text, -1);
-
-  g_free (text);
-  g_object_unref (file);
-  g_free (selection);
-}
-
-static void
-key_pressed (GtkEventControllerKey *controller,
-             unsigned int keyval,
-             unsigned int keycode,
-             GdkModifierType state,
-             gpointer data)
-{
-  GtkWidget *dd = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (controller));
-  Selection *selection = data;
-  NodeEditorWindow *self = selection->self;
-  unsigned int selected;
-  GtkStringList *strings;
-  GtkTextBuffer *buffer;
-  const char *text;
-
-  if (keyval != GDK_KEY_Escape)
-    return;
-
-  strings = GTK_STRING_LIST (gtk_drop_down_get_model (GTK_DROP_DOWN (dd)));
-  selected = gtk_drop_down_get_selected (GTK_DROP_DOWN (dd));
-  text = gtk_string_list_get_string (strings, selected);
-
-  gtk_text_view_remove (GTK_TEXT_VIEW (self->text_view), dd);
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-  gtk_text_iter_backward_search (&selection->start, "mode:", 0, NULL, &selection->start, NULL);
-  gtk_text_iter_forward_search (&selection->start, ";", 0, &selection->end, NULL, NULL);
-  gtk_text_buffer_delete (buffer, &selection->start, &selection->end);
-  gtk_text_buffer_insert (buffer, &selection->start, " ", -1);
-  gtk_text_buffer_insert (buffer, &selection->start, text, -1);
-}
-
-static void
-node_editor_window_edit (NodeEditorWindow *self,
-                         GtkTextIter      *iter)
-{
-  GtkTextIter start, end;
-  GtkTextBuffer *buffer;
-  Selection *selection;
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-
-  gtk_text_iter_set_line_offset (iter, 0);
-
-  if (gtk_text_iter_forward_search (iter, ";", 0, &end, NULL, NULL) &&
-      gtk_text_iter_forward_search (iter, "color:", 0, NULL, &start, &end))
-    {
-      GtkColorDialog *dialog;
-      GdkRGBA color;
-      char *text;
-
-      while (g_unichar_isspace (gtk_text_iter_get_char (&start)))
-        gtk_text_iter_forward_char (&start);
-
-      gtk_text_buffer_select_range (buffer, &start, &end);
-      text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-      gdk_rgba_parse (&color, text);
-      g_free (text);
-
-      selection = g_new0 (Selection, 1);
-      selection->self = self;
-      selection->start = start;
-      selection->end = end;
-
-      dialog = gtk_color_dialog_new ();
-      gtk_color_dialog_choose_rgba (dialog, GTK_WINDOW (self), &color, NULL, color_cb, selection);
-    }
-  else if (gtk_text_iter_forward_search (iter, ";", 0, &end, NULL, NULL) &&
-           gtk_text_iter_forward_search (iter, "font:", 0, NULL, &start, &end))
-    {
-      GtkFontDialog *dialog;
-      PangoFontDescription *desc;
-      char *text;
-
-      while (g_unichar_isspace (gtk_text_iter_get_char (&start)))
-        gtk_text_iter_forward_char (&start);
-
-      /* Skip the quotes */
-      gtk_text_iter_forward_char (&start);
-      gtk_text_iter_backward_char (&end);
-
-      gtk_text_buffer_select_range (buffer, &start, &end);
-
-      text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-      desc = pango_font_description_from_string (text);
-      g_free (text);
-
-      selection = g_new0 (Selection, 1);
-      selection->self = self;
-      selection->start = start;
-      selection->end = end;
-
-      dialog = gtk_font_dialog_new ();
-      gtk_font_dialog_choose_font (dialog, GTK_WINDOW (self), desc, NULL, font_cb, selection);
-      pango_font_description_free (desc);
-    }
-  else if (gtk_text_iter_forward_search (iter, ";", 0, &end, NULL, NULL) &&
-           gtk_text_iter_forward_search (iter, "mode:", 0, NULL, &start, &end))
-    {
-      /* Assume we have a blend node, for now */
-      GEnumClass *class;
-      GtkStringList *strings;
-      GtkWidget *dd;
-      GtkTextChildAnchor *anchor;
-      unsigned int selected = 0;
-      GtkEventController *key_controller;
-      gboolean is_blend_mode = FALSE;
-      char *text;
-
-      while (g_unichar_isspace (gtk_text_iter_get_char (&start)))
-        gtk_text_iter_forward_char (&start);
-
-      text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-
-      strings = gtk_string_list_new (NULL);
-      class = g_type_class_ref (GSK_TYPE_BLEND_MODE);
-      for (unsigned int i = 0; i < class->n_values; i++)
-        {
-          if (strcmp (class->values[i].value_nick, text) == 0)
-            is_blend_mode = TRUE;
-        }
-      g_type_class_unref (class);
-
-      if (is_blend_mode)
-        class = g_type_class_ref (GSK_TYPE_BLEND_MODE);
-      else
-        class = g_type_class_ref (GSK_TYPE_MASK_MODE);
-
-       for (unsigned int i = 0; i < class->n_values; i++)
-         {
-           if (i == 0 && is_blend_mode)
-             gtk_string_list_append (strings, "normal");
-           else
-             gtk_string_list_append (strings, class->values[i].value_nick);
-
-           if (strcmp (class->values[i].value_nick, text) == 0)
-             selected = i;
-         }
-      g_type_class_unref (class);
-
-      gtk_text_buffer_delete (buffer, &start, &end);
-
-      anchor = gtk_text_buffer_create_child_anchor (buffer, &start);
-      dd = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (dd), selected);
-      gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (self->text_view), dd, anchor);
-
-      selection = g_new0 (Selection, 1);
-      selection->self = self;
-      selection->start = start;
-      selection->end = end;
-
-      key_controller = gtk_event_controller_key_new ();
-      g_signal_connect (key_controller, "key-pressed", G_CALLBACK (key_pressed), selection);
-      gtk_widget_add_controller (dd, key_controller);
-    }
-  else if (gtk_text_iter_forward_search (iter, ";", 0, &end, NULL, NULL) &&
-           gtk_text_iter_forward_search (iter, "texture:", 0, NULL, &start, &end))
-    {
-      GtkFileDialog *dialog;
-      GtkTextIter skip;
-      char *text;
-      GFile *file;
-
-      while (g_unichar_isspace (gtk_text_iter_get_char (&start)))
-        gtk_text_iter_forward_char (&start);
-
-      skip = start;
-      gtk_text_iter_forward_chars (&skip, strlen ("url(\""));
-      text = gtk_text_iter_get_text (&start, &skip);
-      if (strcmp (text, "url(\"") != 0)
-        {
-          g_free (text);
-          return;
-        }
-      g_free (text);
-      start = skip;
-
-      skip = end;
-      gtk_text_iter_backward_chars (&skip, strlen ("\")"));
-      text = gtk_text_iter_get_text (&skip, &end);
-      if (strcmp (text, "\")") != 0)
-        {
-          g_free (text);
-          return;
-        }
-      g_free (text);
-      end = skip;
-
-      gtk_text_buffer_select_range (buffer, &start, &end);
-
-      text = gtk_text_buffer_get_text (buffer, &start, &end, TRUE);
-      file = g_file_new_for_uri (text);
-      g_free (text);
-
-      selection = g_new0 (Selection, 1);
-      selection->self = self;
-      selection->start = start;
-      selection->end = end;
-
-      dialog = gtk_file_dialog_new ();
-      gtk_file_dialog_set_initial_file (dialog, file);
-      gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, file_cb, selection);
-      g_object_unref (file);
-    }
-}
-
-static void
-click_gesture_pressed (GtkGestureClick  *gesture,
-                       int               n_press,
-                       double            x,
-                       double            y,
-                       NodeEditorWindow *self)
-{
-  GtkTextIter iter;
-  int bx, by, trailing;
-  GdkModifierType state;
-
-  state = gtk_event_controller_get_current_event_state (GTK_EVENT_CONTROLLER (gesture));
-  if ((state & GDK_CONTROL_MASK) == 0)
-    return;
-
-  gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (self->text_view), GTK_TEXT_WINDOW_TEXT, x, y, &bx, &by);
-  gtk_text_view_get_iter_at_position (GTK_TEXT_VIEW (self->text_view), &iter, &trailing, bx, by);
-
-  node_editor_window_edit (self, &iter);
-}
-
-static void
-edit_action_cb (GtkWidget  *widget,
-                const char *action_name,
-                GVariant   *parameter)
-{
-  NodeEditorWindow *self = NODE_EDITOR_WINDOW (widget);
-  GtkTextBuffer *buffer;
-  GtkTextIter start, end;
-
-  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (self->text_view));
-  gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
-
-  node_editor_window_edit (self, &start);
-}
-
 static void
 node_editor_window_class_init (NodeEditorWindowClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-  GtkShortcutTrigger *trigger;
-  GtkShortcutAction *action;
-  GtkShortcut *shortcut;
 
   object_class->dispose = node_editor_window_dispose;
   object_class->finalize = node_editor_window_finalize;
@@ -1576,14 +1022,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
   gtk_widget_class_bind_template_callback (widget_class, dark_mode_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_picture_drag_prepare_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_picture_drop_cb);
-  gtk_widget_class_bind_template_callback (widget_class, click_gesture_pressed);
-
-  gtk_widget_class_install_action (widget_class, "smart-edit", NULL, edit_action_cb);
-
-  trigger = gtk_keyval_trigger_new (GDK_KEY_e, GDK_CONTROL_MASK);
-  action = gtk_named_action_new ("smart-edit");
-  shortcut = gtk_shortcut_new (trigger, action);
-  gtk_widget_class_add_shortcut (widget_class, shortcut);
 }
 
 static GtkWidget *
@@ -1701,13 +1139,6 @@ node_editor_window_init (NodeEditorWindow *self)
          "  }\n"
          "  transform: translate(0, 140);\n"
          "}", -1);
-
-  if (g_getenv ("GSK_RENDERER"))
-    {
-      char *new_title = g_strdup_printf ("GTK Node Editor - %s", g_getenv ("GSK_RENDERER"));
-      gtk_window_set_title (GTK_WINDOW (self), new_title);
-      g_free (new_title);
-    }
 }
 
 NodeEditorWindow *

demos/node-editor/node-editor-window.ui

@@ -16,14 +16,6 @@
       </item>
     </section>
   </menu>
-  <menu id="extra_menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Assisted _Edit</attribute>
-        <attribute name="action">smart-edit</attribute>
-      </item>
-    </section>
-  </menu>
 
   <object class="GtkPopover" id="testcase_popover">
     <child>
@@ -171,9 +163,9 @@
             <property name="valign">center</property>
             <property name="adjustment">
               <object class="GtkAdjustment">
-                <property name="lower">-4</property>
-                <property name="value">0</property>
-                <property name="upper">4</property>
+                <property name="lower">1</property>
+                <property name="value">1</property>
+                <property name="upper">10</property>
                 <property name="step-increment">0.1</property>
                 <property name="page-increment">0.5</property>
               </object>
@@ -203,17 +195,10 @@
                 <property name="right-margin">6</property>
                 <property name="bottom-margin">6</property>
                 <property name="has-tooltip">1</property>
-                <property name="extra-menu">extra_menu</property>
                 <signal name="query-tooltip" handler="text_view_query_tooltip_cb"/>
                 <style>
                   <class name="editor" />
                 </style>
-                <child>
-                  <object class="GtkGestureClick">
-                    <property name="button">1</property>
-                    <signal name="pressed" handler="click_gesture_pressed"/>
-                  </object>
-                </child>
               </object>
             </child>
           </object>

demos/node-editor/node-format.md

@@ -2,29 +2,19 @@
 
 GSK render nodes can be serialized and deserialized using APIs such as `gsk_render_node_serialize()` and `gsk_render_node_deserialize()`. The intended use for this is development - primarily the development of GTK - by allowing things such as creating testsuites and benchmarks, exchanging nodes in bug reports. GTK includes the `gtk4-node-editor` application for creating such test files.
 
-The format is a text format that follows the [CSS syntax rules](https://drafts.csswg.org/css-syntax-3/). In particular, this means that every array of bytes will produce a render node when parsed, as there is a defined error recovery method. For more details on error handling, please refer to the documentation of the parsing APIs.
+The format is a text format that follows the [CSS syntax rules](https://drafts.csswg.org/css-syntax-3/). In particular, this means that every array of bytes will produce a render node when parsed, as there is a defined error recovery method. For more details on error handling, please refer to the documentation of the aprsing APIs.
 
 The grammar of a node text representation using [the CSS value definition syntax](https://drafts.csswg.org/css-values-3/#value-defs) looks like this:
 **document**: `<node>\*`
-**node**: container [ "name" ] { <document> } | `<node-type> [ "name" ] { <property>* }` | "name"
+**node**: container { <document> } | `<node-name> { <property>* }`
 **property**: `<property-name>: <node> | <value> ;`
 
-Each node has its own `<node-type>` and supports a custom set of properties, each with their own `<property-name>` and syntax. The following paragraphs document each of the nodes and their properties.
+Each node has its own `<node-name>` and supports a custom set of properties, each with their own `<property-name>` and syntax. The following paragraphs document each of the nodes and their properties.
 
 When serializing and the value of a property equals the default value, this value will not be serialized. Serialization aims to produce an output as small as possible.
 
 To embed newlines in strings, use \A. To break a long string into multiple lines, escape the newline with a \.
 
-# Names
-
-### Nodes
-
-Nodes can be given a name by adding a string after the `<node-type>` in their definition. That same node can then be used further down in the document by specifying just the name identifying the node.
-
-### Textures
-
-Just like nodes, textures can be referenced by name. When defining a named texture, the name has to be placed in front of the URL.
-
 # Nodes
 
 ### container
@@ -188,16 +178,6 @@ Creates a node like `gsk_inset_shadow_node_new()` with the given properties.
 
 Creates a node like `gsk_linear_gradient_node_new()` with the given properties.
 
-### mask
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| source   | `<node>`         | color { }              | always      |
-| mode     | `<mask-mode>`    | alpha                  | non-default |
-| mask     | `<node>`         | color { }              | always      |
-
-Creates a node like `gsk_mask_node_new()` with the given properties.
-
 ### opacity
 
 | property | syntax           | default                | printed     |
@@ -317,21 +297,6 @@ The default texture is a 10x10 checkerboard with the top left and bottom right
 representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")
 `.
 
-### texture-scale
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| texture  | `<url>`          | *see below*            | always      |
-| filter   | `filter`         | *see below*            | non-default |
-
-Creates a node like `gsk_texture_scale_node_new()` with the given properties.
-
-The default texture is a 10x10 checkerboard, just like for texture.
-
-The possible filter values are `linear`, `nearest` and `trilinear`, with
-`linear` being the default.
-
 ### transform
 
 | property | syntax           | default                | printed     |

demos/print-editor/print-editor.c

@@ -6,8 +6,6 @@
 
 #include "demo_conf.h"
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;
@@ -121,7 +119,7 @@ load_file (GFile *open_filename)
 
           alert = gtk_alert_dialog_new ("Error loading file %s", display_name);
           gtk_alert_dialog_set_detail (alert, "Not valid utf8");
-          gtk_alert_dialog_show (alert, GTK_WINDOW (main_window));
+          gtk_alert_dialog_show (alert, GTK_WINDOW (main_window), NULL);
           g_object_unref (alert);
           g_object_unref (info);
         }
@@ -134,7 +132,7 @@ load_file (GFile *open_filename)
 
       alert = gtk_alert_dialog_new ("Error loading file %s", display_name);
       gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window));
+      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window), NULL);
       g_object_unref (alert);
       g_object_unref (info);
       g_error_free (error);
@@ -175,7 +173,7 @@ save_file (GFile *save_filename)
 
       alert = gtk_alert_dialog_new ("Error saving to file %s", display_name);
       gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window));
+      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window), NULL);
       g_object_unref (alert);
       g_error_free (error);
       g_object_unref (info);
@@ -376,7 +374,7 @@ print_done (GtkPrintOperation *op,
       alert = gtk_alert_dialog_new ("Error printing file");
       if (error)
         gtk_alert_dialog_set_detail (alert, error->message);
-      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window));
+      gtk_alert_dialog_show (alert, GTK_WINDOW (main_window), NULL);
       g_object_unref (alert);
     }
   else if (res == GTK_PRINT_OPERATION_RESULT_APPLY)
@@ -510,6 +508,8 @@ activate_save_as (GSimpleAction *action,
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (main_window),
                         NULL,
+                        NULL,
+                        NULL,
                         on_save_response, NULL);
   g_object_unref (dialog);
 }
@@ -553,6 +553,7 @@ activate_open (GSimpleAction *action,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (main_window),
                         NULL,
+                        NULL,
                         on_open_response, NULL);
   g_object_unref (dialog);
 }

demos/widget-factory/meson.build

@@ -3,7 +3,7 @@
 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')
+  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
 endif
 
 ld = find_program('ld', required : false)
@@ -69,7 +69,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_
 else
   widgetfactory_resources = gnome.compile_resources('widgetfactory_resources',
     'widget-factory.gresource.xml',
-    source_dir: meson.current_source_dir(),
+    source_dir: '.',
   )
 endif
 

demos/widget-factory/widget-factory.c

@@ -237,7 +237,7 @@ activate_open_file (GSimpleAction *action,
   GtkFileDialog *dialog;
 
   dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_open (dialog, NULL, NULL, file_chooser_response, NULL);
+  gtk_file_dialog_open (dialog, NULL, NULL, NULL, file_chooser_response, NULL);
   g_object_unref (dialog);
 }
 
@@ -1210,12 +1210,12 @@ typedef struct {
 static void
 add_background (GtkWidget  *flowbox,
                 const char *filename,
-                GdkTexture *texture,
+                GdkPixbuf  *pixbuf,
                 gboolean    is_resource)
 {
   GtkWidget *child;
 
-  child = gtk_picture_new_for_paintable (GDK_PAINTABLE (texture));
+  child = gtk_picture_new_for_pixbuf (pixbuf);
   gtk_widget_set_size_request (child, 110, 70);
   gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), child, -1);
   child = gtk_widget_get_parent (child);
@@ -1231,7 +1231,6 @@ background_loaded_cb (GObject      *source,
 {
   BackgroundData *bd = data;
   GdkPixbuf *pixbuf;
-  GdkTexture *texture;
   GError *error = NULL;
 
   pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
@@ -1242,11 +1241,8 @@ background_loaded_cb (GObject      *source,
       return;
     }
 
-  texture = gdk_texture_new_for_pixbuf (pixbuf);
-  add_background (bd->flowbox, bd->filename, texture, FALSE);
+  add_background (bd->flowbox, bd->filename, pixbuf, FALSE);
 
-  g_object_unref (texture);
-  g_object_unref (pixbuf);
   g_free (bd->filename);
   g_free (bd);
 }
@@ -1263,10 +1259,7 @@ populate_flowbox (GtkWidget *flowbox)
   GInputStream *stream;
   BackgroundData *bd;
   GdkPixbuf *pixbuf;
-  GdkTexture *texture;
   GtkWidget *child;
-  guchar *data;
-  GBytes *bytes;
   int i;
   const char *resources[] = {
     "sunset.jpg", "portland-rose.jpg", "beach.jpg", "nyc.jpg"
@@ -1277,14 +1270,9 @@ populate_flowbox (GtkWidget *flowbox)
 
   g_object_set_data (G_OBJECT (flowbox), "populated", GUINT_TO_POINTER (1));
 
-  data = g_malloc (4 * 110  * 70);
-  memset (data, 0xff, 4 * 110  * 70);
-  bytes = g_bytes_new_take (data, 4 * 110 * 70);
-  texture = gdk_memory_texture_new (110, 70, GDK_MEMORY_DEFAULT, bytes, 4 * 110);
-  child = gtk_picture_new_for_paintable (GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-  g_bytes_unref (bytes);
-
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 110, 70);
+  gdk_pixbuf_fill (pixbuf, 0xffffffff);
+  child = gtk_picture_new_for_pixbuf (pixbuf);
   gtk_widget_add_css_class (child, "frame");
   gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), child, -1);
 
@@ -1292,10 +1280,7 @@ populate_flowbox (GtkWidget *flowbox)
     {
       filename = g_strconcat ("/org/gtk/WidgetFactory4/", resources[i], NULL);
       pixbuf = gdk_pixbuf_new_from_resource_at_scale (filename, 110, 110, TRUE, NULL);
-      texture = gdk_texture_new_for_pixbuf (pixbuf);
-      add_background (flowbox, filename, texture, TRUE);
-      g_object_unref (texture);
-      g_object_unref (pixbuf);
+      add_background (flowbox, filename, pixbuf, TRUE);
     }
 
   location = "/usr/share/backgrounds/gnome";
@@ -2071,67 +2056,6 @@ hide_widget (GtkWidget *widget)
   gtk_widget_set_visible (widget, FALSE);
 }
 
-static void
-load_texture_thread (GTask *task,
-                     gpointer source_object,
-                     gpointer task_data,
-                     GCancellable *cancellable)
-{
-  const char *resource_path = (const char *) task_data;
-  GBytes *bytes;
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  bytes = g_resources_lookup_data (resource_path, 0, &error);
-  if (!bytes)
-    {
-      g_task_return_error (task, error);
-      return;
-    }
-
-  texture = gdk_texture_new_from_bytes (bytes, &error);
-  g_bytes_unref (bytes);
-
-  if (!texture)
-    {
-      g_task_return_error (task, error);
-      return;
-    }
-
-  g_task_return_pointer (task, texture, g_object_unref);
-}
-
-static void
-load_texture_done (GObject *source,
-                   GAsyncResult *result,
-                   gpointer data)
-{
-  GtkWidget *picture = GTK_WIDGET (source);
-  GdkTexture *texture;
-  GError *error = NULL;
-
-  texture = g_task_propagate_pointer (G_TASK (result), &error);
-  if (!texture)
-    {
-      g_warning ("%s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  gtk_picture_set_paintable (GTK_PICTURE (picture), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-}
-
-static void
-load_texture_in_thread (GtkWidget  *picture,
-                        const char *resource_path)
-{
-  GTask *task = g_task_new (picture, NULL, load_texture_done, NULL);
-  g_task_set_task_data (task, (gpointer)resource_path, NULL);
-  g_task_run_in_thread (task, load_texture_thread);
-  g_object_unref (task);
-}
-
 static void
 activate (GApplication *app)
 {
@@ -2231,13 +2155,6 @@ activate (GApplication *app)
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
 
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_sunset"),
-                          "/org/gtk/WidgetFactory4/sunset.jpg");
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_nyc"),
-                          "/org/gtk/WidgetFactory4/nyc.jpg");
-  load_texture_in_thread ((GtkWidget *)gtk_builder_get_object (builder, "notebook_beach"),
-                          "/org/gtk/WidgetFactory4/beach.jpg");
-
   if (g_strcmp0 (PROFILE, "devel") == 0)
     gtk_widget_add_css_class (GTK_WIDGET (window), "devel");
 
@@ -2267,13 +2184,11 @@ activate (GApplication *app)
   for (i = 0; i < G_N_ELEMENTS (accels); i++)
     gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
   gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
   action = G_ACTION (g_property_action_new ("statusbar", widget, "visible"));
   g_action_map_add_action (G_ACTION_MAP (window), action);
   g_object_unref (G_OBJECT (action));
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
   action = G_ACTION (g_property_action_new ("toolbar", widget, "visible"));
@@ -2447,7 +2362,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "record_button");
   g_object_set_data (G_OBJECT (window), "record_button", widget);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   widget = (GtkWidget *)gtk_builder_get_object (builder, "lockbox");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "lockbutton");
   g_object_set_data (G_OBJECT (window), "lockbutton", widget2);
@@ -2465,7 +2379,6 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
                           G_BINDING_SYNC_CREATE);
   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (widget2), permission);
   g_object_unref (permission);
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   widget = (GtkWidget *)gtk_builder_get_object (builder, "iconview1");
   widget2 = (GtkWidget *)gtk_builder_get_object (builder, "increase_button");

demos/widget-factory/widget-factory.ui

@@ -1263,7 +1263,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_sunset">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/sunset.jpg</property>
                                     <property name="content-fit">cover</property>
                                     <child>
                                       <object class="GtkDragSource">
@@ -1289,7 +1290,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_nyc">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/nyc.jpg</property>
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
@@ -1314,7 +1316,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <child>
                               <object class="GtkNotebookPage">
                                 <property name="child">
-                                  <object class="GtkPicture" id="notebook_beach">
+                                  <object class="GtkPicture">
+                                    <property name="file">resource:///org/gtk/WidgetFactory4/beach.jpg</property>
                                     <child>
                                       <object class="GtkDragSource">
                                         <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>

docs/CODING-STYLE.md

@@ -500,9 +500,8 @@ Public headers should never be included directly:
 Private headers should include the public header first, if one exists:
 
 ```c
-  #pragma once
-
-  /* gtkfooprivate.h */
+  #ifndef __GTK_FOO_PRIVATE_H__
+  #define __GTK_FOO_PRIVATE_H__
 
   #include "gtkfoo.h"
 
@@ -511,8 +510,18 @@ Private headers should include the public header first, if one exists:
   #endif /* __GTK_FOO_PRIVATE_H__ */
 ```
 
-All headers should use the `once` pragma to prevent multiple inclusion,
-instead of the classic pre-processor guards:
+All headers should have inclusion guards:
+
+```c
+  #ifndef __GTK_FOO_H__
+  #define __GTK_FOO_H__
+
+  ...
+
+  #endif /* __GTK_FOO_H__ */
+```
+
+You can also use the `once` pragma instead of the classic pre-processor guard:
 
 ```c
   #pragma once
@@ -544,8 +553,6 @@ the source file, either the public installed header, or the private header, if
 it exists.
 
 ```c
-  /* gtkfoo.c */
-
   #include "config.h"
 
   #include "gtkfoo.h"
@@ -587,8 +594,8 @@ Finally, source files should include the system headers last:
   #include <string.h>
 ```
 
-Cyclic dependencies should be avoided if at all possible;
-for instance, you could use additional headers to break cycles.
+Cyclic dependencies should be avoided if at all possible; for instance, you
+could use additional headers to break cycles.
 
 ### GObject
 
@@ -629,8 +636,7 @@ Instance structures should only contain the parent type:
 ```
 
 You should use the `G_DECLARE_DERIVABLE_TYPE()` and `G_DECLARE_FINAL_TYPE()`
-macros in newly written headers. There is also a `GDK_DECLARE_INTERNAL_TYPE()`
-for declaring types that can be derived inside GTK, but not in 3rd party code.
+macros in newly written headers.
 
 Inside your source file, always use the `G_DEFINE_TYPE()`,
 `G_DEFINE_TYPE_WITH_PRIVATE()`, and `G_DEFINE_TYPE_WITH_CODE()` macros, or their
@@ -670,20 +676,13 @@ Interfaces must have the following macros:
 | `GTK_IS_<iface_name>`        | `G_TYPE_CHECK_INSTANCE_TYPE`    |
 | `GTK_<iface_name>_GET_IFACE` | `G_TYPE_INSTANCE_GET_INTERFACE` |
 
-The `G_DECLARE` macros define these as static inline functions instead.
-
 ### Memory allocation
 
-When dynamically allocating data on the heap use `g_new()`.
+When dynamically allocating data on the heap either use `g_new()` or,
+if allocating multiple small data structures, `g_slice_new()`.
 
 Public structure types should always be returned after being zero-ed,
-either explicitly for each member, or by using `g_new0()`. Do not use
-`g_slice` in new code.
-
-Memory that is only needed within the scope of a function can be
-stack-allocated using `g_newa()` or `g_alloca()`. But limit the amount
-of stack memory that you consume this way, in particular in recursive
-functions.
+either explicitly for each member, or by using `g_new0()` or `g_slice_new0()`.
 
 ### Macros
 

docs/reference/gdk/gdk4.toml.in

@@ -18,12 +18,12 @@ search_index = true
   docs_url = "https://docs.gtk.org/gobject/"
 
   [dependencies."Gio-2.0"]
-  name = "Gio"
+  name = "GIO"
   description = "GObject Interfaces and Objects, Networking, IPC, and I/O"
   docs_url = "https://docs.gtk.org/gio/"
 
   [dependencies."cairo-1.0"]
-  name = "cairo"
+  name = "Cairo"
   description = "A 2D graphics library with support for multiple output devices"
   docs_url = "https://www.cairographics.org/manual/"
 

docs/reference/gsk/gsk4.toml.in

@@ -19,7 +19,7 @@ dependencies = ["Graphene-1.0", "Gdk-4.0"]
   docs_url = "https://ebassi.github.io/graphene/docs/"
 
   [dependencies."Gdk-4.0"]
-  name = "Gdk"
+  name = "GDK"
   description = "The GTK windowing system abstraction"
   docs_url = "https://docs.gtk.org/gdk4/"
 

docs/reference/gtk/actions.md

@@ -220,6 +220,6 @@ clipboard.cut, clipboard.copy, clipboard.paste
 selection.delete, selection.select-all
 : Selection operations on entries, text view and labels
 
-color.select, color.customize
+color.select, color.customize:
 : Operate on colors in a `GtkColorChooserWidget`. These actions are
-  unusual in that they have the non-trivial parameter type (dddd).
+  unusual in that they have the non-trivial parameter type (dddd):

docs/reference/gtk/broadway.md

@@ -6,15 +6,22 @@ Slug: broadway
 The GDK Broadway backend provides support for displaying GTK applications in
 a web browser, using HTML5 and web sockets.
 
-To run your application in this way, first run the broadway server,
-`gtk-broadwayd`, that ships with GTK:
+To run your application in this way, select the Broadway backend by setting
+`GDK_BACKEND=broadway`. Then you can make your application appear in a web
+browser by pointing it at `http://127.0.0.1:8080`. Note that you need to
+enable web sockets in your web browser.
+
+You can choose a different port from the default 8080 by setting the
+`BROADWAY_DISPLAY` environment variable to the port that you want to use.
+
+It is also possible to use multiple GTK applications in the same web browser
+window, by using the Broadway server, `gtk4-broadwayd`, that ships with GTK.
+To start the Broadway server use:
 
 ```
 gtk4-broadwayd :5
 ```
 
-The server expects the colon-prefixed display number as a commandline argument.
-
 Then point your web browser at `http://127.0.0.1:8085`.
 
 Once the Broadway server is running, you can start your applications like
@@ -24,8 +31,6 @@ this:
 GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
 ```
 
-Multiple applications can be presented in the same web browser window.
-
 ## Broadway-specific environment variables
 
 ### `BROADWAY_DISPLAY`

docs/reference/gtk/building.md

@@ -236,17 +236,23 @@ By default, GTK will try to build with support for the Vulkan graphics
 API in addition to cairo and OpenGL. This option can be used to explicitly
 control whether Vulkan should be used.
 
-### `media-gstreamer` and `media-ffmpeg`
+### `xinerama`
+
+By default, GTK will try to link against the Xinerama libraries
+if they are found. This option can be used to explicitly control
+whether Xinerama should be used.
+
+### `media`
 
 By default, GTK will try to build the gstreamer backend for
-media playback support. These options can be used to explicitly
+media playback support. This option can be used to explicitly
 control which media backends should be built.
 
-### `print-cups` and `print-cpdb`
+### `print`
 
-By default, GTK will try to build the cups and file print backends
-if their dependencies are found. These options can be used to
-explicitly control which print backends should be built.
+By default, GTK will try to build various print backends
+if their dependencies are found. This option can be used
+to explicitly control which print backends should be built.
 
 ### `cloudproviders`
 
@@ -268,13 +274,18 @@ support in the file chooser.
 This option controls whether GTK should use colord for color
 calibration support in the cups print backend.
 
-### `gtk_doc`, `man-pages` and `update_screenshots`
+### `gtk_doc` and `man-pages`
 
-The *gi-docgen* package is used to generate the reference documentation
-included with GTK. By default support for *gi-docgen* is disabled
+The *gtk-doc* package is used to generate the reference documentation
+included with GTK. By default support for *gtk-doc* is disabled
 because it requires various extra dependencies to be installed.
-Introspection needs to be enabled, since the documentation is generated
-from introspection data.
+If you have *gtk-doc* and *pandoc* installed and are modifying GTK,
+you may want to enable *gtk-doc* support by passing in `-Dgtk_doc=true`.
+
+Additionally, some tools provided by GTK have their own
+manual pages generated using a similar set of dependencies;
+if you have *xsltproc* then you can generate manual pages by
+passing `-Dman-pages=true` when configuring the build.
 
 ### `introspection`
 
@@ -283,14 +294,9 @@ is mainly useful for shortening turnaround times on developer
 systems. Installed builds of GTK should always have introspection
 support.
 
-### `build-testsuite`
+### `build-tests`, `install-tests`, `demos`
 
-If you want to run the testsuite to ensure that your GTK build
-works, you should enable it with this option.
-
-### `build-tests`, `build-examples`, `build-demos`
-
-By default, GTK will build quite a few tests, examples and demos.
+By default, GTK will build quite a few tests and demos.
 While these are useful on a developer system, they are not
 needed when GTK is built e.g. for a flatpak runtime. These
 options allow to disable building tests and demos.

docs/reference/gtk/coordinates.md

@@ -1,84 +0,0 @@
-Title: Coordinate systems
-Slug: gtk-coordinates
-
-## Coordinate systems in GTK
-
-All coordinate systems in GTK have the origin at the top left, with the X axis
-pointing right, and the Y axis pointing down. This matches the convention used
-in X11, Wayland and cairo, but differs from OpenGL and PostScript, where the origin
-is in the lower left, and the Y axis is pointing up.
-
-Every widget in a window has its own coordinate system that it uses to place its
-child widgets and to interpret events. Most of the time, this fact can be safely
-ignored. The section will explain the details for the few cases when it is important.
-
-## The box model
-
-When it comes to rendering, GTK follows the CSS box model as far as practical.
-
-<picture>
-  <source srcset="box-model-dark.png" media="(prefers-color-scheme: dark)">
-  <img alt="Box Model" src="box-model-light.png">
-</picture>
-
-The CSS stylesheet that is in use determines the sizes (and appearance) of the
-margin, border and padding areas for each widget. The size of the content area
-is determined by GTKs layout algorithm using each widgets [vfunc@Gtk.Widget.measure]
-and [vfunc@Gtk.Widget.size_allocate] vfuncs.
-
-You can learn more about the CSS box model by reading the
-[CSS specification](https://www.w3.org/TR/css-box-3/#box-model) or the
-Mozilla [documentation](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/The_box_model).
-
-To learn more about where GTK CSS differs from CSS on the web, see the
-[CSS overview](css-overview.html).
-
-## Widgets
-
-The content area in the CSS box model is the region that the widget considers its own.
-
-The origin of the widgets coordinate system is the top left corner of the content area,
-and its size is the widgets size. The size can be queried with [method@Gtk.Widget.get_width]
-and [method@Gtk.Widget.get_height]. GTK allows general 3D transformations to position
-widgets (although most of the time, the transformation will be a simple 2D translation).
-The transform to go from one widgets coordinate system to another one can be obtained
-with [method@Gtk.Widget.compute_transform].
-
-In addition to a size, widgets can optionally have a **_baseline_** to position text on.
-Containers such as [class@Gtk.Box] may position their children to match up their baselines.
-[method@Gtk.Widget.get_baseline] returns the y position of the baseline in widget coordinates.
-
-When widget APIs expect positions or areas, they need to be expressed in this coordinate
-system, typically called **_widget coordinates_**. GTK provides a number of APIs to translate
-between different widgets' coordinate systems, such as [method@Gtk.Widget.compute_point]
-or [method@Gtk.Widget.compute_bounds]. These methods can fail (either because the widgets
-don't share a common ancestor, or because of a singular transformation), and callers need
-to handle this eventuality.
-
-Another area that is occasionally relevant are the widgets **_bounds_**, which is the area
-that a widgets rendering is typically confined to (technically, widgets can draw outside
-of this area, unless clipping is enforced via the [property@Gtk.Widget:overflow] property).
-In CSS terms, the bounds of a widget correspond to the border area.
-
-During GTK's layout algorithm, a parent widget needs to measure each visible child and
-allocate them at least as much size as measured. These functions take care of respecting
-the CSS box model and widget properties such as align and margin. This happens in the
-parent's coordinate system.
-
-Note that the **_text direction_** of a widget does not influence its coordinate
-system, but simply determines whether text flows in the direction of increasing
-or decreasing X coordinates.
-
-## Events
-
-Event controllers and gestures report positions in the coordinate system of the widget
-they are attached to.
-
-If you are dealing with raw events in the form of [class@Gdk.Event] that have positions
-associated with them (e.g. the pointer position), such positions are expressed in
-**_surface coordinates_**, which have their origin at the top left corner of the
-[class@Gdk.Surface].
-
-To translate from surface to widget coordinates, you have to apply the offset from the
-top left corner of the surface to the top left corner of the topmost widget, which can
-be obtained with [method@Gtk.Native.get_surface_transform].

docs/reference/gtk/getting_started.md

@@ -66,10 +66,6 @@ You can compile the program above with GCC using:
 gcc $( pkg-config --cflags gtk4 ) -o example-0 example-0.c $( pkg-config --libs gtk4 )
 ```
 
-**Note**: If the above compilation does not work due to an error regarding `G_APPLICATION_DEFAULT_FLAGS`
-this could be due to your OS providing an older version of GLib. For GLib versions older than 2.74 you
-will need to replace `G_APPLICATION_DEFAULT_FLAGS` with `G_APPLICATION_FLAGS_NONE` in this example, and
-others in this documentation.
 For more information on how to compile a GTK application, please
 refer to the [Compiling GTK Applications](compiling.html)
 section in this reference.
@@ -381,7 +377,7 @@ demonstrates input event handling with event controllers.
 
 ### Drawing in response to input
 
-Create a new file with the following content named `example-3.c`.
+Create a new file with the following content named `example-4.c`.
 
 ```c
 #include <gtk/gtk.h>
@@ -576,7 +572,7 @@ main (int    argc,
 You can compile the program above with GCC using:
 
 ```
-gcc $( pkg-config --cflags gtk4 ) -o example-3 example-3.c $( pkg-config --libs gtk4 )
+gcc $( pkg-config --cflags gtk4 ) -o example-4 example-4.c $( pkg-config --libs gtk4 )
 ```
 
 ## Building user interfaces
@@ -591,7 +587,7 @@ XML format that can be parsed by the [class@Gtk.Builder] class.
 
 ### Packing buttons with GtkBuilder
 
-Create a new file with the following content named `example-4.c`.
+Create a new file with the following content named `example-3.c`.
 
 ```c
 #include <gtk/gtk.h>
@@ -701,7 +697,7 @@ Create a new file with the following content named `builder.ui`.
 You can compile the program above with GCC using:
 
 ```
-gcc $( pkg-config --cflags gtk4 ) -o example-4 example-4.c $( pkg-config --libs gtk4 )
+gcc $( pkg-config --cflags gtk4 ) -o example-3 example-3.c $( pkg-config --libs gtk4 )
 ```
 
 Note that `GtkBuilder` can also be used to construct objects that are

docs/reference/gtk/gtk4-builder-tool.rst

@@ -33,11 +33,6 @@ Validation
 The ``validate`` command validates the given UI definition file and reports
 errors to ``stderr``.
 
-Note that there are limitations to the validation that can be done for templates,
-since they are closely tied to the class_init function they are used in.
-If your UI file uses types from third-party libraries, it may help to add those
-libraries to the `LD_PRELOAD` environment variable.
-
 ``--deprecations``
 
   Warn about uses of deprecated types in the UI definition file.

docs/reference/gtk/gtk4.toml.in

@@ -14,12 +14,12 @@ search_index = true
 dependencies = ["Gdk-4.0", "Gsk-4.0"]
 
   [dependencies."Gdk-4.0"]
-  name = "Gdk"
+  name = "GDK"
   description = "The GTK windowing system abstraction"
   docs_url = "https://docs.gtk.org/gdk4/"
 
   [dependencies."Gsk-4.0"]
-  name = "Gsk"
+  name = "GSK"
   description = "The GTK rendering abstraction"
   docs_url = "https://docs.gtk.org/gsk4/"
 
@@ -68,7 +68,6 @@ content_files = [
   "input-handling.md",
   "drag-and-drop.md",
   "drawing-model.md",
-  "coordinates.md",
   "css-overview.md",
   "css-properties.md",
   "section-accessibility.md",
@@ -242,7 +241,5 @@ content_images = [
   "images/rich-list.png",
   "images/data-table.png",
   "images/navigation-sidebar.png",
-  "images/box-model-light.png",
-  "images/box-model-dark.png",
 ]
 urlmap_file = "urlmap.js"

docs/reference/gtk/images/box-model.svg

@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 210 297"
-   version="1.1"
-   id="svg5"
-   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
-   sodipodi:docname="box-model.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview7"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     showgrid="false"
-     inkscape:zoom="0.84096521"
-     inkscape:cx="265.76605"
-     inkscape:cy="312.14133"
-     inkscape:window-width="1920"
-     inkscape:window-height="1123"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2">
-    <marker
-       style="overflow:visible"
-       id="Arrow2"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Arrow2"
-       markerWidth="7.6999998"
-       markerHeight="5.5999999"
-       viewBox="0 0 7.7 5.6"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.7)"
-         d="M -2,-4 9,0 -2,4 c 2,-2.33 2,-5.66 0,-8 z"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:none"
-         id="arrow2L" />
-    </marker>
-    <marker
-       style="overflow:visible"
-       id="Arrow2-4"
-       refX="0"
-       refY="0"
-       orient="auto-start-reverse"
-       inkscape:stockid="Arrow2"
-       markerWidth="7.6999998"
-       markerHeight="5.5999999"
-       viewBox="0 0 7.7 5.6"
-       inkscape:isstock="true"
-       inkscape:collect="always"
-       preserveAspectRatio="xMidYMid">
-      <path
-         transform="scale(0.7)"
-         d="M -2,-4 9,0 -2,4 c 2,-2.33 2,-5.66 0,-8 z"
-         style="fill:context-stroke;fill-rule:evenodd;stroke:none"
-         id="arrow2L-7" />
-    </marker>
-  </defs>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:10.58333333;stroke-dasharray:none"
-       id="rect234-0"
-       width="112.51476"
-       height="70.089249"
-       x="38.634876"
-       y="49.512993" />
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:0.487868;stroke-dasharray:none"
-       id="rect234"
-       width="146.21118"
-       height="103.37679"
-       x="21.283342"
-       y="33.173706" />
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:0.54387;stroke-dasharray:none"
-       id="rect234-3"
-       width="79.543648"
-       height="37.520485"
-       x="55.724121"
-       y="65.367287" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none"
-       x="76.878265"
-       y="100.819"
-       id="text3935"><tspan
-         sodipodi:role="line"
-         id="tspan3933"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke-width:0.264583"
-         x="76.878265"
-         y="100.819">content</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none"
-       x="77.072464"
-       y="111.58885"
-       id="text4767"><tspan
-         sodipodi:role="line"
-         id="tspan4765"
-         style="fill:#000000;fill-opacity:1;stroke-width:0.264583"
-         x="77.072464"
-         y="111.58885">padding</tspan><tspan
-         sodipodi:role="line"
-         style="fill:#000000;fill-opacity:1;stroke-width:0.264583"
-         x="77.072464"
-         y="124.8181"
-         id="tspan4769" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none"
-       x="77.337868"
-       y="133.01045"
-       id="text4767-1"><tspan
-         sodipodi:role="line"
-         id="tspan8053"
-         x="77.337868"
-         y="133.01045">margin</tspan><tspan
-         sodipodi:role="line"
-         id="tspan8055"
-         x="77.337868"
-         y="146.2397"></tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5834px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-       x="77.311295"
-       y="123.22021"
-       id="text7028"><tspan
-         sodipodi:role="line"
-         id="tspan7026"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-         x="77.311295"
-         y="123.22021">border</tspan></text>
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2)"
-       d="M 58.115912,67.846321 71.79645,67.813301"
-       id="path9563" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2-4)"
-       d="m 58.054931,67.806272 -0.03031,13.680545"
-       id="path9563-6"
-       inkscape:transform-center-x="0.99122989"
-       inkscape:transform-center-y="-10.282891" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52785px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-       x="74.660751"
-       y="69.01046"
-       id="text10129"><tspan
-         sodipodi:role="line"
-         id="tspan10127"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52785px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583"
-         x="74.660751"
-         y="69.01046">X</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52785px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-       x="56.974892"
-       y="86.498825"
-       id="text10133"><tspan
-         sodipodi:role="line"
-         id="tspan10131"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52785px;font-family:Cantarell;-inkscape-font-specification:'Cantarell, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;stroke-width:0.264583"
-         x="56.974892"
-         y="86.498825">Y</tspan></text>
-    <circle
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-dasharray:none;stroke-opacity:1"
-       id="path10187"
-       cx="58.076889"
-       cy="67.895195"
-       r="0.2" />
-  </g>
-</svg>

docs/reference/gtk/images/meson.build

@@ -68,7 +68,6 @@ ui_files = [
   'stackswitcher.ui',
   'statusbar.ui',
   'switch.ui',
-  'switch-state.ui',
   'toggle-button.ui',
   'video.ui',
   'volumebutton.ui',

docs/reference/gtk/images/switch-state.ui

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow">
-    <property name="decorated">0</property>
-    <property name="resizable">0</property>
-    <property name="default-width">280</property>
-    <property name="default-height">120</property>
-    <style>
-       <class name="nobackground"/>
-    </style>
-    <child>
-      <object class="GtkBox">
-        <style>
-          <class name="shadow"/>
-          <class name="background"/>
-          <class name="frame"/>
-        </style>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <property name="hexpand">1</property>
-            <property name="vexpand">1</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GtkSwitch">
-                <property name="active">1</property>
-                <property name="state">0</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkSwitch">
-                <property name="active">0</property>
-                <property name="state">1</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>