wip: benchmarks

Keep a bitset of positions where the array contains
objects, and check those for reusable objects whenever
we need a new object.

We still keep the low-bit marking of string pointers,
so we can implement g_list_model_get_item without having
to consult the bitset.

In scrolling through the words demo, this keeps the
number of live string objects at ~200.

.gitlab-ci.yml

@@ -1,8 +1,9 @@
 stages:
-  - style-check
   - build
-  - deploy
+  - analysis
+  - docs
   - flatpak
+  - deploy
 
 .cache-paths: &cache-paths
   paths:
@@ -16,7 +17,12 @@ stages:
 # Common variables
 variables:
   COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
+  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
+  FEATURE_FLAGS: "-Dcloudproviders=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v17"
+  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"
 
 .only-default:
   only:
@@ -26,96 +32,93 @@ variables:
 
 style-check-diff:
   extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v13
-  stage: style-check
+  image: $FEDORA_IMAGE
+  stage: .pre
   allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
+.build-fedora-default:
+  image: $FEDORA_IMAGE
+  artifacts:
+    when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report-x11.xml"
+        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
+        - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
+    name: "gtk-${CI_COMMIT_REF_NAME}"
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
+      - "${CI_PROJECT_DIR}/_build/report*.xml"
+      - "${CI_PROJECT_DIR}/_build/report*.html"
+      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
+      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
+      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
+  cache:
+    key: "$CI_JOB_NAME"
+    paths:
+      - _ccache/
+      - subprojects/gdk-pixbuf/
+      - subprojects/glib/
+      - subprojects/graphene/
+      - subprojects/libepoxy/
+      - subprojects/pango/
+
 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v13
+  extends: .build-fedora-default
   stage: build
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
-            -Dx11-backend=true
-            -Dwayland-backend=true
-            -Dbroadway-backend=true
-            -Dvulkan=yes
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             -Dprofiler=true
             _build
     - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report.xml"
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report.xml"
-      - "${CI_PROJECT_DIR}/_build/report.html"
-      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*.syscap"
-  cache:
-    key: "$CI_JOB_NAME"
-    <<: *cache-paths
+    - .gitlab-ci/run-tests.sh _build x11
+    - .gitlab-ci/run-tests.sh _build wayland
+    - .gitlab-ci/run-tests.sh _build broadway
 
 release-build:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v13
+  extends: .build-fedora-default
   stage: build
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
-    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
-            -Dx11-backend=true
-            -Dwayland-backend=true
-            -Dbroadway-backend=true
-            -Dvulkan=yes
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
     - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report.xml"
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report.xml"
-      - "${CI_PROJECT_DIR}/_build/report.html"
-      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*.syscap"
-  cache:
-    key: "$CI_JOB_NAME"
-    <<: *cache-paths
+    - .gitlab-ci/run-tests.sh _build x11
 
-.mingw-defaults: &mingw-defaults
+.mingw-defaults:
   stage: build
   tags:
-    - win32
+    - win32-ps
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
   cache:
-    key: "%CI_JOB_NAME%"
-    <<: *cache-paths
+    key: "$CI_JOB_NAME"
+    paths:
+      - _ccache/
+      - subprojects/gdk-pixbuf/
+      - subprojects/glib/
+      - subprojects/graphene/
+      - subprojects/libepoxy/
+      - subprojects/pango/
 
-msys2-mingw32:
+msys2-mingw64:
+  extends: .mingw-defaults
   variables:
-    MSYSTEM: "MINGW32"
+    MSYSTEM: "MINGW64"
     CHERE_INVOKING: "yes"
-  <<: *mingw-defaults
 
-.flatpak-defaults: &flatpak-defaults
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+.flatpak-defaults:
+  image: $FLATPAK_IMAGE
   stage: flatpak
   allow_failure: true
+  tags:
+    - flatpak
   artifacts:
     paths:
       - "${APPID}-dev.flatpak"
@@ -124,58 +127,79 @@ msys2-mingw32:
     - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
 
 # Manual jobs, for branches and MRs
-.flatpak-manual: &flatpak-manual
-  <<: *flatpak-defaults
+.flatpak-manual:
+  extends: .flatpak-defaults
   when: manual
 
 # Only build Flatpak bundles automatically on master
-.flatpak-master: &flatpak-master
-  <<: *flatpak-defaults
+.flatpak-master:
+  extends: .flatpak-defaults
   only:
     - master
 
 flatpak-manual:demo:
+  extends: .flatpak-manual
   variables:
     APPID: org.gtk.Demo4
-  <<: *flatpak-manual
 
 flatpak-master:demo:
+  extends: .flatpak-master
   variables:
     APPID: org.gtk.Demo4
-  <<: *flatpak-master
 
 flatpak-manual:widget-factory:
+  extends: .flatpak-manual
   variables:
     APPID: org.gtk.WidgetFactory4
-  <<: *flatpak-manual
 
 flatpak-master:widget-factory:
+  extends: .flatpak-master
   variables:
     APPID: org.gtk.WidgetFactory4
-  <<: *flatpak-master
 
 flatpak-manual:icon-browser:
+  extends: .flatpak-manual
   variables:
     APPID: org.gtk.IconBrowser4
-  <<: *flatpak-manual
 
 flatpak-master:icon-browser:
+  extends: .flatpak-master
   variables:
     APPID: org.gtk.IconBrowser4
-  <<: *flatpak-master
 
-pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v13
-  stage: deploy
+static-scan:
+  image: $FEDORA_IMAGE
+  stage: analysis
+  variables:
+    EXTRA_MESON_FLAGS: "--buildtype=debug"
+  script:
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _scan_build
+    - ninja -C _scan_build scan-build
+  artifacts:
+    paths:
+      - _scan_build/meson-logs
+  allow_failure: true
+
+reference:
+  image: $DOCS_IMAGE
+  stage: docs
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
-    - meson ${COMMON_MESON_FLAGS} -Dgtk_doc=true _build
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true _build
     - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-    - mkdir -p public/
-    - mv _build/docs/reference/gdk/html/ public/gdk/
-    - mv _build/docs/reference/gsk/html/ public/gsk/
-    - mv _build/docs/reference/gtk/html/ public/gtk/
+    - mkdir -p _reference/
+    - mv _build/docs/reference/gdk/html/ _reference/gdk/
+    - mv _build/docs/reference/gsk/html/ _reference/gsk/
+    - mv _build/docs/reference/gtk/html/ _reference/gtk/
+  artifacts:
+    paths:
+      - _reference
+
+pages:
+  stage: deploy
+  script:
+    - mv _reference/ public/
   artifacts:
     paths:
       - public

.gitlab-ci/fedora-base.Dockerfile

@@ -0,0 +1,88 @@
+FROM fedora:31
+
+RUN dnf -y install \
+    adwaita-icon-theme \
+    atk-devel \
+    at-spi2-atk-devel \
+    avahi-gobject-devel \
+    cairo-devel \
+    cairo-gobject-devel \
+    ccache \
+    clang \
+    clang-analyzer \
+    colord-devel \
+    cups-devel \
+    dbus-daemon \
+    dbus-x11 \
+    dejavu-sans-mono-fonts \
+    desktop-file-utils \
+    diffutils \
+    elfutils-libelf-devel \
+    fribidi-devel \
+    gcc \
+    gcc-c++ \
+    gdk-pixbuf2-devel \
+    gdk-pixbuf2-modules \
+    gettext \
+    git \
+    glib2-devel \
+    glib2-static \
+    glibc-devel \
+    glibc-headers \
+    gobject-introspection-devel \
+    graphene-devel \
+    gstreamer1-devel \
+    gstreamer1-plugins-good \
+    gstreamer1-plugins-bad-free-devel \
+    gstreamer1-plugins-base-devel \
+    gtk-doc \
+    hicolor-icon-theme \
+    iso-codes \
+    itstool \
+    json-glib-devel \
+    lcov \
+    libattr-devel \
+    libepoxy-devel \
+    libffi-devel \
+    libmount-devel \
+    librsvg2 \
+    libselinux-devel \
+    libXcomposite-devel \
+    libXcursor-devel \
+    libXcursor-devel \
+    libXdamage-devel \
+    libXfixes-devel \
+    libXi-devel \
+    libXinerama-devel \
+    libxkbcommon-devel \
+    libXrandr-devel \
+    libXrender-devel \
+    libXtst-devel \
+    libxslt \
+    mesa-dri-drivers \
+    mesa-libEGL-devel \
+    mesa-libwayland-egl-devel \
+    ninja-build \
+    pango-devel \
+    pcre-devel \
+    pcre-static \
+    python3 \
+    python3-jinja2 \
+    python3-pip \
+    python3-pygments \
+    python3-wheel \
+    redhat-rpm-config \
+    sassc \
+    sysprof-devel \
+    systemtap-sdt-devel \
+    vulkan-devel \
+    wayland-devel \
+    wayland-protocols-devel \
+    weston \
+    weston-libs \
+    which \
+    xorg-x11-server-Xvfb \
+ && dnf clean all
+
+RUN pip3 install meson==0.53.1
+

.gitlab-ci/fedora-docs.Dockerfile

@@ -0,0 +1,12 @@
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
+
+RUN dnf -y install pandoc
+
+ARG HOST_USER_ID=5555
+ENV HOST_USER_ID ${HOST_USER_ID}
+RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+
+USER user
+WORKDIR /home/user
+
+ENV LANG C.UTF-8

.gitlab-ci/fedora.Dockerfile

@@ -1,86 +1,4 @@
-FROM fedora:31
-
-RUN dnf -y install \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    clang \
-    colord-devel \
-    cups-devel \
-    dbus-daemon \
-    dejavu-sans-mono-fonts \
-    desktop-file-utils \
-    diffutils \
-    elfutils-libelf-devel \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    git \
-    glib2-devel \
-    glib2-static \
-    glibc-devel \
-    glibc-headers \
-    gobject-introspection-devel \
-    graphene-devel \
-    gstreamer1-devel \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-base-devel \
-    gtk-doc \
-    hicolor-icon-theme \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    lcov \
-    libattr-devel \
-    libepoxy-devel \
-    libffi-devel \
-    libmount-devel \
-    librsvg2 \
-    libselinux-devel \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    libXtst-devel \
-    libxslt \
-    mesa-dri-drivers \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    ninja-build \
-    pango-devel \
-    pcre-devel \
-    pcre-static \
-    python3 \
-    python3-jinja2 \
-    python3-pip \
-    python3-pygments \
-    python3-wheel \
-    redhat-rpm-config \
-    sassc \
-    sysprof-devel \
-    systemtap-sdt-devel \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    which \
-    xorg-x11-server-Xvfb \
- && dnf clean all
-
-RUN pip3 install meson==0.52.1
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/flatpak-build.sh

@@ -8,6 +8,7 @@ builddir=flatpak_app
 repodir=repo
 
 flatpak-builder \
+        --user --disable-rofiles-fuse \
         --stop-at=gtk \
         ${builddir} \
         build-aux/flatpak/${appid}.json
@@ -23,11 +24,12 @@ flatpak build ${builddir} meson \
                 -Dbuild-examples=false \
                 -Dintrospection=false \
                 -Ddemos=true \
-                _build .
+                _flatpak_build
 
-flatpak build ${builddir} ninja -C _build install
+flatpak build ${builddir} ninja -C _flatpak_build install
 
 flatpak-builder \
+        --user --disable-rofiles-fuse \
         --finish-only \
         --repo=${repodir} \
         ${builddir} \

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

@@ -138,12 +138,13 @@ ul.images li {
 </head>
 <body>
   <header>
-    <h1>{{ report.project_name }}/{{ report.branch_name }} :: Test Reports</h1>
+    <h1>{{ report.project_name }}/{{ report.backend }}/{{ report.branch_name }} :: Test Reports</h1>
   </header>
 
   <article>
     <section>
       <div class="report-meta">
+        <p><strong>Backend:</strong> {{ report.backend }}</p>
         <p><strong>Branch:</strong> {{ report.branch_name }}</p>
         <p><strong>Date:</strong> <time datetime="{{ report.date.isoformat() }}">{{ report.locale_date }}</time></p>
         {% if report.job_id %}<p><strong>Job ID:</strong> {{ report.job_id }}</p>{% endif %}
@@ -174,7 +175,7 @@ ul.images li {
         <div class="failures">
           <h4><a name="{{ suite_result.suite_name }}-failed">Failures</a></h4>
           <ul class="failed">
-            {% for failure in suite_result.failures if failure.result in [ 'FAIL', 'UNEXPECTEDPASS' ] %}
+            {% for failure in suite_result.failures if failure.result in [ 'ERROR', 'FAIL', 'UNEXPECTEDPASS' ] %}
             <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
               {% if failure.stdout %}
               Output: <pre>{{ failure.stdout }}</pre>
@@ -207,24 +208,6 @@ ul.images li {
         </div>
 
         <div class="successes">
-          <h4><a name="{{ suite_result.suite_name }}-skipped">Skipped</a></h4>
-          <ul>
-            {% for success in suite_result.successes if success.result == 'SKIP' %}
-            <li>{{ success.name }} - result: <span class="result skip">{{ success.result }}</li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
-          <h4><a name="{{ suite_result.suite_name }}-passed">Passed</a></h4>
-          <ul class="passed">
-            {% for success in suite_result.successes if success.result == 'OK' %}
-            <li>{{ success.name }} - result: <span class="result pass">{{ success.result }}</li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
           <h4><a name="{{ suite_result.suite_name }}-expected-fail">Expected failures</a></h4>
           <ul>
           {% for success in suite_result.successes if success.result == 'EXPECTEDFAIL' %}
@@ -244,6 +227,24 @@ ul.images li {
             <li>None</li>
           {% endfor %}
           </ul>
+
+          <h4><a name="{{ suite_result.suite_name }}-skipped">Skipped</a></h4>
+          <ul>
+            {% for success in suite_result.successes if success.result == 'SKIP' %}
+            <li>{{ success.name }} - result: <span class="result skip">{{ success.result }}</li>
+            {% else %}
+            <li>None</li>
+            {% endfor %}
+          </ul>
+
+          <h4><a name="{{ suite_result.suite_name }}-passed">Passed</a></h4>
+          <ul class="passed">
+            {% for success in suite_result.successes if success.result == 'OK' %}
+            <li>{{ success.name }} - result: <span class="result pass">{{ success.result }}</li>
+            {% else %}
+            <li>None</li>
+            {% endfor %}
+          </ul>
         </div>
 
       </div>
@@ -259,6 +260,9 @@ aparser = argparse.ArgumentParser(description='Turns a Meson test log into an HT
 aparser.add_argument('--project-name', metavar='NAME',
                      help='The project name',
                      default='Unknown')
+aparser.add_argument('--backend', metavar='NAME',
+                     help='The used backend',
+                     default='unknown')
 aparser.add_argument('--job-id', metavar='ID',
                      help='The job ID for the report',
                      default=None)
@@ -319,6 +323,7 @@ report = {}
 report['date'] = datetime.datetime.utcnow()
 report['locale_date'] = report['date'].strftime("%c")
 report['project_name'] = args.project_name
+report['backend'] = args.backend
 report['job_id'] = args.job_id
 report['branch_name'] = args.branch
 report['total_successes'] = 0
@@ -331,7 +336,7 @@ for name, units in suites.items():
     print('Processing {} suite {}:'.format(project_name, suite_name))
 
     def if_failed(unit):
-        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
+        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT', 'ERROR',]:
             return True
         return False
 

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

@@ -19,6 +19,9 @@ aparser = argparse.ArgumentParser(description='Turns a Meson test log into a JUn
 aparser.add_argument('--project-name', metavar='NAME',
                      help='The project name',
                      default='unknown')
+aparser.add_argument('--backend', metavar='NAME',
+                     help='The used backend',
+                     default='unknown')
 aparser.add_argument('--job-id', metavar='ID',
                      help='The job ID for the report',
                      default='Unknown')
@@ -70,7 +73,7 @@ for name, units in suites.items():
     print('Processing suite {} (units: {})'.format(name, len(units)))
 
     def if_failed(unit):
-        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
+        if unit['result'] in ['ERROR', 'FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
             return True
         return False
 
@@ -92,18 +95,18 @@ for name, units in suites.items():
     for unit in successes:
         testcase = ET.SubElement(testsuite, 'testcase')
         testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', unit['name'])
+        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
         testcase.set('time', str(unit['duration']))
 
     for unit in failures:
         testcase = ET.SubElement(testsuite, 'testcase')
         testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', unit['name'])
+        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
         testcase.set('time', str(unit['duration']))
 
         failure = ET.SubElement(testcase, 'failure')
         failure.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        failure.set('name', unit['name'])
+        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
         failure.set('type', 'error')
         failure.text = unit['stdout']
 

.gitlab-ci/run-docker.sh

@@ -81,24 +81,29 @@ fi
 
 if [ -z $base_version ]; then
         base_version="latest"
-else
+elif [ $base_version != "latest" ]; then
         base_version="v$base_version"
 fi
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/${base}:${base_version}"
+if [ ! -x "$(command -v docker)" ] || [ docker --help |& grep -q podman ]; then
+        # Docker is actually implemented by podman, and its OCI output
+        # is incompatible with some of the dockerd instances on GitLab
+        # CI runners.
+        echo "Using: Podman"
+        format="--format docker"
+        CMD="podman"
+else
+        echo "Using: Docker"
+        format=""
+        CMD="sudo docker"
+fi
+
+REGISTRY="registry.gitlab.gnome.org"
+TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
 
 if [ $build == 1 ]; then
-        if docker --help |& grep -q podman; then
-                # Docker is actually implemented by podman, and its OCI output
-                # is incompatible with some of the dockerd instances on GitLab
-                # CI runners.
-                format="--format docker"
-        else
-                format=""
-        fi
-
         echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        sudo docker build \
+        ${CMD} build \
                 ${format} \
                 --build-arg HOST_USER_ID="$UID" \
                 --tag "${TAG}" \
@@ -110,16 +115,16 @@ if [ $push == 1 ]; then
         echo -e "\e[1;32mPUSHING\e[0m: ${base} as ${TAG}"
 
         if [ $no_login == 0 ]; then
-                sudo docker login registry.gitlab.gnome.org
+                ${CMD} login ${REGISTRY}
         fi
 
-        sudo docker push $TAG
+        ${CMD} push ${TAG}
         exit $?
 fi
 
 if [ $run == 1 ]; then
         echo -e "\e[1;32mRUNNING\e[0m: ${base} as ${TAG}"
-        sudo docker run \
+        ${CMD} run \
                 --rm \
                 --volume "$(pwd)/..:/home/user/app" \
                 --workdir "/home/user/app" \

.gitlab-ci/run-style-check-diff.sh

@@ -1,11 +1,18 @@
 #!/bin/bash
 
-set +e
+set -e
 
 # We need to add a new remote for the upstream master, since this script could
 # be running in a personal fork of the repository which has out of date branches.
-git remote add upstream https://gitlab.gnome.org/GNOME/gtk.git
-git fetch upstream
+if [ "${CI_PROJECT_NAMESPACE}" != "GNOME" ]; then
+    echo "Retrieving the current upstream repository from ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}..."
+    git remote add upstream https://gitlab.gnome.org/GNOME/gtk.git
+    git fetch upstream
+    ORIGIN="upstream"
+else
+    echo "Reusing the existing repository on ${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}"
+    ORIGIN="origin"
+fi
 
 # Work out the newest common ancestor between the detached HEAD that this CI job
 # has checked out, and the upstream target branch (which will typically be
@@ -13,8 +20,9 @@ git fetch upstream
 #
 # `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in
 # a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise.
-newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}) <(git rev-list --first-parent HEAD) | head -1)
+newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "${ORIGIN}/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent HEAD) | head -1)
 git diff -U0 --no-color "${newest_common_ancestor_sha}" | .gitlab-ci/clang-format-diff.py -binary "clang-format" -p1
+exit_status=$?
 
 # The style check is not infallible. The clang-format configuration cannot
 # perfectly describe GTK’s coding style: in particular, it cannot align
@@ -32,3 +40,5 @@ echo "   https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
 echo "Warnings from this tool can be ignored in favour of the documented "
 echo "coding style, or in favour of matching the style of existing"
 echo "surrounding code."
+
+exit ${exit_status}

.gitlab-ci/run-tests.sh

@@ -5,30 +5,75 @@ set +e
 
 srcdir=$( pwd )
 builddir=$1
+backend=$2
 
-export GDK_BACKEND=x11
-xvfb-run -a -s "-screen 0 1024x768x24" \
-        meson test -C ${builddir} \
+case "${backend}" in
+  x11)
+    xvfb-run -a -s "-screen 0 1024x768x24" \
+          meson test -C ${builddir} \
                 --print-errorlogs \
+                --setup=${backend} \
                 --suite=gtk \
-                --no-suite=gtk:a11y
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-broadway
 
-# Store the exit code for the CI run, but always
-# generate the reports
-exit_code=$?
+    # Store the exit code for the CI run, but always
+    # generate the reports
+    exit_code=$?
+    ;;
+
+  wayland)
+    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+    weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
+    compositor=$!
+    export WAYLAND_DISPLAY=wayland-5
+
+    meson test -C ${builddir} \
+                --print-errorlogs \
+                --setup=${backend} \
+                --suite=gtk \
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-broadway
+
+    exit_code=$?
+    kill ${compositor}
+    ;;
+
+  broadway)
+    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+
+    ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
+    server=$!
+    export BROADWAY_DISPLAY=:5
+
+    meson test -C ${builddir} \
+                --print-errorlogs \
+                --setup=${backend} \
+                --suite=gtk \
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-opengl
+
+    # don't let Broadway failures fail the run, for now
+    exit_code=0
+    kill ${server}
+    ;;
+esac
 
 cd ${builddir}
 
 $srcdir/.gitlab-ci/meson-junit-report.py \
         --project-name=gtk \
+        --backend=${backend} \
         --job-id="${CI_JOB_NAME}" \
-        --output=report.xml \
-        meson-logs/testlog.json
+        --output=report-${backend}.xml \
+        meson-logs/testlog-${backend}.json
 $srcdir/.gitlab-ci/meson-html-report.py \
         --project-name=gtk \
+        --backend=${backend} \
         --job-id="${CI_JOB_NAME}" \
-        --reftest-output-dir="testsuite/reftests/output" \
-        --output=report.html \
-        meson-logs/testlog.json
+        --reftest-output-dir="testsuite/reftests/output/${backend}" \
+        --output=report-${backend}.html \
+        meson-logs/testlog-${backend}.json
 
 exit $exit_code

.gitlab-ci/test-msys2.sh

@@ -34,8 +34,11 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-shared-mime-info
 
 # https://gitlab.gnome.org/GNOME/gtk/issues/2243
-wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
-pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
+wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst"
+pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst"
+
+# https://github.com/msys2/MINGW-packages/pull/6465
+pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -45,11 +48,14 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
+# FIXME: introspection disabled for now because of
+# https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/340
 meson \
     -Dx11-backend=false \
     -Dwayland-backend=false \
     -Dwin32-backend=true \
     -Dvulkan=no \
+    -Dintrospection=false \
     --werror \
     _build
 unset CCACHE_DISABLE

CONTRIBUTING.md

@@ -22,12 +22,7 @@ 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` IRC channel on irc.gnome.org
- - the [gtk](https://mail.gnome.org/mailman/listinfo/gtk-list) mailing list,
-   for general questions on GTK
- - the [gtk-app-devel](https://mail.gnome.org/mailman/listinfo/gtk-app-devel-list)
-   mailing list, for questions on application development with GTK
- - the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
-   mailing list, for questions on developing GTK itself
+ - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
 
 You can also look at the GTK tag on [Stack
 Overflow](https://stackoverflow.com/questions/tagged/gtk).

NEWS

@@ -1,3 +1,346 @@
+Overview of Changes in GTK 3.98.5
+=================================
+
+* Introduce new list widgets and supporting infrastructure.
+  The main APIs are:
+ - GtkListView
+ - GtkGridView
+ - GtkColumnView and GtkColumnViewColumn
+ - GtkDropDown
+ - GtkListItemFactory and implementations
+ - GtkExpression
+ - GtkFilter and subclasses, and GtkFilterListModel
+ - GtkSorter and subclasses, and GtkSortListModel
+ - GtkSelectionModel and subclasses
+ - GtkTreeListModel, GtkTreeExpander and GtkTreeListRowSorter
+
+* GtkFileChooser:
+ - Add a tracker3-based search engine implementation
+ - Rate-limit updates from the trash monitor
+
+* GtkWindow:
+ - Redo the css node setup. There is now a single 'window' node
+ - Fix rounded corners on tiled windows
+
+* GtkApplication:
+ - Drop app menu support. Menubar support is still there
+
+* GtkFixed:
+ - Change coordinate APIs to take doubles
+
+* GtkOverlay:
+ - Make GtkOverlayLayout public
+
+* GtkTooltips:
+ - Fix line wrapping of tooltips
+
+* Shortcuts:
+ - Fix mnemonic cycling
+ - Fix using '0' as a mnemonic
+
+* Menus:
+ - Differentiate keypad keys in accelerators
+
+* GtkIMContext:
+ - Add gtk_im_context_filter_key to allow event reinjection
+
+* Themes:
+ - Adwaita: Limit the scope of backdrop
+
+* Accessibility:
+ - Clean up and reorganize the code to prepare for the
+   dropping of ATK
+
+* GDK:
+ - Drop unused enum and struct definitions from headers
+ - Make keymap translation API public again. Still needed
+ - Frameclock: Always use compositor refresh rate info
+ - Frameclock: Use quadratic correction for frame time jitter
+ - Frameclock: Ensure monotonicity
+ - Frameclock: Track resason for paint
+ - X11: Improve sync when the Nvidia driver is used
+
+* GSK:
+ - GL renderer: Fix blurred outset shadows
+ - GL renderer: handle nested transform nodes properly
+ - GL renderer: Optimize clip handling
+
+* gtk-demo:
+ - Improve the Drag-and-Drop demo with proper drag icons
+ - Don't show the main window if --run is given
+ - Add demos for list widgets and GtkDropDrown
+
+* Documentation:
+ - Convert freestanding sections to markdown
+ - Drop the glossary
+ - Expand and improve the migration guide
+
+* Build:
+ - We require pandoc now, for building the documentation
+ - Require Pango 1.45
+
+* Translation updates:
+ Polish
+ Romanian
+ Slovenian
+ Turkish
+ Ukrainian
+
+
+Overview of Changes in GTK 3.98.4
+=================================
+
+* Themes
+ - Refine menu styling
+ - Tweak visible focus behavior
+ - HighConstrast: Add public colors
+ - HighContrast: Fix scale borders
+
+* CSS:
+ - Drop the nonstandard -gtk-icon-theme property
+ - Add a system_setting_changed vfunc to propagate global changes
+
+* Untangle titlebars from windows:
+ - Add a GtkWindowControls widget
+ - Add a GtkWindowHandle widget
+ - Add actions for window menu items
+ - Remove app menu fallback from GtkHeaderBar
+ - Remove title and subtitle properties from GtkHeaderBar,
+   rename custom-title to title-widget
+
+* GtkWidget
+ - Add a focusable property
+
+* GtkPopover:
+ -  Fix (re-)positioning issues
+
+* GtkStack:
+ - Drop the homogeneous property
+ - Add a use-underline property to stack pages
+
+* GtkScale:
+ - Make area around the trough clickable
+
+* GtkScrolledWindow:
+ - Fix kinetic scrolling
+
+* GtkTreeView:
+ - Break reference cycles in unroot
+
+* Drop GtkBin and GtkContainer. All existing GtkBin subclasses
+  have grown a child property with setter and getter. All
+  existing GtkContainer subclasses have grown widget-specific
+  remove (and in some cases, add) functions. <child> in ui
+  files continues to work as before
+
+* Replace gtk_widget_destroy by gtk_window_destroy
+
+* Drop the ::size-allocate signal. Use a GtkWidgetPaintable
+  if you need to be informed about changes to a widgets
+  content or size
+
+* Remove gtk_dialog_run
+
+* GDK:
+ - Wayland: Provide a builtin cursor of last resort
+ - Change the monitor api to use a GListModel
+
+* GSK:
+ - Don't include renderer-specific headers automatically
+ - GL: Fix nested rounded clips
+
+* Introspection:
+ - Assorted annotation fixes
+
+* Inspector:
+ - Preview media resources
+ - Show media backend information
+
+* gtk4-widget-factory:
+ - Add GtkVideo
+ - Add text styles
+ - Add a print dialog
+ - Add a password entry
+ - Improve toolbar styling
+ - Revamp transition effects
+
+* gtk4-demo:
+ - Replace some demos
+
+* Translation updates:
+ Chinese (Taiwan)
+ Esperanto
+ Japanese
+ Romanian
+ Spanish
+ Ukrainian
+
+
+Overview of Changes in GTK 3.98.3
+=================================
+
+* GtkEntry:
+ - Support setting attributes in ui files
+
+* GtkScaleButton:
+ - Don't derive from GtkButton
+
+* GtkAboutDialog:
+ - Support more common licenses
+
+* GtkEmojiChooser:
+ - Improve keyboard navigation
+
+* GtkLabel:
+ - Remove pattern API
+
+* GtkAspectFrame:
+ - Modernize and simplify
+
+* Chooser buttons:
+ - Make dialogs modal by default
+
+* Various widgets:
+ - Replace shadow-type and relief properties by
+   a simpler has-frame
+
+* CSS:
+ - Use :focus-visible instead of :focus(visible)
+ - Add support for :focus-within
+
+* Focus handling
+ - Fix crossing event generation
+ - Fix focus handling in various widgets
+ - Change :can-focus to be recursive
+ - Fix GtkWindow:is-active setting
+
+* Scrolling
+ - gtk_container_set_focus_[hv]adjustment has been removed
+ - gtk_viewport_set_scroll_to_focus has been added
+
+* Accessibility:
+ - Add a cursor-aspect-ratio setting
+ - Set focus-related states properly
+
+* Themes:
+ - Use blue focus outlines more
+ - Numerous minor improvements
+
+* Wayland:
+ - Fix .Compose file loading
+ - Support popup repositioning
+ - Fix problems with autohide popovers
+
+* GDK:
+ - Remove GdkKeymap from public API, replaced by
+   GdkDevice properties
+ - Add full keyboard translation state to key events
+ - Simplify modifier support, drop GdkModifierIntent
+ - Move key event matching to GDK
+ - Add GdkSurface::enter/leave-monitor signals
+ - Turn GskEvent into a derivable type, and make
+   it introspectable
+
+* GSK:
+ - Turn GskRenderNode into a derivable type, and make
+   it introspectable
+ - Fall back to cairo if compiling shaders fails
+
+* Translation updates:
+ - Japanese
+ - Lithuanian
+ - Turkish
+
+
+Overview of Changes in GTK 3.98.2
+=================================
+
+* Introduce GtkShortcutController, and replace key bindings,
+  mnemonics and accelerators by GtkShortcut
+
+* Derive the HighContrast theme from Adwaita
+
+* GtkMenuButton: Add a use-underline property
+
+* GtkTreeView: Fix cell editing
+
+* Add gdk_toplevel_inhibit_system_shortcuts
+
+* gtk-demo: Fix issues in multiple demos
+
+* Translation updates:
+ Polish
+
+
+Overview of Changes in GTK 3.98.1
+=================================
+
+* GtkFileChooser:
+ - Remove filename/uri api
+ - Drop extra-widget
+ - Remove overwrite confirmation
+ - Remove show-hidden property
+ - Remove local-only property
+ - Remove GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
+ - The portal file chooser supports selecting folders
+
+* GtkSpinner:
+ - Rename active property to spinning
+
+* GtkRevealer:
+ - Fix size allocation at small scales
+
+* GtkPopover:
+ - Drop :relative-to, it is always the :parent now
+
+* GtkWindow:
+ - Drop window-type, it is always a regular toplevel
+
+* GtkWidget:
+ - Drop expand property
+ - Drop margin property
+ - Drop gtk_grab_add, gtk_device_grab_add
+
+* GtkTextView:
+ - Support overlines in GtkTextTag
+ - Support visible spaces in GtkTextTag
+ - Support hyphenation control in GtkTextTag
+
+* Split GtkEventControllerFocus from GtkEventControllerKey
+
+* DND:
+ - Fix local DND to avoid serialization
+ - Add new content provider constructors
+ - Split GtkDropTargetAsync and GtkDropTarget
+ - Group DND events into event sequences
+ - Propagate DND events like motion events
+ - Introduce GtkDropControllerMotion
+ - Remove GtkSelectionData
+
+* Performance:
+ - Clean up profiler marks
+ - Share GL programs between renderers
+
+* GDK:
+ - Drop gdk_surface_new_temp
+ - Make GdkEvent an immutable boxed type, not an object
+ - Remove GdkAtom and property- and selection-related apis
+ - Introduce GdkPopup and GdkToplevel interfaces
+ - Implement them in backend-specific surface subtypes
+ - Rename gdk_surface_input_shape_combine_region to
+   gdk_surface_set_input_region
+ - Drop X11-only concepts such as sticky or keep-below
+
+* OS X: Fix OpenGL extension detection
+
+* Broadway: implement scaling
+
+* Translation updates:
+ Dutch
+ Japanese
+ Persian
+
+
 Overview of Changes in GTK 3.98.0
 =================================
 

README.md

@@ -27,9 +27,9 @@ The official developers blog
 
   - https://blog.gtk.org
 
-Information about mailing lists can be found at
+Discussion forum
 
-  - http://www.gtk.org/mailing-lists.php
+  - https://discourse.gnome.org/c/platform/core/
 
 Nightly documentation can be found at
   - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
@@ -140,6 +140,12 @@ In the bug report please include:
 * Further information such as stack traces may be useful, but
   is not necessary.
 
+Contributing to GTK
+-------------------
+
+Please, follow the [contribution guide](./CONTRIBUTING.md) to know how to
+start contributing to GTK.
+
 Release notes
 -------------
 
@@ -156,4 +162,4 @@ GTK is released under the terms of the GNU Lesser General Public License,
 version 2.1 or, at your option, any later version, as published by the Free
 Software Foundation.
 
-Please, see the `COPYING` file for further information.
+Please, see the [`COPYING`](./COPYING) file for further information.

config.h.meson

@@ -27,14 +27,6 @@
 /* Define to 1 if you have the `dcgettext' function. */
 #mesondefine HAVE_DCGETTEXT
 
-/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
-   */
-#mesondefine HAVE_DECL_ISINF
-
-/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
-   */
-#mesondefine HAVE_DECL_ISNAN
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #mesondefine HAVE_DLFCN_H
 
@@ -80,9 +72,6 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #mesondefine HAVE_MMAP
 
-/* Define to 1 if you have the `nearbyint' function. */
-#mesondefine HAVE_NEARBYINT
-
 /* Define to 1 if you have the `posix_fallocate' function. */
 #mesondefine HAVE_POSIX_FALLOCATE
 
@@ -92,21 +81,9 @@
 /* Have the Xrandr 1.5 extension library */
 #mesondefine HAVE_RANDR15
 
-/* Define to 1 if you have the `rint' function. */
-#mesondefine HAVE_RINT
-
-/* Define to 1 if you have the `round' function. */
-#mesondefine HAVE_ROUND
-
 /* Define to 1 if you have the `sincos' function. */
 #mesondefine HAVE_SINCOS
 
-/* Define to 1 if you have the `log2` function */
-#mesondefine HAVE_LOG2
-
-/* Define to 1 if you ahve the `exp2` function */
-#mesondefine HAVE_EXP2
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #mesondefine HAVE_STDINT_H
 
@@ -295,3 +272,6 @@
 #mesondefine HAVE_PANGOFT
 
 #mesondefine ISO_CODES_PREFIX
+
+/* Define if tracker3 is available */
+#mesondefine HAVE_TRACKER3

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

@@ -221,9 +221,12 @@ open_cb (GtkWidget              *button,
                                         GTK_FILE_CHOOSER_ACTION_OPEN,
                                         "_Load",
                                         "_Cancel");
-
   gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
-  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), ".");
+
+  GFile *cwd = g_file_new_for_path (".");
+  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), cwd, NULL);
+  g_object_unref (cwd);
+
   g_signal_connect (dialog, "response", G_CALLBACK (open_response_cb), self);
   gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
 }
@@ -290,29 +293,37 @@ save_response_cb (GtkNativeDialog        *dialog,
   if (response == GTK_RESPONSE_ACCEPT)
     {
       GListModel *model;
-      char *text, *filename;
+      GFile *file;
+      char *text;
       GError *error = NULL;
 
       model = constraint_view_get_model (CONSTRAINT_VIEW (self->view));
       text = serialize_model (model);
-
-      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-      if (!g_file_set_contents (filename, text, -1, &error))
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+      g_file_replace_contents (file, text, -1,
+                               NULL, FALSE,
+                               G_FILE_CREATE_NONE,
+                               NULL,
+                               NULL,
+                               &error);
+      if (error != NULL)
         {
-          GtkWidget *dialog;
+          GtkWidget *message_dialog;
 
-          dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
-                                           GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
-                                           GTK_MESSAGE_INFO,
-                                           GTK_BUTTONS_OK,
-                                           "Saving failed");
-          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+          message_dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))),
+                                                   GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+                                                   GTK_MESSAGE_INFO,
+                                                   GTK_BUTTONS_OK,
+                                                   "Saving failed");
+          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog),
                                                     "%s", error->message);
-          g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
-          gtk_widget_show (dialog);
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+          gtk_widget_show (message_dialog);
           g_error_free (error);
         }
-      g_free (filename);
+
+      g_free (text);
+      g_object_unref (file);
     }
 
   gtk_native_dialog_destroy (dialog);
@@ -329,9 +340,12 @@ save_cb (GtkWidget              *button,
                                         GTK_FILE_CHOOSER_ACTION_SAVE,
                                         "_Save",
                                         "_Cancel");
-
   gtk_native_dialog_set_modal (GTK_NATIVE_DIALOG (dialog), TRUE);
-  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), ".");
+
+  GFile *cwd = g_file_new_for_path (".");
+  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), cwd, NULL);
+  g_object_unref (cwd);
+
   g_signal_connect (dialog, "response", G_CALLBACK (save_response_cb), self);
   gtk_native_dialog_show (GTK_NATIVE_DIALOG (dialog));
 }
@@ -389,7 +403,7 @@ constraint_editor_done (ConstraintEditor *editor,
 
   g_clear_object (&old_constraint);
 
-  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
+  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
 }
 
 static void
@@ -400,7 +414,7 @@ edit_constraint (ConstraintEditorWindow *win,
   ConstraintEditor *editor;
   GListModel *model;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
   if (constraint)
@@ -412,7 +426,7 @@ edit_constraint (ConstraintEditorWindow *win,
 
   editor = constraint_editor_new (model, constraint);
 
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
+  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
 
   g_signal_connect (editor, "done", G_CALLBACK (constraint_editor_done), win);
 
@@ -430,7 +444,7 @@ guide_editor_done (GuideEditor            *editor,
                    GtkConstraintGuide     *guide,
                    ConstraintEditorWindow *win)
 {
-  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
+  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
 }
 
 static void
@@ -440,13 +454,13 @@ edit_guide (ConstraintEditorWindow *win,
   GtkWidget *window;
   GuideEditor *editor;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
   gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
   gtk_window_set_title (GTK_WINDOW (window), "Edit Guide");
 
   editor = guide_editor_new (guide);
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
+  gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
 
   g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
   gtk_widget_show (window);
@@ -473,8 +487,6 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
-  g_type_ensure (CONSTRAINT_VIEW_TYPE);
-
   object_class->finalize = constraint_editor_window_finalize;
 
   gtk_widget_class_set_template_from_resource (widget_class,
@@ -587,30 +599,33 @@ create_widget_func (gpointer item,
     g_object_bind_property (item, "name",
                             label, "label",
                             G_BINDING_DEFAULT);
-  g_object_set (label, "margin", 10, NULL);
+  gtk_widget_set_margin_start (label, 10);
+  gtk_widget_set_margin_end (label, 10);
+  gtk_widget_set_margin_top (label, 10);
+  gtk_widget_set_margin_bottom (label, 10);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   gtk_widget_set_hexpand (label, TRUE);
-  gtk_container_add (GTK_CONTAINER (row), box);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
+  gtk_box_append (GTK_BOX (box), label);
 
   if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
     {
       button = gtk_button_new_from_icon_name ("document-edit-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
       g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
       g_object_set_data (G_OBJECT (row), "edit", button);
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_box_append (GTK_BOX (box), button);
       button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
       g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_box_append (GTK_BOX (box), button);
     }
   else if (GTK_IS_WIDGET (item))
     {
       button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
       g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_box_append (GTK_BOX (box), button);
     }
 
   g_free (freeme);

demos/constraint-editor/constraint-editor-window.ui

@@ -9,7 +9,6 @@
     <property name="default-height">768</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header">
-        <property name="title" translatable="yes">GTK Constraint Editor</property>
         <property name="show-title-buttons">1</property>
         <child type="start">
           <object class="GtkButton">

demos/constraint-editor/constraint-editor.ui

@@ -3,7 +3,10 @@
   <template class="ConstraintEditor" parent="GtkWidget">
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="margin">20</property>
+        <property name="margin-start">20</property>
+        <property name="margin-end">20</property>
+        <property name="margin-top">20</property>
+        <property name="margin-bottom">20</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
         <child>

demos/constraint-editor/constraint-view.c

@@ -77,7 +77,7 @@ update_weak_position (ConstraintView *self,
                                                 GTK_CONSTRAINT_RELATION_EQ,
                                                 x,
                                                 GTK_CONSTRAINT_STRENGTH_WEAK);
-      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
       gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
                                             constraint);
       g_object_set_data (G_OBJECT (child), "x-constraint", constraint);
@@ -97,7 +97,7 @@ update_weak_position (ConstraintView *self,
                                                 GTK_CONSTRAINT_RELATION_EQ,
                                                 y,
                                                 GTK_CONSTRAINT_STRENGTH_WEAK);
-      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
       gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
                                             constraint);
       g_object_set_data (G_OBJECT (child), "y-constraint", constraint);
@@ -169,6 +169,7 @@ constraint_view_init (ConstraintView *self)
   GListModel *guides;
   GListModel *children;
   GListModel *constraints;
+  GtkFilter *filter;
 
   manager = gtk_constraint_layout_new ();
   gtk_widget_set_layout_manager (GTK_WIDGET (self), manager);
@@ -176,8 +177,12 @@ constraint_view_init (ConstraintView *self)
   all_children = gtk_widget_observe_children (GTK_WIDGET (self));
   all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
   guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
-  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, omit_internal, NULL, NULL);
-  children = (GListModel *)gtk_filter_list_model_new (all_children, omit_internal, NULL, NULL);
+  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
+  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, filter);
+  g_object_unref (filter);
+  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
+  children = (GListModel *)gtk_filter_list_model_new (all_children, filter);
+  g_object_unref (filter);
 
   list = g_list_store_new (G_TYPE_LIST_MODEL);
   g_list_store_append (list, children);
@@ -214,9 +219,9 @@ constraint_view_add_child (ConstraintView *view,
 
   label = gtk_label_new (name);
   frame = gtk_frame_new (NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (frame), "child");
+  gtk_widget_add_css_class (frame, "child");
   gtk_widget_set_name (frame, name);
-  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_frame_set_child (GTK_FRAME (frame), label);
   gtk_widget_set_parent (frame, GTK_WIDGET (view));
 
   update_weak_position (view, frame, 100, 100);
@@ -257,9 +262,9 @@ constraint_view_add_guide (ConstraintView *view,
                           G_BINDING_DEFAULT);
 
   frame = gtk_frame_new (NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (frame), "guide");
-  g_object_set_data (G_OBJECT (frame), "internal", "yes");
-  gtk_container_add (GTK_CONTAINER (frame), label);
+  gtk_widget_add_css_class (frame, "guide");
+  g_object_set_data (G_OBJECT (frame), "internal", (char *)"yes");
+  gtk_frame_set_child (GTK_FRAME (frame), label);
   gtk_widget_insert_after (frame, GTK_WIDGET (view), NULL);
 
   g_object_set_data (G_OBJECT (guide), "frame", frame);
@@ -276,7 +281,7 @@ constraint_view_add_guide (ConstraintView *view,
                                        names[i].attr,
                                        1.0, 0.0,
                                        GTK_CONSTRAINT_STRENGTH_REQUIRED);
-      g_object_set_data (G_OBJECT (constraint), "internal", "yes");
+      g_object_set_data (G_OBJECT (constraint), "internal", (char *)"yes");
       gtk_constraint_layout_add_constraint (layout, constraint);
       g_object_set_data (G_OBJECT (guide), names[i].name, constraint);
     }

demos/constraint-editor/constraint-view.h

@@ -23,6 +23,7 @@
 
 #define CONSTRAINT_VIEW_TYPE (constraint_view_get_type ())
 
+G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE (ConstraintView, constraint_view, CONSTRAINT, VIEW, GtkWidget)
 
 ConstraintView * constraint_view_new (void);

demos/constraint-editor/guide-editor.c

@@ -78,7 +78,7 @@ get_strength (const char *id)
   return strength;
 }
 
-const char *
+static const char *
 get_strength_nick (GtkConstraintStrength strength)
 {
   GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
@@ -184,58 +184,6 @@ max_input (GtkSpinButton *spin_button,
   return FALSE;
 }
 
-static gboolean
-min_output (GtkSpinButton *spin_button)
-{
-  GtkAdjustment *adjustment;
-  double value;
-  GtkWidget *box, *text;
-
-  adjustment = gtk_spin_button_get_adjustment (spin_button);
-  value = gtk_adjustment_get_value (adjustment);
-
-  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
-  text = gtk_widget_get_first_child (box);
-
-  if (value == 0.0)
-    {
-      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
-      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
-      return TRUE;
-    }
-  else
-    {
-      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
-      return FALSE;
-    }
-}
-
-static gboolean
-max_output (GtkSpinButton *spin_button)
-{
-  GtkAdjustment *adjustment;
-  double value;
-  GtkWidget *box, *text;
-
-  adjustment = gtk_spin_button_get_adjustment (spin_button);
-  value = gtk_adjustment_get_value (adjustment);
-
-  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
-  text = gtk_widget_get_first_child (box);
-
-  if (value == (double)G_MAXINT)
-    {
-      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
-      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
-      return TRUE;
-    }
-  else
-    {
-      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
-      return FALSE;
-    }
-}
-
 static void
 guide_editor_constructed (GObject *object)
 {
@@ -244,16 +192,12 @@ guide_editor_constructed (GObject *object)
   guide_strength_combo (editor->strength);
 
   g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
-  g_signal_connect (editor->min_width, "output", G_CALLBACK (min_output), NULL);
 
   g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
-  g_signal_connect (editor->min_height, "output", G_CALLBACK (min_output), NULL);
 
   g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
-  g_signal_connect (editor->max_width, "output", G_CALLBACK (max_output), NULL);
 
   g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
-  g_signal_connect (editor->max_height, "output", G_CALLBACK (max_output), NULL);
 
   if (editor->guide)
     {

demos/constraint-editor/guide-editor.ui

@@ -45,7 +45,10 @@
   <template class="GuideEditor" parent="GtkWidget">
     <child>
       <object class="GtkGrid" id="grid">
-        <property name="margin">20</property>
+        <property name="margin-start">20</property>
+        <property name="margin-end">20</property>
+        <property name="margin-top">20</property>
+        <property name="margin-bottom">20</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
         <child>

demos/constraint-editor/meson.build

@@ -13,6 +13,7 @@ constraint_editor_resources = gnome.compile_resources('constraint_editor_resourc
 
 executable('gtk4-constraint-editor',
            constraint_editor_sources, constraint_editor_resources,
+           c_args: common_cflags,
            dependencies: libgtk_dep,
            include_directories: confinc,
            gui_app: true,

demos/gtk-demo/application.c

@@ -6,6 +6,7 @@
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
+static GType demo_application_get_type (void);
 G_DEFINE_TYPE (DemoApplication, demo_application, GTK_TYPE_APPLICATION)
 
 typedef struct {
@@ -25,6 +26,7 @@ typedef struct {
 } DemoApplicationWindow;
 typedef GtkApplicationWindowClass DemoApplicationWindowClass;
 
+static GType demo_application_window_get_type (void);
 G_DEFINE_TYPE (DemoApplicationWindow, demo_application_window, GTK_TYPE_APPLICATION_WINDOW)
 
 static void create_window (GApplication *app, const char *contents);
@@ -45,7 +47,7 @@ show_action_dialog (GSimpleAction *action)
                                     name);
 
   g_signal_connect (dialog, "response",
-                    G_CALLBACK (gtk_widget_destroy), NULL);
+                    G_CALLBACK (gtk_window_destroy), NULL);
 
   gtk_widget_show (dialog);
 }
@@ -118,7 +120,7 @@ open_response_cb (GtkNativeDialog *dialog,
                                                    "Error loading file: \"%s\"",
                                                    error->message);
           g_signal_connect (message_dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+                            G_CALLBACK (gtk_window_destroy), NULL);
           gtk_widget_show (message_dialog);
           g_error_free (error);
         }
@@ -232,7 +234,7 @@ activate_quit (GSimpleAction *action,
       win = list->data;
       next = list->next;
 
-      gtk_widget_destroy (GTK_WIDGET (win));
+      gtk_window_destroy (GTK_WINDOW (win));
 
       list = next;
     }
@@ -326,19 +328,14 @@ static void
 startup (GApplication *app)
 {
   GtkBuilder *builder;
-  GMenuModel *appmenu;
-  GMenuModel *menubar;
 
   G_APPLICATION_CLASS (demo_application_parent_class)->startup (app);
 
   builder = gtk_builder_new ();
   gtk_builder_add_from_resource (builder, "/application_demo/menus.ui", NULL);
 
-  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
-  menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
-
-  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
-  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);
+  gtk_application_set_menubar (GTK_APPLICATION (app),
+                               G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
 
   g_object_unref (builder);
 }
@@ -351,6 +348,7 @@ create_window (GApplication *app,
 
   window = (DemoApplicationWindow *)g_object_new (demo_application_window_get_type (),
                                                   "application", app,
+                                                  "show-menubar", TRUE,
                                                   NULL);
   if (content)
     gtk_text_buffer_set_text (window->buffer, content, -1);
@@ -428,7 +426,7 @@ demo_application_window_init (DemoApplicationWindow *window)
 
   gtk_widget_init_template (GTK_WIDGET (window));
 
-  popover = gtk_popover_menu_new_from_model (window->menubutton, window->toolmenu);
+  popover = gtk_popover_menu_new_from_model (window->toolmenu);
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (window->menubutton), popover);
 
   g_action_map_add_action_entries (G_ACTION_MAP (window),
@@ -477,7 +475,7 @@ surface_state_changed (GtkWidget *widget)
   DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
   GdkSurfaceState new_state;
 
-  new_state = gdk_surface_get_state (gtk_native_get_surface (GTK_NATIVE (widget)));
+  new_state = gdk_toplevel_get_state (GDK_TOPLEVEL (gtk_native_get_surface (GTK_NATIVE (widget))));
   window->maximized = (new_state & GDK_SURFACE_STATE_MAXIMIZED) != 0;
   window->fullscreen = (new_state & GDK_SURFACE_STATE_FULLSCREEN) != 0;
 }
@@ -501,13 +499,13 @@ demo_application_window_unrealize (GtkWidget *widget)
 }
 
 static void
-demo_application_window_destroy (GtkWidget *widget)
+demo_application_window_dispose (GObject *object)
 {
-  DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
+  DemoApplicationWindow *window = (DemoApplicationWindow *)object;
 
   demo_application_window_store_state (window);
 
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (demo_application_window_parent_class)->dispose (object);
 }
 
 static void
@@ -517,11 +515,11 @@ demo_application_window_class_init (DemoApplicationWindowClass *class)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
   object_class->constructed = demo_application_window_constructed;
+  object_class->dispose = demo_application_window_dispose;
 
   widget_class->size_allocate = demo_application_window_size_allocate;
   widget_class->realize = demo_application_window_realize;
   widget_class->unrealize = demo_application_window_unrealize;
-  widget_class->destroy = demo_application_window_destroy;
 
   gtk_widget_class_set_template_from_resource (widget_class, "/application_demo/application.ui");
   gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, message);

demos/gtk-demo/application.ui

@@ -61,7 +61,7 @@
         </child>
         <child>
           <object class="GtkScrolledWindow">
-            <property name="shadow-type">in</property>
+            <property name="has-frame">1</property>
             <child>
               <object class="GtkTextView">
                 <property name="hexpand">1</property>

demos/gtk-demo/application_demo.c

@@ -31,12 +31,7 @@ on_name_vanished (GDBusConnection *connection,
   if (!name_seen)
     return;
 
-  if (placeholder)
-    {
-      gtk_widget_destroy (placeholder);
-      g_object_unref (placeholder);
-      placeholder = NULL;
-    }
+  g_clear_object (&placeholder);
 }
 
 #ifdef G_OS_WIN32

demos/gtk-demo/appmenu.ui

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>

demos/gtk-demo/assistant.c

@@ -7,7 +7,6 @@
 
 #include <gtk/gtk.h>
 
-static GtkWidget *assistant = NULL;
 static GtkWidget *progress_bar = NULL;
 
 static gboolean
@@ -27,8 +26,7 @@ apply_changes_gradually (gpointer data)
   else
     {
       /* Close automatically once changes are fully applied. */
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
+      gtk_window_destroy (GTK_WINDOW (data));
       return G_SOURCE_REMOVE;
     }
 }
@@ -37,16 +35,13 @@ static void
 on_assistant_apply (GtkWidget *widget, gpointer data)
 {
   /* Start a timer to simulate changes taking a few seconds to apply. */
-  g_timeout_add (100, apply_changes_gradually, NULL);
+  g_timeout_add (100, apply_changes_gradually, widget);
 }
 
 static void
 on_assistant_close_cancel (GtkWidget *widget, gpointer data)
 {
-  GtkWidget **assistant = (GtkWidget **) data;
-
-  gtk_widget_destroy (*assistant);
-  *assistant = NULL;
+  gtk_window_destroy (GTK_WINDOW (widget));
 }
 
 static void
@@ -94,15 +89,18 @@ create_page1 (GtkWidget *assistant)
   GtkWidget *box, *label, *entry;
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (box, "margin", 12, NULL);
+  gtk_widget_set_margin_start (box, 12);
+  gtk_widget_set_margin_end (box, 12);
+  gtk_widget_set_margin_top (box, 12);
+  gtk_widget_set_margin_bottom (box, 12);
 
   label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
 
   entry = gtk_entry_new ();
   gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
   gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_container_add (GTK_CONTAINER (box), entry);
+  gtk_box_append (GTK_BOX (box), entry);
   g_signal_connect (G_OBJECT (entry), "changed",
                     G_CALLBACK (on_entry_changed), assistant);
 
@@ -117,12 +115,15 @@ create_page2 (GtkWidget *assistant)
   GtkWidget *box, *checkbutton;
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  g_object_set (box, "margin", 12, NULL);
+  gtk_widget_set_margin_start (box, 12);
+  gtk_widget_set_margin_end (box, 12);
+  gtk_widget_set_margin_top (box, 12);
+  gtk_widget_set_margin_bottom (box, 12);
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                  "even if you do not check this");
   gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER);
-  gtk_container_add (GTK_CONTAINER (box), checkbutton);
+  gtk_box_append (GTK_BOX (box), checkbutton);
 
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
@@ -167,6 +168,8 @@ create_page4 (GtkWidget *assistant)
 GtkWidget*
 do_assistant (GtkWidget *do_widget)
 {
+  static GtkWidget *assistant;
+
   if (!assistant)
     {
       assistant = gtk_assistant_new ();
@@ -175,6 +178,7 @@ do_assistant (GtkWidget *do_widget)
 
       gtk_window_set_display (GTK_WINDOW (assistant),
                               gtk_widget_get_display (do_widget));
+      g_object_add_weak_pointer (G_OBJECT (assistant), (gpointer *)&assistant);
 
       create_page1 (assistant);
       create_page2 (assistant);
@@ -182,9 +186,9 @@ do_assistant (GtkWidget *do_widget)
       create_page4 (assistant);
 
       g_signal_connect (G_OBJECT (assistant), "cancel",
-                        G_CALLBACK (on_assistant_close_cancel), &assistant);
+                        G_CALLBACK (on_assistant_close_cancel), NULL);
       g_signal_connect (G_OBJECT (assistant), "close",
-                        G_CALLBACK (on_assistant_close_cancel), &assistant);
+                        G_CALLBACK (on_assistant_close_cancel), NULL);
       g_signal_connect (G_OBJECT (assistant), "apply",
                         G_CALLBACK (on_assistant_apply), NULL);
       g_signal_connect (G_OBJECT (assistant), "prepare",
@@ -194,10 +198,7 @@ do_assistant (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (assistant))
     gtk_widget_show (assistant);
   else
-    {
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
-    }
+    gtk_window_destroy (GTK_WINDOW (assistant));
 
   return assistant;
 }

demos/gtk-demo/blendmodes.ui

@@ -25,9 +25,8 @@
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow">
-            <property name="can-focus">1</property>
             <property name="vexpand">1</property>
-            <property name="shadow-type">in</property>
+            <property name="has-frame">1</property>
             <property name="min-content-width">150</property>
             <layout>
               <property name="left-attach">0</property>

demos/gtk-demo/bluroverlay.c

@@ -39,7 +39,7 @@ enum {
 static guint signals[LAST_SIGNAL] = { 0 };
 static GQuark child_data_quark = 0;
 
-G_DEFINE_TYPE (BlurOverlay, blur_overlay, GTK_TYPE_BIN)
+G_DEFINE_TYPE (BlurOverlay, blur_overlay, GTK_TYPE_WIDGET)
 
 static void
 blur_overlay_set_overlay_child (GtkWidget       *widget,
@@ -131,13 +131,11 @@ blur_overlay_child_update_style_classes (BlurOverlay *overlay,
   GtkAlign valign, halign;
   gboolean is_left, is_right, is_top, is_bottom;
   gboolean has_left, has_right, has_top, has_bottom;
-  GtkStyleContext *context;
 
-  context = gtk_widget_get_style_context (child);
-  has_left = gtk_style_context_has_class (context, GTK_STYLE_CLASS_LEFT);
-  has_right = gtk_style_context_has_class (context, GTK_STYLE_CLASS_RIGHT);
-  has_top = gtk_style_context_has_class (context, GTK_STYLE_CLASS_TOP);
-  has_bottom = gtk_style_context_has_class (context, GTK_STYLE_CLASS_BOTTOM);
+  has_left = gtk_widget_has_css_class (child, GTK_STYLE_CLASS_LEFT);
+  has_right = gtk_widget_has_css_class (child, GTK_STYLE_CLASS_RIGHT);
+  has_top = gtk_widget_has_css_class (child, GTK_STYLE_CLASS_TOP);
+  has_bottom = gtk_widget_has_css_class (child, GTK_STYLE_CLASS_BOTTOM);
 
   is_left = is_right = is_top = is_bottom = FALSE;
 
@@ -160,24 +158,24 @@ blur_overlay_child_update_style_classes (BlurOverlay *overlay,
     is_bottom = (child_allocation->y + child_allocation->height == height);
 
   if (has_left && !is_left)
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_LEFT);
+    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_LEFT);
   else if (!has_left && is_left)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_LEFT);
+    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_LEFT);
 
   if (has_right && !is_right)
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_RIGHT);
+    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_RIGHT);
   else if (!has_right && is_right)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_RIGHT);
+    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_RIGHT);
 
   if (has_top && !is_top)
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TOP);
+    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_TOP);
   else if (!has_top && is_top)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOP);
+    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_TOP);
 
   if (has_bottom && !is_bottom)
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_BOTTOM);
+    gtk_widget_remove_css_class (child, GTK_STYLE_CLASS_BOTTOM);
   else if (!has_bottom && is_bottom)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_BOTTOM);
+    gtk_widget_add_css_class (child, GTK_STYLE_CLASS_BOTTOM);
 }
 
 static void
@@ -206,7 +204,7 @@ blur_overlay_size_allocate (GtkWidget *widget,
   GtkWidget *child;
   GtkWidget *main_widget;
 
-  main_widget = gtk_bin_get_child (GTK_BIN (overlay));
+  main_widget = overlay->main_widget;
   if (main_widget && gtk_widget_get_visible (main_widget))
     gtk_widget_size_allocate (main_widget,
                               &(GtkAllocation) {
@@ -292,43 +290,6 @@ blur_overlay_get_child_position (BlurOverlay    *overlay,
   return TRUE;
 }
 
-static void
-blur_overlay_add (GtkContainer *container,
-                  GtkWidget    *widget)
-{
-  BlurOverlay *overlay = BLUR_OVERLAY (container);
-  gtk_widget_insert_after (widget, GTK_WIDGET (container), NULL);
-  overlay->main_widget = widget;  
-}
-
-static void
-blur_overlay_remove (GtkContainer *container,
-                     GtkWidget    *widget)
-{
-  BlurOverlay *overlay = BLUR_OVERLAY (container);
-  gtk_widget_unparent (widget);
-  if (overlay->main_widget == widget)
-    overlay->main_widget = NULL;
-}
-
-static void
-blur_overlay_forall (GtkContainer *overlay,
-                    GtkCallback   callback,
-                    gpointer      callback_data)
-{
-  GtkWidget *child;
-
-  child = gtk_widget_get_first_child (GTK_WIDGET (overlay));
-  while (child != NULL)
-    {
-      GtkWidget *next = gtk_widget_get_next_sibling (child);
-
-      (* callback) (child, callback_data);
-
-      child = next;
-    }
-}
-
 static void
 blur_overlay_snapshot (GtkWidget   *widget,
                       GtkSnapshot *snapshot)
@@ -422,21 +383,32 @@ blur_overlay_snapshot (GtkWidget   *widget,
   gsk_render_node_unref (main_widget_node);
 }
 
+static void
+blur_overlay_dispose (GObject *object)
+{
+  BlurOverlay *overlay = BLUR_OVERLAY (object);
+  GtkWidget *child;
+
+  g_clear_pointer (&overlay->main_widget, gtk_widget_unparent);
+
+  while ((child = gtk_widget_get_first_child (GTK_WIDGET (overlay))))
+    gtk_widget_unparent (child);
+
+  G_OBJECT_CLASS (blur_overlay_parent_class)->dispose (object);
+}
+
 static void
 blur_overlay_class_init (BlurOverlayClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
+
+  object_class->dispose = blur_overlay_dispose;
 
   widget_class->measure = blur_overlay_measure;
   widget_class->size_allocate = blur_overlay_size_allocate;
   widget_class->snapshot = blur_overlay_snapshot;
 
-  container_class->add = blur_overlay_add;
-  container_class->remove = blur_overlay_remove;
-  container_class->forall = blur_overlay_forall;
-
   klass->get_child_position = blur_overlay_get_child_position;
 
   signals[GET_CHILD_POSITION] =
@@ -479,3 +451,11 @@ blur_overlay_add_overlay (BlurOverlay *overlay,
 
   blur_overlay_set_overlay_child (widget, child);
 }
+
+void
+blur_overlay_set_child (BlurOverlay *overlay,
+                        GtkWidget   *widget)
+{
+  gtk_widget_insert_after (widget, GTK_WIDGET (overlay), NULL);
+  overlay->main_widget = widget;
+}

demos/gtk-demo/bluroverlay.h

@@ -37,14 +37,14 @@ typedef struct _BlurOverlayClass    BlurOverlayClass;
 
 struct _BlurOverlay
 {
-  GtkBin parent_instance;
+  GtkWidget parent_instance;
 
   GtkWidget *main_widget;
 };
 
 struct _BlurOverlayClass
 {
-  GtkBinClass parent_class;
+  GtkWidgetClass parent_class;
 
   gboolean (*get_child_position) (BlurOverlay   *overlay,
                                   GtkWidget     *widget,
@@ -59,6 +59,9 @@ 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);
 
 G_END_DECLS
 

demos/gtk-demo/builder.c

@@ -12,7 +12,7 @@ quit_activate (GSimpleAction *action,
 {
   GtkWidget *window = user_data;
 
-  gtk_widget_destroy (window);
+  gtk_window_destroy (GTK_WINDOW (window));
 }
 
 static void
@@ -26,8 +26,10 @@ about_activate (GSimpleAction *action,
 
   builder = g_object_get_data (G_OBJECT (window), "builder");
   about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
-  gtk_dialog_run (GTK_DIALOG (about_dlg));
-  gtk_widget_hide (about_dlg);
+  gtk_window_set_transient_for (GTK_WINDOW (about_dlg), GTK_WINDOW (window));
+  gtk_window_set_hide_on_close (GTK_WINDOW (about_dlg), TRUE);
+  g_signal_connect (about_dlg, "response", G_CALLBACK (gtk_widget_hide), NULL);
+  gtk_widget_show (about_dlg);
 }
 
 static void
@@ -74,21 +76,20 @@ do_builder (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
       actions = (GActionGroup*)g_simple_action_group_new ();
       g_action_map_add_action_entries (G_ACTION_MAP (actions),
                                        win_entries, G_N_ELEMENTS (win_entries),
                                        window);
       gtk_widget_insert_action_group (window, "win", actions);
 
-      g_object_set_data_full (G_OBJECT(window), "builder", builder, g_object_unref);
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/clipboard.c

@@ -12,10 +12,11 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
+#include "demoimage.h"
 
 static GtkWidget *window = NULL;
 
-void
+static void
 copy_button_clicked (GtkWidget *button,
                      gpointer   user_data)
 {
@@ -31,7 +32,7 @@ copy_button_clicked (GtkWidget *button,
   gdk_clipboard_set_text (clipboard, gtk_editable_get_text (GTK_EDITABLE (entry)));
 }
 
-void
+static void
 paste_received (GObject      *source_object,
                 GAsyncResult *result,
                 gpointer      user_data)
@@ -68,14 +69,14 @@ paste_received (GObject      *source_object,
                                        "Could not paste text: %s",
                                        error->message);
       g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_widget_destroy), NULL);
+                        G_CALLBACK (gtk_window_destroy), NULL);
       gtk_widget_show (dialog);
 
       g_error_free (error);
     }
 }
 
-void
+static void
 paste_button_clicked (GtkWidget *button,
                       gpointer   user_data)
 {
@@ -93,174 +94,6 @@ paste_button_clicked (GtkWidget *button,
   gdk_clipboard_read_text_async (clipboard, NULL, paste_received, entry);
 }
 
-static GdkPaintable *
-get_image_paintable (GtkImage *image)
-{
-  const gchar *icon_name;
-  GtkIconTheme *icon_theme;
-  GtkIconPaintable *icon;
-
-  switch (gtk_image_get_storage_type (image))
-    {
-    case GTK_IMAGE_PAINTABLE:
-      return g_object_ref (gtk_image_get_paintable (image));
-    case GTK_IMAGE_ICON_NAME:
-      icon_name = gtk_image_get_icon_name (image);
-      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
-      icon = gtk_icon_theme_lookup_icon (icon_theme,
-                                         icon_name,
-                                         NULL,
-                                         48, 1,
-                                         gtk_widget_get_direction (GTK_WIDGET (image)),
-                                         0);
-      if (icon == NULL)
-        return NULL;
-      return GDK_PAINTABLE (icon);
-    default:
-      g_warning ("Image storage type %d not handled",
-                 gtk_image_get_storage_type (image));
-      return NULL;
-    }
-}
-
-static void
-drag_begin (GtkDragSource *source,
-            GdkDrag       *drag,
-            GtkWidget     *widget)
-{
-  GdkPaintable *paintable;
-
-  paintable = get_image_paintable (GTK_IMAGE (widget));
-  if (paintable)
-    {
-      gtk_drag_source_set_icon (source, paintable, -2, -2);
-      g_object_unref (paintable);
-    }
-}
-
-static void
-get_texture (GValue   *value,
-             gpointer  data)
-{
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
-
-  if (GDK_IS_TEXTURE (paintable))
-    g_value_set_object (value, paintable);
-}
-
-static GdkContentProvider *
-prepare_drag (GtkDragSource *source,
-              double         x,
-              double         y,
-              GtkWidget     *image)
-{
-  return gdk_content_provider_new_with_callback (GDK_TYPE_TEXTURE, get_texture, image, NULL);
-}
-
-static void
-got_texture (GObject *source,
-             GAsyncResult *result,
-             gpointer data)
-{
-  GdkDrop *drop = GDK_DROP (source);
-  GtkWidget *image = data;
-  const GValue *value;
-  GError *error = NULL;
-
-  value = gdk_drop_read_value_finish (drop, result, &error);
-  if (value)
-    {
-      GdkTexture *texture = g_value_get_object (value);
-      gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (texture));
-    }
-  else
-    {
-      g_print ("Failed to get data: %s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static gboolean
-drag_drop (GtkDropTarget *dest,
-           GdkDrop       *drop,
-           int            x,
-           int            y,
-           GtkWidget     *widget)
-{
-  if (gdk_drop_has_value (drop, GDK_TYPE_TEXTURE))
-    {
-      gdk_drop_read_value_async (drop, GDK_TYPE_TEXTURE, G_PRIORITY_DEFAULT, NULL, got_texture, widget);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static void
-copy_image (GSimpleAction *action,
-            GVariant      *value,
-            gpointer       data)
-{
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (data));
-
-  if (GDK_IS_TEXTURE (paintable))
-    gdk_clipboard_set_texture (clipboard, GDK_TEXTURE (paintable));
-
-  if (paintable)
-    g_object_unref (paintable);
-}
-
-static void
-paste_image_received (GObject      *source,
-                      GAsyncResult *result,
-                      gpointer      data)
-{
-  GdkTexture *texture;
-
-  texture = gdk_clipboard_read_texture_finish (GDK_CLIPBOARD (source), result, NULL);
-  if (texture == NULL)
-    return;
-    
-  gtk_image_set_from_paintable (GTK_IMAGE (data), GDK_PAINTABLE (texture));
-  g_object_unref (texture);
-}
-
-static void
-paste_image (GSimpleAction *action,
-             GVariant      *value,
-             gpointer       data)
-{
-  GdkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (data));
-  gdk_clipboard_read_texture_async (clipboard, NULL, paste_image_received, data);
-}
-
-static void
-pressed_cb (GtkGesture *gesture,
-            int         n_press,
-            double      x,
-            double      y,
-            GtkWidget  *image)
-{
-  GtkWidget *popover;
-  GMenu *menu;
-  GMenuItem *item;
-
-  menu = g_menu_new (); 
-  item = g_menu_item_new (_("_Copy"), "clipboard.copy");
-  g_menu_append_item (menu, item);
-
-  item = g_menu_item_new (_("_Paste"), "clipboard.paste");
-  g_menu_append_item (menu, item);
-
-  popover = gtk_popover_menu_new_from_model (image, G_MENU_MODEL (menu));
-
-  gtk_popover_set_pointing_to (GTK_POPOVER (popover), &(GdkRectangle) { x, y, 1, 1});
-  gtk_popover_popup (GTK_POPOVER (popover));
-
-  g_object_unref (menu);
-}
-
 GtkWidget *
 do_clipboard (GtkWidget *do_widget)
 {
@@ -270,138 +103,89 @@ do_clipboard (GtkWidget *do_widget)
       GtkWidget *label;
       GtkWidget *entry, *button;
       GtkWidget *image;
-      GtkGesture *gesture;
-      GActionEntry entries[] = {
-        { "copy", copy_image, NULL, NULL, NULL },
-        { "paste", paste_image, NULL, NULL, NULL },
-      };
-      GActionGroup *actions;
-      GtkDragSource *source;
-      GtkDropTarget *dest;
-      GdkContentFormats *formats;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      g_object_set (vbox, "margin", 8, NULL);
+      gtk_widget_set_margin_start (vbox, 8);
+      gtk_widget_set_margin_end (vbox, 8);
+      gtk_widget_set_margin_top (vbox, 8);
+      gtk_widget_set_margin_bottom (vbox, 8);
 
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
 
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
 
       /* Create the first entry */
       entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (hbox), entry);
+      gtk_box_append (GTK_BOX (hbox), entry);
 
       /* Create the button */
       button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (copy_button_clicked), entry);
 
       label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
 
       /* Create the second entry */
       entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (hbox), entry);
+      gtk_box_append (GTK_BOX (hbox), entry);
 
       /* Create the button */
       button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (paste_button_clicked), entry);
 
       label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_widget_set_margin_start (hbox, 8);
+      gtk_widget_set_margin_end (hbox, 8);
+      gtk_widget_set_margin_top (hbox, 8);
+      gtk_widget_set_margin_bottom (hbox, 8);
+      gtk_box_append (GTK_BOX (vbox), hbox);
 
       /* Create the first image */
-      image = gtk_image_new_from_icon_name ("dialog-warning");
-      gtk_image_set_pixel_size (GTK_IMAGE (image), 48);
-      gtk_container_add (GTK_CONTAINER (hbox), image);
-
-      /* make image a drag source */
-      source = gtk_drag_source_new ();
-      g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
-      g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
-
-      /* accept drops on image */
-      formats = gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE);
-      dest = gtk_drop_target_new (formats, GDK_ACTION_COPY);
-      gdk_content_formats_unref (formats);
-      g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
-
-      /* context menu on image */
-      gesture = gtk_gesture_click_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
-      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
-
-      actions = G_ACTION_GROUP (g_simple_action_group_new ());
-      g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image);
-
-      gtk_widget_insert_action_group (image, "clipboard", actions);
-
-      g_object_unref (actions);
+      image = demo_image_new ("dialog-warning");
+      gtk_box_append (GTK_BOX (hbox), image);
 
       /* Create the second image */
-      image = gtk_image_new_from_icon_name ("process-stop");
-      gtk_image_set_pixel_size (GTK_IMAGE (image), 48);
-      gtk_container_add (GTK_CONTAINER (hbox), image);
+      image = demo_image_new ("process-stop");
+      gtk_box_append (GTK_BOX (hbox), image);
 
-      /* make image a drag source */
-      source = gtk_drag_source_new ();
-      g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
-      g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
-
-      /* accept drops on image */
-      formats = gdk_content_formats_new_for_gtype (GDK_TYPE_TEXTURE);
-      dest = gtk_drop_target_new (formats, GDK_ACTION_COPY);
-      gdk_content_formats_unref (formats);
-      g_signal_connect (dest, "drag-drop", G_CALLBACK (drag_drop), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
-
-      /* context menu on image */
-      gesture = gtk_gesture_click_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
-      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
-
-      actions = G_ACTION_GROUP (g_simple_action_group_new ());
-      g_action_map_add_action_entries (G_ACTION_MAP (actions), entries, G_N_ELEMENTS (entries), image);
-
-      gtk_widget_insert_action_group (image, "clipboard", actions);
-
-      g_object_unref (actions);
+      /* Create the third image */
+      image = demo_image_new ("weather-clear");
+      gtk_box_append (GTK_BOX (hbox), image);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/colorsel.c

@@ -1,116 +0,0 @@
-/* Color Chooser
- *
- * A GtkColorChooser lets the user choose a color. There are several
- * implementations of the GtkColorChooser interface in GTK. The
- * GtkColorChooserDialog is a prebuilt dialog containing a
- * GtkColorChooserWidget.
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *da;
-static GdkRGBA color;
-static GtkWidget *frame;
-
-/* draw callback for the drawing area
- */
-static void
-draw_function (GtkDrawingArea *da,
-               cairo_t        *cr,
-               int             width,
-               int             height,
-               gpointer        data)
-{
-  gdk_cairo_set_source_rgba (cr, &color);
-  cairo_paint (cr);
-}
-
-static void
-response_cb (GtkDialog *dialog,
-             gint       response_id,
-             gpointer   user_data)
-{
-  if (response_id == GTK_RESPONSE_OK)
-    {
-      gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color);
-      gtk_widget_queue_draw (da);
-    }
-
-  gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static void
-change_color_callback (GtkWidget *button,
-                       gpointer   data)
-{
-  GtkWidget *dialog;
-
-  dialog = gtk_color_chooser_dialog_new ("Changing color", GTK_WINDOW (window));
-  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color);
-
-  g_signal_connect (dialog, "response",
-                    G_CALLBACK (response_cb), NULL);
-
-  gtk_widget_show (dialog);
-}
-
-GtkWidget *
-do_colorsel (GtkWidget *do_widget)
-{
-  GtkWidget *vbox;
-  GtkWidget *button;
-
-  if (!window)
-    {
-      color.red = 0;
-      color.blue = 1;
-      color.green = 0;
-      color.alpha = 1;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Color Chooser");
-      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox, "margin", 12, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      /*
-       * Create the color swatch area
-       */
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
-
-      da = gtk_drawing_area_new ();
-      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200);
-      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 200);
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_function, NULL, NULL);
-
-      gtk_container_add (GTK_CONTAINER (frame), da);
-
-      button = gtk_button_new_with_mnemonic ("_Change the above color");
-      gtk_widget_set_halign (button, GTK_ALIGN_END);
-      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
-
-      gtk_container_add (GTK_CONTAINER (vbox), button);
-
-      g_signal_connect (button, "clicked",
-                        G_CALLBACK (change_color_callback), NULL);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/combobox.c

@@ -19,7 +19,7 @@ enum
 static GtkTreeModel *
 create_icon_store (void)
 {
-  const gchar *icon_names[6] = {
+  const char *icon_names[6] = {
     "dialog-warning",
     "process-stop",
     "document-new",
@@ -27,7 +27,7 @@ create_icon_store (void)
     NULL,
     "document-open"
   };
-  const gchar *labels[6] = {
+  const char *labels[6] = {
     N_("Warning"),
     N_("Stop"),
     N_("New"),
@@ -111,8 +111,8 @@ static GtkTreeModel *
 create_capital_store (void)
 {
   struct {
-    gchar *group;
-    gchar *capital;
+    const char *group;
+    const char *capital;
   } capitals[] = {
     { "A - B", NULL },
     { NULL, "Albany" },
@@ -234,7 +234,7 @@ typedef struct _MaskEntry MaskEntry;
 struct _MaskEntry
 {
   GtkEntry entry;
-  gchar *mask;
+  const char *mask;
 };
 
 typedef struct _MaskEntryClass MaskEntryClass;
@@ -246,6 +246,7 @@ struct _MaskEntryClass
 
 static void mask_entry_editable_init (GtkEditableInterface *iface);
 
+static GType mask_entry_get_type (void);
 G_DEFINE_TYPE_WITH_CODE (MaskEntry, mask_entry, GTK_TYPE_ENTRY,
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
                                                 mask_entry_editable_init));
@@ -310,32 +311,36 @@ do_combobox (GtkWidget *do_widget)
 
   if (!window)
   {
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");
-
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
+    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-    g_object_set (vbox, "margin", 10, NULL);
-    gtk_container_add (GTK_CONTAINER (window), vbox);
+    gtk_widget_set_margin_start (vbox, 10);
+    gtk_widget_set_margin_end (vbox, 10);
+    gtk_widget_set_margin_top (vbox, 10);
+    gtk_widget_set_margin_bottom (vbox, 10);
+    gtk_window_set_child (GTK_WINDOW (window), vbox);
 
     /* A combobox demonstrating cell renderers, separators and
      *  insensitive rows
      */
     frame = gtk_frame_new ("Items with icons");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_append (GTK_BOX (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (frame), box);
+    gtk_widget_set_margin_start (box, 5);
+    gtk_widget_set_margin_end (box, 5);
+    gtk_widget_set_margin_top (box, 5);
+    gtk_widget_set_margin_bottom (box, 5);
+    gtk_frame_set_child (GTK_FRAME (frame), box);
 
     model = create_icon_store ();
     combo = gtk_combo_box_new_with_model (model);
     g_object_unref (model);
-    gtk_container_add (GTK_CONTAINER (box), combo);
+    gtk_box_append (GTK_BOX (box), combo);
 
     renderer = gtk_cell_renderer_pixbuf_new ();
     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
@@ -367,16 +372,19 @@ do_combobox (GtkWidget *do_widget)
     /* A combobox demonstrating trees.
      */
     frame = gtk_frame_new ("Where are we ?");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_append (GTK_BOX (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (frame), box);
+    gtk_widget_set_margin_start (box, 5);
+    gtk_widget_set_margin_end (box, 5);
+    gtk_widget_set_margin_top (box, 5);
+    gtk_widget_set_margin_bottom (box, 5);
+    gtk_frame_set_child (GTK_FRAME (frame), box);
 
     model = create_capital_store ();
     combo = gtk_combo_box_new_with_model (model);
     g_object_unref (model);
-    gtk_container_add (GTK_CONTAINER (box), combo);
+    gtk_box_append (GTK_BOX (box), combo);
 
     renderer = gtk_cell_renderer_text_new ();
     gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
@@ -395,47 +403,52 @@ do_combobox (GtkWidget *do_widget)
 
     /* A GtkComboBoxEntry with validation */
     frame = gtk_frame_new ("Editable");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_append (GTK_BOX (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (frame), box);
+    gtk_widget_set_margin_start (box, 5);
+    gtk_widget_set_margin_end (box, 5);
+    gtk_widget_set_margin_top (box, 5);
+    gtk_widget_set_margin_bottom (box, 5);
+    gtk_frame_set_child (GTK_FRAME (frame), box);
 
     combo = gtk_combo_box_text_new_with_entry ();
     fill_combo_entry (combo);
-    gtk_container_add (GTK_CONTAINER (box), combo);
+    gtk_box_append (GTK_BOX (box), combo);
 
     entry = g_object_new (TYPE_MASK_ENTRY, NULL);
     MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
 
-    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
-    gtk_container_add (GTK_CONTAINER (combo), entry);
+    gtk_combo_box_set_child (GTK_COMBO_BOX (combo), entry);
 
     /* A combobox with string IDs */
     frame = gtk_frame_new ("String IDs");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_append (GTK_BOX (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (frame), box);
+    gtk_widget_set_margin_start (box, 5);
+    gtk_widget_set_margin_end (box, 5);
+    gtk_widget_set_margin_top (box, 5);
+    gtk_widget_set_margin_bottom (box, 5);
+    gtk_frame_set_child (GTK_FRAME (frame), box);
 
     combo = gtk_combo_box_text_new ();
     gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
     gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
     gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
-    gtk_container_add (GTK_CONTAINER (box), combo);
+    gtk_box_append (GTK_BOX (box), combo);
 
     entry = gtk_entry_new ();
     g_object_bind_property (combo, "active-id",
                             entry, "text",
                             G_BINDING_BIDIRECTIONAL);
-    gtk_container_add (GTK_CONTAINER (box), entry);
+    gtk_box_append (GTK_BOX (box), entry);
   }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/constraints.c

@@ -21,23 +21,24 @@ struct _SimpleGrid
 G_DEFINE_TYPE (SimpleGrid, simple_grid, GTK_TYPE_WIDGET)
 
 static void
-simple_grid_destroy (GtkWidget *widget)
+simple_grid_dispose (GObject *object)
 {
-  SimpleGrid *self = SIMPLE_GRID (widget);
+  SimpleGrid *self = SIMPLE_GRID (object);
 
-  g_clear_pointer (&self->button1, gtk_widget_destroy);
-  g_clear_pointer (&self->button2, gtk_widget_destroy);
-  g_clear_pointer (&self->button3, gtk_widget_destroy);
+  g_clear_pointer (&self->button1, gtk_widget_unparent);
+  g_clear_pointer (&self->button2, gtk_widget_unparent);
+  g_clear_pointer (&self->button3, gtk_widget_unparent);
 
-  GTK_WIDGET_CLASS (simple_grid_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (simple_grid_parent_class)->dispose (object);
 }
 
 static void
 simple_grid_class_init (SimpleGridClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  widget_class->destroy = simple_grid_destroy;
+  object_class->dispose = simple_grid_dispose;
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -255,35 +256,34 @@ do_constraints (GtkWidget *do_widget)
    {
      GtkWidget *header, *box, *grid, *button;
 
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+     window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
+     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
 
      header = gtk_header_bar_new ();
-     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed), &window);
+     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);
 
      grid = g_object_new (simple_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);
      gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
+     gtk_box_append (GTK_BOX (box), grid);
 
      button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
+     gtk_box_append (GTK_BOX (box), button);
      gtk_widget_set_hexpand (grid, TRUE);
      g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
+                               G_CALLBACK (gtk_window_destroy), window);
    }
 
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-   gtk_widget_destroy (window);
+   gtk_window_destroy (GTK_WINDOW (window));
 
  return window;
 }

demos/gtk-demo/constraints2.c

@@ -1,7 +1,7 @@
 /* Constraints/Interactive
  *
- * Demonstrate how constraints can be updates during
- * user interaction.
+ * Demonstrate how constraints can be updates during user interaction.
+ * The vertical edge between the buttons can be dragged with the mouse.
  */
 
 #include <glib/gi18n.h>
@@ -22,23 +22,24 @@ struct _InteractiveGrid
 G_DEFINE_TYPE (InteractiveGrid, interactive_grid, GTK_TYPE_WIDGET)
 
 static void
-interactive_grid_destroy (GtkWidget *widget)
+interactive_grid_dispose (GObject *object)
 {
-  InteractiveGrid *self = INTERACTIVE_GRID (widget);
+  InteractiveGrid *self = INTERACTIVE_GRID (object);
 
-  g_clear_pointer (&self->button1, gtk_widget_destroy);
-  g_clear_pointer (&self->button2, gtk_widget_destroy);
-  g_clear_pointer (&self->button3, gtk_widget_destroy);
+  g_clear_pointer (&self->button1, gtk_widget_unparent);
+  g_clear_pointer (&self->button2, gtk_widget_unparent);
+  g_clear_pointer (&self->button3, gtk_widget_unparent);
 
-  GTK_WIDGET_CLASS (interactive_grid_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (interactive_grid_parent_class)->dispose (object);
 }
 
 static void
 interactive_grid_class_init (InteractiveGridClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  widget_class->destroy = interactive_grid_destroy;
+  object_class->dispose = interactive_grid_dispose;
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -211,35 +212,34 @@ do_constraints2 (GtkWidget *do_widget)
    {
      GtkWidget *header, *box, *grid, *button;
 
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+     window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
+     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
 
      header = gtk_header_bar_new ();
-     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed), &window);
+     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);
 
      grid = g_object_new (interactive_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);
      gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
+     gtk_box_append (GTK_BOX (box), grid);
 
      button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
+     gtk_box_append (GTK_BOX (box), button);
      gtk_widget_set_hexpand (grid, TRUE);
      g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
+                               G_CALLBACK (gtk_window_destroy), window);
    }
 
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-   gtk_widget_destroy (window);
+   gtk_window_destroy (GTK_WINDOW (window));
 
  return window;
 }

demos/gtk-demo/constraints3.c

@@ -20,23 +20,24 @@ struct _VflGrid
 G_DEFINE_TYPE (VflGrid, vfl_grid, GTK_TYPE_WIDGET)
 
 static void
-vfl_grid_destroy (GtkWidget *widget)
+vfl_grid_dispose (GObject *object)
 {
-  VflGrid *self = VFL_GRID (widget);
+  VflGrid *self = VFL_GRID (object);
 
-  g_clear_pointer (&self->button1, gtk_widget_destroy);
-  g_clear_pointer (&self->button2, gtk_widget_destroy);
-  g_clear_pointer (&self->button3, gtk_widget_destroy);
+  g_clear_pointer (&self->button1, gtk_widget_unparent);
+  g_clear_pointer (&self->button2, gtk_widget_unparent);
+  g_clear_pointer (&self->button3, gtk_widget_unparent);
 
-  GTK_WIDGET_CLASS (vfl_grid_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (vfl_grid_parent_class)->dispose (object);
 }
 
 static void
 vfl_grid_class_init (VflGridClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-  widget_class->destroy = vfl_grid_destroy;
+  object_class->dispose = vfl_grid_dispose;
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
 }
@@ -131,35 +132,34 @@ do_constraints3 (GtkWidget *do_widget)
    {
      GtkWidget *header, *box, *grid, *button;
 
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+     window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
+     gtk_window_set_title (GTK_WINDOW (window), "Constraints");
 
      header = gtk_header_bar_new ();
-     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed), &window);
+     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
+     gtk_window_set_child (GTK_WINDOW (window), box);
 
      grid = g_object_new (vfl_grid_get_type (), NULL);
      gtk_widget_set_hexpand (grid, TRUE);
      gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
+     gtk_box_append (GTK_BOX (box), grid);
 
      button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
+     gtk_box_append (GTK_BOX (box), button);
      gtk_widget_set_hexpand (grid, TRUE);
      g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
+                               G_CALLBACK (gtk_window_destroy), window);
    }
 
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-   gtk_widget_destroy (window);
+   gtk_window_destroy (GTK_WINDOW (window));
 
  return window;
 }

demos/gtk-demo/css_accordion.c

@@ -9,9 +9,13 @@
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -24,35 +28,34 @@ do_css_accordion (GtkWidget *do_widget)
       GtkWidget *container, *child;
       GtkStyleProvider *provider;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "CSS Accordion");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (container, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (window), container);
+      gtk_window_set_child (GTK_WINDOW (window), container);
 
       child = gtk_button_new_with_label ("This");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);
 
       child = gtk_button_new_with_label ("Is");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);
 
       child = gtk_button_new_with_label ("A");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);
 
       child = gtk_button_new_with_label ("CSS");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);
 
       child = gtk_button_new_with_label ("Accordion");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);
 
       child = gtk_button_new_with_label (":-)");
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_box_append (GTK_BOX (container), child);
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
       gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), "/css_accordion/css_accordion.css");
@@ -63,7 +66,7 @@ do_css_accordion (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/css_basics.c

@@ -55,9 +55,13 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -72,12 +76,11 @@ do_css_basics (GtkWidget *do_widget)
       GtkTextBuffer *text;
       GBytes *bytes;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       text = gtk_text_buffer_new (NULL);
       gtk_text_buffer_create_tag (text,
@@ -91,10 +94,10 @@ do_css_basics (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (window), container);
+      container = gtk_scrolled_window_new ();
+      gtk_window_set_child (GTK_WINDOW (window), container);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
       g_signal_connect (text, "changed",
                         G_CALLBACK (css_text_changed), provider);
 
@@ -113,7 +116,7 @@ do_css_basics (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/css_blendmodes.c

@@ -11,8 +11,8 @@
  * These are the available blend modes.
  */
 struct {
-  gchar *name;
-  gchar *id;
+  const char *name;
+  const char *id;
 } blend_modes[] =
 {
   { "Color", "color" },
@@ -79,7 +79,7 @@ setup_listbox (GtkBuilder       *builder,
 
   normal_row = NULL;
   listbox = gtk_list_box_new ();
-  gtk_container_add (GTK_CONTAINER (WID ("scrolledwindow")), listbox);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (WID ("scrolledwindow")), listbox);
 
   g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), provider);
 
@@ -95,9 +95,8 @@ setup_listbox (GtkBuilder       *builder,
                             "xalign", 0.0,
                             NULL);
 
-      gtk_container_add (GTK_CONTAINER (row), label);
-
-      gtk_container_add (GTK_CONTAINER (listbox), row);
+      gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), label);
+      gtk_list_box_insert (GTK_LIST_BOX (listbox), row, -1);
 
       /* The first selected row is "normal" */
       if (g_strcmp0 (blend_modes[i].id, "normal") == 0)
@@ -125,7 +124,7 @@ do_css_blendmodes (GtkWidget *do_widget)
 
       window = WID ("window");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       /* Setup the CSS provider for window */
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
@@ -135,12 +134,14 @@ do_css_blendmodes (GtkWidget *do_widget)
                                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
       setup_listbox (builder, provider);
+
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/css_multiplebgs.c

@@ -69,9 +69,13 @@ drawing_area_draw (GtkDrawingArea *da,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -81,41 +85,40 @@ do_css_multiplebgs (GtkWidget *do_widget)
 
   if (!window)
     {
-      GtkWidget *paned, *container, *child;
+      GtkWidget *paned, *overlay, *child, *sw;
       GtkStyleProvider *provider;
       GtkTextBuffer *text;
       GBytes *bytes;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      container = gtk_overlay_new ();
-      gtk_container_add (GTK_CONTAINER (window), container);
+      overlay = gtk_overlay_new ();
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       child = gtk_drawing_area_new ();
       gtk_widget_set_name (child, "canvas");
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
                                       drawing_area_draw,
                                       NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_overlay_set_child (GTK_OVERLAY (overlay), child);
 
       child = gtk_button_new ();
-      gtk_overlay_add_overlay (GTK_OVERLAY (container), child);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
       gtk_widget_set_name (child, "bricks-button");
       gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
       gtk_widget_set_size_request (child, 250, 84);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_overlay_add_overlay (GTK_OVERLAY (container), paned);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), paned);
 
       /* Need a filler so we get a handle */
       child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (paned), child);
+      gtk_paned_set_start_child (GTK_PANED (paned), child);
 
       text = gtk_text_buffer_new (NULL);
       gtk_text_buffer_create_tag (text,
@@ -129,10 +132,10 @@ do_css_multiplebgs (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
+      sw = gtk_scrolled_window_new ();
+      gtk_paned_set_end_child (GTK_PANED (paned), sw);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), child);
       g_signal_connect (text,
                         "changed",
                         G_CALLBACK (css_text_changed),
@@ -153,7 +156,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/css_pixbufs.c

@@ -55,9 +55,13 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -72,19 +76,18 @@ do_css_pixbufs (GtkWidget *do_widget)
       GtkTextBuffer *text;
       GBytes *bytes;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_add (GTK_CONTAINER (window), paned);
+      gtk_window_set_child (GTK_WINDOW (window), paned);
 
       /* Need a filler so we get a handle */
       child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (paned), child);
+      gtk_paned_set_start_child (GTK_PANED (paned), child);
 
       text = gtk_text_buffer_new (NULL);
       gtk_text_buffer_create_tag (text,
@@ -98,10 +101,10 @@ do_css_pixbufs (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
+      container = gtk_scrolled_window_new ();
+      gtk_paned_set_end_child (GTK_PANED (paned), container);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
       g_signal_connect (text, "changed",
                         G_CALLBACK (css_text_changed), provider);
 
@@ -120,7 +123,7 @@ do_css_pixbufs (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/css_shadows.c

@@ -53,12 +53,16 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
+  GtkWidget *child;
+
   gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  if (GTK_IS_CONTAINER (widget))
-    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
-GtkWidget *
+static GtkWidget *
 create_toolbar (void)
 {
   GtkWidget *toolbar;
@@ -68,13 +72,13 @@ create_toolbar (void)
   gtk_widget_set_valign (toolbar, GTK_ALIGN_CENTER);
 
   item = gtk_button_new_from_icon_name ("go-next");
-  gtk_container_add (GTK_CONTAINER (toolbar), item);
+  gtk_box_append (GTK_BOX (toolbar), item);
 
   item = gtk_button_new_from_icon_name ("go-previous");
-  gtk_container_add (GTK_CONTAINER (toolbar), item);
+  gtk_box_append (GTK_BOX (toolbar), item);
 
   item = gtk_button_new_with_label ("Hello World");
-  gtk_container_add (GTK_CONTAINER (toolbar), item);
+  gtk_box_append (GTK_BOX (toolbar), item);
 
   return toolbar;
 }
@@ -91,18 +95,17 @@ do_css_shadows (GtkWidget *do_widget)
       GtkTextBuffer *text;
       GBytes *bytes;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Shadows");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_add (GTK_CONTAINER (window), paned);
+      gtk_window_set_child (GTK_WINDOW (window), paned);
 
       child = create_toolbar ();
-      gtk_container_add (GTK_CONTAINER (paned), child);
+      gtk_paned_set_start_child (GTK_PANED (paned), child);
 
       text = gtk_text_buffer_new (NULL);
       gtk_text_buffer_create_tag (text,
@@ -116,10 +119,10 @@ do_css_shadows (GtkWidget *do_widget)
 
       provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
 
-      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (paned), container);
+      container = gtk_scrolled_window_new ();
+      gtk_paned_set_end_child (GTK_PANED (paned), container);
       child = gtk_text_view_new_with_buffer (text);
-      gtk_container_add (GTK_CONTAINER (container), child);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
       g_signal_connect (text, "changed",
                         G_CALLBACK (css_text_changed), provider);
 
@@ -138,7 +141,7 @@ do_css_shadows (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/cursors.c

@@ -1,9 +1,8 @@
 /* Cursors
  *
- * Demonstrates a useful set of available cursors. The cursors shown here are the ones
- * defined by CSS, which we assume to be available.
- *
- * The example shows creating cursors by name or from an image, with or without a fallback.
+ * Demonstrates a useful set of available cursors. The cursors shown here are the
+ * ones defined by CSS, which we assume to be available. The example shows creating
+ * cursors by name or from an image, with or without a fallback.
  */
 
 #include <gtk/gtk.h>
@@ -29,14 +28,14 @@ do_cursors (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (on_destroy), NULL);
-      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
     {
-      gtk_widget_destroy (window);
+      gtk_window_destroy (GTK_WINDOW (window));
     }
 
   return window;

demos/gtk-demo/cursors.ui

@@ -656,7 +656,10 @@
         <child>
           <object class="GtkBox">
             <property name="orientation">vertical</property>
-            <property name="margin">60</property>
+            <property name="margin-start">60</property>
+            <property name="margin-end">60</property>
+            <property name="margin-top">60</property>
+            <property name="margin-bottom">60</property>
             <property name="spacing">10</property>
             <property name="halign">center</property>
             <child>
@@ -672,7 +675,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -729,7 +735,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -786,7 +795,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -856,7 +868,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -913,7 +928,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -970,7 +988,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1027,7 +1048,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1084,7 +1108,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1154,7 +1181,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1211,7 +1241,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1268,7 +1301,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1325,7 +1361,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1395,7 +1434,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1452,7 +1494,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1509,7 +1554,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1566,7 +1614,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1623,7 +1674,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1680,7 +1734,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1737,7 +1794,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1807,7 +1867,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1864,7 +1927,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1921,7 +1987,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -1978,7 +2047,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2035,7 +2107,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2092,7 +2167,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2149,7 +2227,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2206,7 +2287,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2263,7 +2347,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2320,7 +2407,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2377,7 +2467,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2434,7 +2527,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2491,7 +2587,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2548,7 +2647,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2605,7 +2707,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2675,7 +2780,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">
@@ -2732,7 +2840,10 @@
                         <property name="activatable">0</property>
                         <child>
                           <object class="GtkBox">
-                            <property name="margin">10</property>
+                            <property name="margin-start">10</property>
+                            <property name="margin-end">10</property>
+                            <property name="margin-top">10</property>
+                            <property name="margin-bottom">10</property>
                             <property name="spacing">10</property>
                             <child>
                               <object class="GtkImage">

demos/gtk-demo/demo.gresource.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
+  <gresource prefix="/">
+  </gresource>
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">main.ui</file>
-    <file preprocess="xml-stripblanks">appmenu.ui</file>
+    <file preprocess="xml-stripblanks">main-listitem.ui</file>
   </gresource>
   <gresource prefix="/application_demo">
     <file>application.c</file>
@@ -12,6 +14,10 @@
   <gresource prefix="/builder">
     <file>demo.ui</file>
   </gresource>
+  <gresource prefix="/clipboard">
+    <file>demoimage.c</file>
+    <file>demoimage.h</file>
+  </gresource>
   <gresource prefix="/css_accordion">
     <file>css_accordion.css</file>
     <file>reset.css</file>
@@ -99,11 +105,18 @@
     <file>zoom_in_cursor.png</file>
     <file>zoom_out_cursor.png</file>
   </gresource>
+  <gresource prefix="/dnd">
+    <file>dnd.css</file>
+  </gresource>
   <gresource prefix="/fishbowl">
     <file>fishbowl.ui</file>
     <file>gtkfishbowl.c</file>
     <file>gtkfishbowl.h</file>
   </gresource>
+  <gresource prefix="/gears">
+    <file>gtkgears.c</file>
+    <file>gtkgears.h</file>
+  </gresource>
   <gresource prefix="/iconscroll">
     <file>iconscroll.ui</file>
   </gresource>
@@ -111,6 +124,23 @@
     <file>gnome-fs-directory.png</file>
     <file>gnome-fs-regular.png</file>
   </gresource>
+  <gresource prefix="/listview_filebrowser">
+    <file>listview_filebrowser.ui</file>
+    <file>listview_filebrowser.css</file>
+  </gresource>
+  <gresource prefix="/listview_minesweeper">
+    <file>listview_minesweeper.ui</file>
+    <file>listview_minesweeper_cell.ui</file>
+  </gresource>
+  <gresource prefix="/listview_settings">
+    <file>listview_settings.ui</file>
+  </gresource>
+  <gresource prefix="/listview_weather">
+    <file compressed="true">listview_weather.txt</file>
+  </gresource>
+  <gresource prefix="/listview_colors">
+    <file compressed="true">color.names.txt</file>
+  </gresource>
   <gresource prefix="/shortcuts">
     <file>shortcuts.ui</file>
     <file>shortcuts-builder.ui</file>
@@ -150,7 +180,6 @@
     <file>assistant.c</file>
     <file>builder.c</file>
     <file>clipboard.c</file>
-    <file>colorsel.c</file>
     <file>combobox.c</file>
     <file>constraints.c</file>
     <file>constraints2.c</file>
@@ -164,6 +193,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>
@@ -176,6 +206,7 @@
     <file>font_features.c</file>
     <file>fontplane.c</file>
     <file>fontrendering.c</file>
+    <file>gears.c</file>
     <file>gestures.c</file>
     <file>glarea.c</file>
     <file>headerbar.c</file>
@@ -187,6 +218,14 @@
     <file>infobar.c</file>
     <file>links.c</file>
     <file>listbox.c</file>
+    <file>listview_applauncher.c</file>
+    <file>listview_colors.c</file>
+    <file>listview_clocks.c</file>
+    <file>listview_filebrowser.c</file>
+    <file>listview_minesweeper.c</file>
+    <file>listview_settings.c</file>
+    <file>listview_weather.c</file>
+    <file>listview_words.c</file>
     <file>list_store.c</file>
     <file>markup.c</file>
     <file>modelbutton.c</file>
@@ -199,9 +238,9 @@
     <file>paintable_mediastream.c</file>
     <file>panes.c</file>
     <file>password_entry.c</file>
+    <file>peg_solitaire.c</file>
     <file>pickers.c</file>
     <file>pixbufs.c</file>
-    <file>popover.c</file>
     <file>printing.c</file>
     <file>revealer.c</file>
     <file>rotated_text.c</file>
@@ -209,6 +248,7 @@
     <file>search_entry.c</file>
     <file>search_entry2.c</file>
     <file>shortcuts.c</file>
+    <file>shortcut_triggers.c</file>
     <file>sizegroup.c</file>
     <file>sidebar.c</file>
     <file>sliding_puzzle.c</file>
@@ -238,9 +278,6 @@
     <file>messages.txt</file>
     <file>apple-red.png</file>
   </gresource>
-  <gresource prefix="/popover">
-    <file>popover.ui</file>
-  </gresource>
   <gresource prefix="/glarea">
     <file>glarea-gl.fs.glsl</file>
     <file>glarea-gl.vs.glsl</file>
@@ -263,6 +300,7 @@
   </gresource>
   <gresource prefix="/transparent">
     <file>portland-rose.jpg</file>
+    <file>bluroverlay.h</file>
     <file>bluroverlay.c</file>
   </gresource>
   <gresource prefix="/markup">
@@ -274,9 +312,6 @@
   <gresource prefix="/modelbutton">
     <file>modelbutton.ui</file>
   </gresource>
-  <gresource prefix="/dnd">
-    <file>dnd.css</file>
-  </gresource>
   <gresource prefix="/tagged_entry">
     <file>demotaggedentry.c</file>
     <file>demotaggedentry.h</file>
@@ -306,4 +341,7 @@
     <file>icons/16x16/status/battery-caution-charging-symbolic.symbolic.png</file>
     <file>icons/16x16/categories/applications-other.png</file>
   </gresource>
+  <gresource prefix="/org/gtk/Demo4/gtk">
+    <file preprocess="xml-stripblanks">help-overlay.ui</file>
+  </gresource>
 </gresources>

demos/gtk-demo/demo.ui

@@ -29,29 +29,29 @@
         <item>
           <attribute name="label" translatable="yes">_New</attribute>
           <attribute name="action">win.new</attribute>
-          <attribute name="accel">&lt;Primary&gt;n</attribute>
+          <attribute name="accel">&lt;Control&gt;n</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Open</attribute>
           <attribute name="action">win.open</attribute>
-          <attribute name="accel">&lt;Primary&gt;o</attribute>
+          <attribute name="accel">&lt;Control&gt;o</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Save</attribute>
           <attribute name="action">win.save</attribute>
-          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="accel">&lt;Control&gt;s</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">Save _As</attribute>
           <attribute name="action">win.save-as</attribute>
-          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="accel">&lt;Control&gt;q</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name="label" translatable="yes">_Quit</attribute>
           <attribute name="action">win.quit</attribute>
-          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
+          <attribute name="accel">&lt;Control&gt;&lt;Shift&gt;s</attribute>
         </item>
       </section>
     </submenu>
@@ -61,17 +61,17 @@
         <item>
           <attribute name="label" translatable="yes">_Copy</attribute>
           <attribute name="action">win.copy</attribute>
-          <attribute name="accel">&lt;Primary&gt;c</attribute>
+          <attribute name="accel">&lt;Control&gt;c</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Cut</attribute>
           <attribute name="action">win.cut</attribute>
-          <attribute name="accel">&lt;Primary&gt;x</attribute>
+          <attribute name="accel">&lt;Control&gt;x</attribute>
         </item>
         <item>
           <attribute name="label" translatable="yes">_Paste</attribute>
           <attribute name="action">win.paste</attribute>
-          <attribute name="accel">&lt;Primary&gt;v</attribute>
+          <attribute name="accel">&lt;Control&gt;v</attribute>
         </item>
       </section>
     </submenu>
@@ -94,6 +94,7 @@
   <object class="GtkAboutDialog" id="aboutdialog1">
     <property name="program-name" translatable="yes">Builder demo</property>
     <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
+    <property name="modal">True</property>
     <accessibility>
       <relation target="window1" type="subwindow-of"/>
     </accessibility>
@@ -166,8 +167,9 @@
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="shadow-type">in</property>
-            <property name="expand">1</property>
+            <property name="has-frame">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
                 <property name="model">liststore1</property>

demos/gtk-demo/demoimage.c

@@ -0,0 +1,259 @@
+#include "demoimage.h"
+#include <glib/gi18n.h>
+
+struct _DemoImage {
+  GtkWidget parent_instance;
+ 
+  GtkWidget *image;
+  GtkWidget *popover;
+};
+
+enum {
+  PROP_ICON_NAME = 1
+};
+
+G_DEFINE_TYPE(DemoImage, demo_image, GTK_TYPE_WIDGET)
+
+static GdkPaintable *
+get_image_paintable (GtkImage *image)
+{
+  const gchar *icon_name;
+  GtkIconTheme *icon_theme;
+  GtkIconPaintable *icon;
+
+  switch (gtk_image_get_storage_type (image))
+    {
+    case GTK_IMAGE_PAINTABLE:
+      return g_object_ref (gtk_image_get_paintable (image));
+    case GTK_IMAGE_ICON_NAME:
+      icon_name = gtk_image_get_icon_name (image);
+      icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
+      icon = gtk_icon_theme_lookup_icon (icon_theme,
+                                         icon_name,
+                                         NULL,
+                                         48, 1,
+                                         gtk_widget_get_direction (GTK_WIDGET (image)),
+                                         0);
+      if (icon == NULL)
+        return NULL;
+      return GDK_PAINTABLE (icon);
+
+    case GTK_IMAGE_EMPTY:
+    case GTK_IMAGE_GICON:
+    default:
+      g_warning ("Image storage type %d not handled",
+                 gtk_image_get_storage_type (image));
+      return NULL;
+    }
+}
+
+static void
+drag_begin (GtkDragSource *source,
+            GdkDrag       *drag,
+            gpointer       data)
+{
+  GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
+  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkPaintable *paintable;
+
+  paintable = get_image_paintable (GTK_IMAGE (demo->image));
+  if (paintable)
+    {
+      gtk_drag_icon_set_from_paintable (drag, paintable, -2, -2);
+      g_object_unref (paintable);
+    }
+}
+
+static GdkContentProvider *
+prepare_drag (GtkDragSource *source,
+              double         x,
+              double         y,
+              gpointer       data)
+{
+  GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
+  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));
+
+  return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
+}
+
+static gboolean
+drag_drop (GtkDropTarget *dest,
+           const GValue  *value,
+           double         x,
+           double         y,
+           gpointer       data)
+{
+  GtkWidget *widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
+  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkPaintable *paintable = g_value_get_object (value);
+
+  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), paintable);
+
+  return TRUE;
+}
+
+static void
+copy_image (GtkWidget *widget,
+            const char *action_name,
+            GVariant *parameter)
+{
+  GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
+  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));
+  GValue value = G_VALUE_INIT;
+
+  g_value_init (&value, GDK_TYPE_PAINTABLE);
+  g_value_set_object (&value, paintable);
+  gdk_clipboard_set_value (clipboard, &value);
+  g_value_unset (&value);
+
+  if (paintable)
+    g_object_unref (paintable);
+}
+
+static void
+paste_image (GtkWidget *widget,
+             const char *action_name,
+             GVariant *parameter)
+{
+  GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
+  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkContentProvider *content = gdk_clipboard_get_content (clipboard);
+  GValue value = G_VALUE_INIT;
+  GdkPaintable *paintable;
+
+  g_value_init (&value, GDK_TYPE_PAINTABLE);
+  if (!gdk_content_provider_get_value (content, &value, NULL))
+    return;
+
+  paintable = GDK_PAINTABLE (g_value_get_object (&value));
+  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), paintable);
+  g_value_unset (&value);
+}
+
+static void
+pressed_cb (GtkGesture *gesture,
+            int         n_press,
+            double      x,
+            double      y,
+            gpointer    data)
+{
+  DemoImage *demo = DEMO_IMAGE (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
+
+  gtk_popover_popup (GTK_POPOVER (demo->popover));
+}
+
+static void
+demo_image_init (DemoImage *demo)
+{
+  GMenu *menu;
+  GMenuItem *item;
+  GtkDragSource *source;
+  GtkDropTarget *dest;
+  GtkGesture *gesture;
+
+  demo->image = gtk_image_new ();
+  gtk_image_set_pixel_size (GTK_IMAGE (demo->image), 48);
+  gtk_widget_set_parent (demo->image, GTK_WIDGET (demo));
+
+  menu = g_menu_new (); 
+  item = g_menu_item_new (_("_Copy"), "clipboard.copy");
+  g_menu_append_item (menu, item);
+
+  item = g_menu_item_new (_("_Paste"), "clipboard.paste");
+  g_menu_append_item (menu, item);
+
+  demo->popover = gtk_popover_menu_new_from_model (G_MENU_MODEL (menu));
+  gtk_widget_set_parent (demo->popover, GTK_WIDGET (demo));
+
+  source = gtk_drag_source_new ();
+  g_signal_connect (source, "prepare", G_CALLBACK (prepare_drag), NULL);
+  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), NULL);
+  gtk_widget_add_controller (GTK_WIDGET (demo), GTK_EVENT_CONTROLLER (source));
+
+  dest = gtk_drop_target_new (GDK_TYPE_PAINTABLE, GDK_ACTION_COPY);
+  g_signal_connect (dest, "drop", G_CALLBACK (drag_drop), NULL);
+  gtk_widget_add_controller (GTK_WIDGET (demo), GTK_EVENT_CONTROLLER (dest));
+
+  gesture = gtk_gesture_click_new ();
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
+  g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), NULL);
+  gtk_widget_add_controller (GTK_WIDGET (demo), GTK_EVENT_CONTROLLER (gesture));
+}
+
+static void
+demo_image_dispose (GObject *object)
+{
+  DemoImage *demo = DEMO_IMAGE (object);
+
+  g_clear_pointer (&demo->image, gtk_widget_unparent);
+  g_clear_pointer (&demo->popover, gtk_widget_unparent);
+
+  G_OBJECT_CLASS (demo_image_parent_class)->dispose (object);
+}
+
+static void
+demo_image_get_property (GObject    *object,
+                         guint       prop_id,
+                         GValue     *value,
+                         GParamSpec *pspec)
+{
+  DemoImage *demo = DEMO_IMAGE (object);
+
+  switch (prop_id)
+    {
+    case PROP_ICON_NAME:
+      g_value_set_string (value, gtk_image_get_icon_name (GTK_IMAGE (demo->image)));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+demo_image_set_property (GObject      *object,
+                         guint         prop_id,
+                         const GValue *value,
+                         GParamSpec   *pspec)
+{
+  DemoImage *demo = DEMO_IMAGE (object);
+
+  switch (prop_id)
+    {
+    case PROP_ICON_NAME:
+      gtk_image_set_from_icon_name (GTK_IMAGE (demo->image),
+                                    g_value_get_string (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+demo_image_class_init (DemoImageClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  object_class->dispose = demo_image_dispose;
+  object_class->get_property = demo_image_get_property;
+  object_class->set_property = demo_image_set_property;
+
+  g_object_class_install_property (object_class, PROP_ICON_NAME,
+      g_param_spec_string ("icon-name", "Icon name", "Icon name",
+                           NULL, G_PARAM_READWRITE));
+                       
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
+
+  gtk_widget_class_install_action (widget_class, "clipboard.copy", NULL, copy_image);
+  gtk_widget_class_install_action (widget_class, "clipboard.paste", NULL, paste_image);
+}
+
+GtkWidget *
+demo_image_new (const char *icon_name)
+{
+  return g_object_new (DEMO_TYPE_IMAGE, "icon-name", icon_name, NULL);
+}

demos/gtk-demo/demoimage.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define DEMO_TYPE_IMAGE (demo_image_get_type ())
+
+G_DECLARE_FINAL_TYPE(DemoImage, demo_image, DEMO, IMAGE, GtkWidget)
+
+GtkWidget * demo_image_new (const char *icon_name);
+
+G_END_DECLS

demos/gtk-demo/demotaggedentry.c

@@ -25,31 +25,36 @@
 #include <gtk/gtk.h>
 #include <gtk/gtk-a11y.h>
 
-typedef struct {
+struct _DemoTaggedEntry
+{
+  GtkWidget parent_instance;
+
   GtkWidget *box;
   GtkWidget *entry;
-} DemoTaggedEntryPrivate;
+};
+
+struct _DemoTaggedEntryClass
+{
+  GtkWidgetClass parent_class;
+};
 
 static void demo_tagged_entry_editable_init (GtkEditableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
-                         G_ADD_PRIVATE (DemoTaggedEntry)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, demo_tagged_entry_editable_init))
 
 static void
 demo_tagged_entry_init (DemoTaggedEntry *entry)
 {
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
+  entry->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_set_parent (entry->box, GTK_WIDGET (entry));
 
-  priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (priv->box, GTK_WIDGET (entry));
-
-  priv->entry = gtk_text_new ();
-  gtk_widget_set_hexpand (priv->entry, TRUE);
-  gtk_widget_set_vexpand (priv->entry, TRUE);
-  gtk_widget_set_hexpand (priv->box, FALSE);
-  gtk_widget_set_vexpand (priv->box, FALSE);
-  gtk_container_add (GTK_CONTAINER (priv->box), priv->entry);
+  entry->entry = gtk_text_new ();
+  gtk_widget_set_hexpand (entry->entry, TRUE);
+  gtk_widget_set_vexpand (entry->entry, TRUE);
+  gtk_widget_set_hexpand (entry->box, FALSE);
+  gtk_widget_set_vexpand (entry->box, FALSE);
+  gtk_box_append (GTK_BOX (entry->box), entry->entry);
   gtk_editable_init_delegate (GTK_EDITABLE (entry));
 }
 
@@ -57,23 +62,16 @@ static void
 demo_tagged_entry_dispose (GObject *object)
 {
   DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (object);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
 
-  if (priv->entry)
+  if (entry->entry)
     gtk_editable_finish_delegate (GTK_EDITABLE (entry));
 
-  g_clear_pointer (&priv->entry, gtk_widget_unparent);
-  g_clear_pointer (&priv->box, gtk_widget_unparent);
+  g_clear_pointer (&entry->entry, gtk_widget_unparent);
+  g_clear_pointer (&entry->box, gtk_widget_unparent);
 
   G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object);
 }
 
-static void
-demo_tagged_entry_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->finalize (object);
-}
-
 static void
 demo_tagged_entry_set_property (GObject      *object,
                                 guint         prop_id,
@@ -98,44 +96,12 @@ demo_tagged_entry_get_property (GObject    *object,
   G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 }
 
-static void
-demo_tagged_entry_measure (GtkWidget      *widget,
-                           GtkOrientation  orientation,
-                           int             for_size,
-                           int            *minimum,
-                           int            *natural,
-                           int            *minimum_baseline,
-                           int            *natural_baseline)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_measure (priv->box, orientation, for_size,
-                      minimum, natural,
-                      minimum_baseline, natural_baseline);
-}
-
-static void
-demo_tagged_entry_size_allocate (GtkWidget *widget,
-                                 int        width,
-                                 int        height,
-                                 int        baseline)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_size_allocate (priv->box,
-                            &(GtkAllocation) { 0, 0, width, height },
-                            baseline);
-}
-
 static gboolean
 demo_tagged_entry_grab_focus (GtkWidget *widget)
 {
   DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
 
-  return gtk_widget_grab_focus (priv->entry);
+  return gtk_widget_grab_focus (entry->entry);
 }
 
 static void
@@ -145,16 +111,14 @@ demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   object_class->dispose = demo_tagged_entry_dispose;
-  object_class->finalize = demo_tagged_entry_finalize;
   object_class->get_property = demo_tagged_entry_get_property;
   object_class->set_property = demo_tagged_entry_set_property;
 
-  widget_class->measure = demo_tagged_entry_measure;
-  widget_class->size_allocate = demo_tagged_entry_size_allocate;
   widget_class->grab_focus = demo_tagged_entry_grab_focus;
- 
+
   gtk_editable_install_properties (object_class, 1);
 
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, "entry");
 }
@@ -162,10 +126,7 @@ demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
 static GtkEditable *
 demo_tagged_entry_get_delegate (GtkEditable *editable)
 {
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (editable);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  return GTK_EDITABLE (priv->entry);
+  return GTK_EDITABLE (DEMO_TAGGED_ENTRY (editable)->entry);
 }
 
 static void
@@ -184,11 +145,9 @@ void
 demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
                            GtkWidget       *tag)
 {
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  gtk_container_add (GTK_CONTAINER (priv->box), tag);
+  gtk_box_append (GTK_BOX (entry->box), tag);
 }
 
 void
@@ -196,30 +155,27 @@ demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
                                     GtkWidget       *tag,
                                     GtkWidget       *sibling)
 {
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
   if (sibling == NULL)
-    gtk_container_add (GTK_CONTAINER (priv->box), tag);
+    gtk_box_append (GTK_BOX (entry->box), tag);
   else
-    gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
+    gtk_box_insert_child_after (GTK_BOX (entry->box), tag, sibling);
 }
 
 void
 demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
                               GtkWidget       *tag)
 {
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  gtk_container_remove (GTK_CONTAINER (priv->box), tag);
+  gtk_box_remove (GTK_BOX (entry->box), tag);
 }
 
 struct _DemoTaggedEntryTag
 {
   GtkWidget parent;
+
   GtkWidget *box;
   GtkWidget *label;
   GtkWidget *button;
@@ -250,11 +206,11 @@ static guint signals[LAST_SIGNAL] = { 0, };
 G_DEFINE_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, GTK_TYPE_WIDGET)
 
 static void
-on_released (GtkGestureClick      *gesture,
-             int                   n_press,
-             double                x,
-             double                y,
-             DemoTaggedEntryTag   *tag)
+on_released (GtkGestureClick    *gesture,
+             int                 n_press,
+             double              x,
+             double              y,
+             DemoTaggedEntryTag *tag)
 {
   g_signal_emit (tag, signals[SIGNAL_CLICKED], 0);
 }
@@ -268,7 +224,7 @@ demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
   tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
   tag->label = gtk_label_new ("");
-  gtk_container_add (GTK_CONTAINER (tag->box), tag->label);
+  gtk_box_append (GTK_BOX (tag->box), tag->label);
 
   gesture = gtk_gesture_click_new ();
   g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag);
@@ -460,7 +416,7 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
 
   if (!has_close_button && tag->button)
     {
-      gtk_container_remove (GTK_CONTAINER (tag->box), tag->button);
+      gtk_box_remove (GTK_BOX (tag->box), tag->button);
       tag->button = NULL;
     }
   else if (has_close_button && tag->button == NULL)
@@ -469,11 +425,11 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
 
       image = gtk_image_new_from_icon_name ("window-close-symbolic");
       tag->button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (tag->button), image);
+      gtk_button_set_child (GTK_BUTTON (tag->button), image);
       gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
-      gtk_button_set_relief (GTK_BUTTON (tag->button), GTK_RELIEF_NONE);
-      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
+      gtk_button_set_has_frame (GTK_BUTTON (tag->button), FALSE);
+      gtk_box_append (GTK_BOX (tag->box), tag->button);
       g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
     }
 

demos/gtk-demo/demotaggedentry.h

@@ -25,39 +25,11 @@
 
 G_BEGIN_DECLS
 
-#define DEMO_TYPE_TAGGED_ENTRY                 (demo_tagged_entry_get_type ())
-#define DEMO_TAGGED_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntry))
-#define DEMO_TAGGED_ENTRY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
-#define DEMO_IS_TAGGED_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY))
-#define DEMO_IS_TAGGED_ENTRY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY))
-#define DEMO_TAGGED_ENTRY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
+#define DEMO_TYPE_TAGGED_ENTRY (demo_tagged_entry_get_type ())
+G_DECLARE_FINAL_TYPE (DemoTaggedEntry, demo_tagged_entry, DEMO, TAGGED_ENTRY, GtkWidget)
 
-typedef struct _DemoTaggedEntry       DemoTaggedEntry;
-typedef struct _DemoTaggedEntryClass  DemoTaggedEntryClass;
-
-struct _DemoTaggedEntry
-{
-  GtkWidget parent;
-};
-
-struct _DemoTaggedEntryClass
-{
-  GtkWidgetClass parent_class;
-};
-
-#define DEMO_TYPE_TAGGED_ENTRY_TAG                (demo_tagged_entry_tag_get_type ())
-#define DEMO_TAGGED_ENTRY_TAG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
-#define DEMO_TAGGED_ENTRY_TAG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
-#define DEMO_IS_TAGGED_ENTRY_TAG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG))
-#define DEMO_IS_TAGGED_ENTRY_TAG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG))
-#define DEMO_TAGGED_ENTRY_TAG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTagClass))
-
-typedef struct _DemoTaggedEntryTag       DemoTaggedEntryTag;
-typedef struct _DemoTaggedEntryTagClass  DemoTaggedEntryTagClass;
-
-
-GType           demo_tagged_entry_get_type (void) G_GNUC_CONST;
-GType           demo_tagged_entry_tag_get_type (void) G_GNUC_CONST;
+#define DEMO_TYPE_TAGGED_ENTRY_TAG (demo_tagged_entry_tag_get_type ())
+G_DECLARE_FINAL_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, DEMO, TAGGED_ENTRY_TAG, GtkWidget)
 
 GtkWidget *     demo_tagged_entry_new     (void);
 

demos/gtk-demo/dialog.c

@@ -1,6 +1,7 @@
-/* Dialogs and Message Boxes
+/* Dialogs
  *
- * Dialog widgets are used to pop up a transient window for user feedback.
+ * Dialogs are used to pop up transient windows for information
+ * and user feedback.
  */
 
 #include <glib/gi18n.h>
@@ -21,51 +22,71 @@ message_dialog_clicked (GtkButton *button,
                                    GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
                                    GTK_BUTTONS_OK_CANCEL,
-                                   "This message box has been popped up the following\n"
-                                   "number of times:");
+                                   "Test message");
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            "%d", i);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
+                                            ngettext ("Has been shown once", "Has been shown %d times", i), i);
+  g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+  gtk_widget_show (dialog);
   i++;
 }
 
+typedef struct {
+  GtkWidget *local_entry1;
+  GtkWidget *local_entry2;
+  GtkWidget *global_entry1;
+  GtkWidget *global_entry2;
+} ResponseData;
+
+static void
+on_dialog_response (GtkDialog *dialog,
+                    int        response,
+                    gpointer   user_data)
+{
+  ResponseData *data = user_data;
+
+  if (response == GTK_RESPONSE_OK)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (data->global_entry1),
+                             gtk_editable_get_text (GTK_EDITABLE (data->local_entry1)));
+      gtk_editable_set_text (GTK_EDITABLE (data->global_entry2),
+                             gtk_editable_get_text (GTK_EDITABLE (data->local_entry2)));
+    }
+
+  gtk_window_destroy (GTK_WINDOW (dialog));
+}
+
 static void
 interactive_dialog_clicked (GtkButton *button,
                             gpointer   user_data)
 {
   GtkWidget *content_area;
   GtkWidget *dialog;
-  GtkWidget *hbox;
-  GtkWidget *image;
   GtkWidget *table;
   GtkWidget *local_entry1;
   GtkWidget *local_entry2;
   GtkWidget *label;
-  gint response;
+  ResponseData *data;
 
   dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
                                         GTK_WINDOW (window),
-                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        _("_OK"),
-                                        GTK_RESPONSE_OK,
-                                        "_Cancel",
-                                        GTK_RESPONSE_CANCEL,
+                                        GTK_DIALOG_MODAL| GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_USE_HEADER_BAR,
+                                        _("_OK"), GTK_RESPONSE_OK,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
                                         NULL);
 
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_container_add (GTK_CONTAINER (content_area), hbox);
-
-  image = gtk_image_new_from_icon_name ("dialog-question");
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-  gtk_container_add (GTK_CONTAINER (hbox), image);
-
   table = gtk_grid_new ();
-  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
-  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_container_add (GTK_CONTAINER (hbox), table);
+  gtk_widget_set_hexpand (table, TRUE);
+  gtk_widget_set_vexpand (table, TRUE);
+  gtk_widget_set_halign (table, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (table, GTK_ALIGN_CENTER);
+  gtk_box_append (GTK_BOX (content_area), table);
+  gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+  gtk_grid_set_column_spacing (GTK_GRID (table), 6);
+
   label = gtk_label_new_with_mnemonic ("_Entry 1");
   gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
   local_entry1 = gtk_entry_new ();
@@ -81,21 +102,23 @@ interactive_dialog_clicked (GtkButton *button,
   gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);
 
-  response = gtk_dialog_run (GTK_DIALOG (dialog));
+  data = g_new (ResponseData, 1);
+  data->local_entry1 = local_entry1;
+  data->local_entry2 = local_entry2;
+  data->global_entry1 = entry1;
+  data->global_entry2 = entry2;
 
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_editable_set_text (GTK_EDITABLE (entry1), gtk_editable_get_text (GTK_EDITABLE (local_entry1)));
-      gtk_editable_set_text (GTK_EDITABLE (entry2), gtk_editable_get_text (GTK_EDITABLE (local_entry2)));
-    }
+  g_signal_connect_data (dialog, "response",
+                         G_CALLBACK (on_dialog_response),
+                         data, (GClosureNotify) g_free,
+                         0);
 
-  gtk_widget_destroy (dialog);
+  gtk_widget_show (dialog);
 }
 
 GtkWidget *
 do_dialog (GtkWidget *do_widget)
 {
-  GtkWidget *frame;
   GtkWidget *vbox;
   GtkWidget *vbox2;
   GtkWidget *hbox;
@@ -105,47 +128,45 @@ do_dialog (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      frame = gtk_frame_new ("Dialogs");
-      g_object_set (frame, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (window), frame);
+      gtk_window_set_title (GTK_WINDOW (window), "Dialogs");
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (frame), vbox);
+      gtk_widget_set_margin_start (vbox, 8);
+      gtk_widget_set_margin_end (vbox, 8);
+      gtk_widget_set_margin_top (vbox, 8);
+      gtk_widget_set_margin_bottom (vbox, 8);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       /* Standard message dialog */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_append (GTK_BOX (vbox), hbox);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);
 
-      gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+      gtk_box_append (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
 
       /* Interactive dialog*/
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_append (GTK_BOX (vbox), hbox);
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox2);
-      gtk_container_add (GTK_CONTAINER (vbox2), button);
+      gtk_box_append (GTK_BOX (hbox), vbox2);
+      gtk_box_append (GTK_BOX (vbox2), button);
 
       table = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (table), 4);
       gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_container_add (GTK_CONTAINER (hbox), table);
+      gtk_box_append (GTK_BOX (hbox), table);
 
       label = gtk_label_new_with_mnemonic ("_Entry 1");
       gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
@@ -164,7 +185,7 @@ do_dialog (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/dnd.c

@@ -1,251 +1,450 @@
 /* Drag-and-Drop
  *
- * I can't believe its not glade!
- *
- * Try right-clicking in the window.
+ * This demo shows dragging colors and widgets.
+ * The items in this demo can be moved, recolored
+ * and rotated.
  */
 
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <string.h>
 
-typedef struct _GtkDemoWidget GtkDemoWidget;
-struct _GtkDemoWidget
-{
-  GType type;
-  union {
-    char *text;
-    gboolean active;
-  };
+G_DECLARE_FINAL_TYPE (CanvasItem, canvas_item, CANVAS, ITEM, GtkWidget)
+
+struct _CanvasItem {
+  GtkWidget parent;
+
+  GtkWidget *fixed;
+  GtkWidget *label;
+
+  double r;
+  double angle;
+  double delta;
+
+  GtkWidget *editor;
 };
 
-static gpointer
-copy_demo_widget (gpointer data)
+struct _CanvasItemClass {
+  GtkWidgetClass parent_class;
+};
+
+G_DEFINE_TYPE (CanvasItem, canvas_item, GTK_TYPE_WIDGET)
+
+static int n_items = 0;
+
+static void
+set_color (CanvasItem *item,
+           GdkRGBA    *color)
 {
-  GtkDemoWidget *demo = g_memdup (data, sizeof (GtkDemoWidget));
+  char *css;
+  char *str;
+  GtkStyleContext *context;
+  GtkCssProvider *provider;
+  const char *old_class;
 
-  if (demo->type == GTK_TYPE_LABEL)
-    demo->text = g_strdup (demo->text);
+  str = gdk_rgba_to_string (color);
+  css = g_strdup_printf ("* { background: %s; }", str);
 
-  return demo;
+  context = gtk_widget_get_style_context (item->label);
+  provider = g_object_get_data (G_OBJECT (context), "style-provider");
+  if (provider)
+    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
+
+  old_class = (const char *)g_object_get_data (G_OBJECT (item->label), "css-class");
+  if (old_class)
+    gtk_widget_remove_css_class (item->label, old_class);
+
+  provider = gtk_css_provider_new ();
+  gtk_css_provider_load_from_data (provider, css, -1);
+  gtk_style_context_add_provider (gtk_widget_get_style_context (item->label), GTK_STYLE_PROVIDER (provider), 800);
+  g_object_set_data_full (G_OBJECT (context), "style-provider", provider, g_object_unref);
+
+  g_free (str);
+  g_free (css);
 }
 
 static void
-free_demo_widget (gpointer data)
+set_css (CanvasItem *item,
+         const char *class)
 {
-  GtkDemoWidget *demo = data;
+  GtkStyleContext *context;
+  GtkCssProvider *provider;
+  const char *old_class;
 
-  if (demo->type == GTK_TYPE_LABEL)
-    g_free (demo->text);
+  context = gtk_widget_get_style_context (item->label);
+  provider = g_object_get_data (G_OBJECT (context), "style-provider");
+  if (provider)
+    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
 
-  g_free (demo);
+  old_class = (const char *)g_object_get_data (G_OBJECT (item->label), "css-class");
+  if (old_class)
+    gtk_widget_remove_css_class (item->label, old_class);
+
+  g_object_set_data_full (G_OBJECT (item->label), "css-class", g_strdup (class), g_free);
+  gtk_widget_add_css_class (item->label, class);
 }
 
-#define GTK_TYPE_DEMO_WIDGET (gtk_demo_widget_get_type ())
-
-G_DEFINE_BOXED_TYPE (GtkDemoWidget, gtk_demo_widget, copy_demo_widget, free_demo_widget)
-
-static GtkDemoWidget *
-serialize_widget (GtkWidget *widget)
+static gboolean
+item_drag_drop (GtkDropTarget *dest,
+                const GValue  *value,
+                double         x,
+                double         y)
 {
-  GtkDemoWidget *demo;
+  GtkWidget *label = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
+  CanvasItem *item = CANVAS_ITEM (gtk_widget_get_parent (gtk_widget_get_parent (label)));
 
-  demo = g_new0 (GtkDemoWidget, 1);
-  demo->type = G_OBJECT_TYPE (widget);
+  if (G_VALUE_TYPE (value) == GDK_TYPE_RGBA)
+    set_color (item, g_value_get_boxed (value));
+  else if (G_VALUE_TYPE (value) == G_TYPE_STRING)
+    set_css (item, g_value_get_string (value));
 
-  if (GTK_IS_LABEL (widget))
-    {
-      demo->text = g_strdup (gtk_label_get_text (GTK_LABEL (widget)));
-    }
-  else if (GTK_IS_SPINNER (widget))
-    {
-      g_object_get (widget, "active", &demo->active, NULL);
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
+  return TRUE;
+}
 
-  return demo;
+static void
+apply_transform (CanvasItem *item)
+{
+  GskTransform *transform;
+  double x, 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 (
+                 gsk_transform_rotate (
+                   gsk_transform_translate (NULL,
+                                            &(graphene_point_t) { item->r, item->r }),
+                   item->angle + item->delta),
+                 &(graphene_point_t) { - x, - y });
+
+  gtk_fixed_set_child_transform (GTK_FIXED (item->fixed), item->label, transform);
+  gsk_transform_unref (transform);
+}
+
+static void
+angle_changed (GtkGestureRotate *gesture,
+               double            angle,
+               double            delta)
+{
+  CanvasItem *item = CANVAS_ITEM (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
+
+  item->delta = angle / M_PI * 180.0;
+
+  apply_transform (item);
+}
+
+static void
+rotate_done (GtkGesture *gesture)
+{
+  CanvasItem *item = CANVAS_ITEM (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
+
+  item->angle = item->angle + item->delta;
+  item->delta = 0;
+}
+
+static void
+click_done (GtkGesture *gesture)
+{
+  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
+  GtkWidget *canvas = gtk_widget_get_parent (item);
+  GtkWidget *last_child;
+
+  last_child = gtk_widget_get_last_child (canvas);
+  if (item != last_child)
+    gtk_widget_insert_after (item, canvas, last_child);
+}
+
+static void
+canvas_item_init (CanvasItem *item)
+{
+  char *text;
+  char *id;
+  GdkRGBA rgba;
+  GtkDropTarget *dest;
+  GtkGesture *gesture;
+  GType types[2] = { GDK_TYPE_RGBA, G_TYPE_STRING };
+
+  n_items++;
+
+  text = g_strdup_printf ("Item %d", n_items);
+  item->label = gtk_label_new (text);
+  gtk_widget_add_css_class (item->label, "canvasitem");
+  g_free (text);
+
+  item->fixed = gtk_fixed_new ();
+  gtk_widget_set_parent (item->fixed, GTK_WIDGET (item));
+  gtk_fixed_put (GTK_FIXED (item->fixed), item->label, 0, 0);
+
+  gtk_widget_add_css_class (item->label, "frame");
+
+  id = g_strdup_printf ("item%d", n_items);
+  gtk_widget_set_name (item->label, id);
+  g_free (id);
+
+  gdk_rgba_parse (&rgba, "yellow");
+  set_color (item, &rgba);
+
+  item->angle = 0;
+
+  dest = gtk_drop_target_new (G_TYPE_INVALID, GDK_ACTION_COPY);
+  gtk_drop_target_set_gtypes (dest, types, G_N_ELEMENTS (types));
+  g_signal_connect (dest, "drop", G_CALLBACK (item_drag_drop), NULL);
+  gtk_widget_add_controller (GTK_WIDGET (item->label), GTK_EVENT_CONTROLLER (dest));
+
+  gesture = gtk_gesture_rotate_new ();
+  g_signal_connect (gesture, "angle-changed", G_CALLBACK (angle_changed), NULL);
+  g_signal_connect (gesture, "end", G_CALLBACK (rotate_done), NULL);
+  gtk_widget_add_controller (GTK_WIDGET (item), GTK_EVENT_CONTROLLER (gesture));
+
+  gesture = gtk_gesture_click_new ();
+  g_signal_connect (gesture, "released", G_CALLBACK (click_done), NULL);
+  gtk_widget_add_controller (GTK_WIDGET (item), GTK_EVENT_CONTROLLER (gesture));
+}
+
+static void
+canvas_item_dispose (GObject *object)
+{
+  CanvasItem *item = CANVAS_ITEM (object);
+
+  g_clear_pointer (&item->fixed, gtk_widget_unparent);
+  g_clear_pointer (&item->editor, gtk_widget_unparent);
+
+  G_OBJECT_CLASS (canvas_item_parent_class)->dispose (object);
+}
+
+static void
+canvas_item_map (GtkWidget *widget)
+{
+  CanvasItem *item = CANVAS_ITEM (widget);
+
+  GTK_WIDGET_CLASS (canvas_item_parent_class)->map (widget);
+
+  apply_transform (item);
+}
+
+static void
+canvas_item_class_init (CanvasItemClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  object_class->dispose = canvas_item_dispose;
+
+  widget_class->map = canvas_item_map;
+
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
+  gtk_widget_class_set_css_name (widget_class, "item");
 }
 
 static GtkWidget *
-deserialize_widget (GtkDemoWidget *demo)
+canvas_item_new (void)
 {
-  GtkWidget *widget = NULL;
+  CanvasItem *item = g_object_new (canvas_item_get_type (), NULL);
 
-  if (demo->type == GTK_TYPE_LABEL)
-    {
-      widget = gtk_label_new (demo->text);
-    }
-  else if (demo->type == GTK_TYPE_SPINNER)
-    {
-      widget = g_object_new (demo->type, "active", demo->active, NULL);
-      gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
-    }
-  else
-    {
-      g_print ("Type %s not supported\n", g_type_name (demo->type));
-    }
-
-  return widget;
+  return GTK_WIDGET (item);
 }
 
-static double pos_x, pos_y;
+static GdkPaintable *
+canvas_item_get_drag_icon (CanvasItem *item)
+{
+  return gtk_widget_paintable_new (item->fixed);
+}
+
+static gboolean
+canvas_item_is_editing (CanvasItem *item)
+{
+  return item->editor != NULL;
+}
 
 static void
-new_label_cb (GtkWidget *button,
-              gpointer     data)
+scale_changed (GtkRange   *range,
+               CanvasItem *item)
 {
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
+  item->angle = gtk_range_get_value (range);
+  apply_transform (item);
+}
 
-  widget = gtk_label_new ("Label");
-  gtk_fixed_put (fixed, widget, pos_x, pos_y);
+static void
+text_changed (GtkEditable *editable,
+              GParamSpec  *pspec,
+              CanvasItem  *item)
+{
+  gtk_label_set_text (GTK_LABEL (item->label), gtk_editable_get_text (editable));
+  apply_transform (item);
+}
+
+static void
+canvas_item_stop_editing (CanvasItem *item)
+{
+  GtkWidget *scale;
+
+  if (!item->editor)
+    return;
+
+  scale = gtk_widget_get_last_child (item->editor);
+  g_signal_handlers_disconnect_by_func (scale, scale_changed, item);
+
+  gtk_fixed_remove (GTK_FIXED (gtk_widget_get_parent (item->editor)), item->editor);
+  item->editor = NULL;
+}
+
+static void
+canvas_item_start_editing (CanvasItem *item)
+{
+  GtkWidget *canvas = gtk_widget_get_parent (GTK_WIDGET (item));
+  GtkWidget *entry;
+  GtkWidget *scale;
+  double x, y;
+
+  if (item->editor)
+    return;
+
+  item->editor = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+
+  entry = gtk_entry_new ();
+
+  gtk_editable_set_text (GTK_EDITABLE (entry),
+                         gtk_label_get_text (GTK_LABEL (item->label)));
+
+  gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
+  g_signal_connect (entry, "notify::text", G_CALLBACK (text_changed), item);
+  g_signal_connect_swapped (entry, "activate", G_CALLBACK (canvas_item_stop_editing), item);
+
+  gtk_box_append (GTK_BOX (item->editor), entry);
+
+  scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 360, 1);
+  gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
+  gtk_range_set_value (GTK_RANGE (scale), fmod (item->angle, 360));
+
+  g_signal_connect (scale, "value-changed", G_CALLBACK (scale_changed), item);
+
+  gtk_box_append (GTK_BOX (item->editor), scale);
+
+  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);
+
+}
+
+static GdkContentProvider *
+prepare (GtkDragSource *source,
+         double         x,
+         double         y)
+{
+  GtkWidget *canvas;
+  GtkWidget *item;
+
+  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
+  item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
+
+  item = gtk_widget_get_ancestor (item, canvas_item_get_type ());
+  if (!item)
+    return NULL;
+
+  g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
+
+  return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
+}
+
+static void
+drag_begin (GtkDragSource *source,
+            GdkDrag       *drag)
+{
+  GtkWidget *canvas;
+  CanvasItem *item;
+  GdkPaintable *paintable;
+
+  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
+  item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
+
+  paintable = canvas_item_get_drag_icon (item);
+  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
+  g_object_unref (paintable);
+
+  gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);
+}
+
+static void
+drag_end (GtkDragSource *source,
+          GdkDrag       *drag)
+{
+  GtkWidget *canvas;
+  GtkWidget *item;
+
+  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
+  item = g_object_get_data (G_OBJECT (canvas), "dragged-item");
+  g_object_set_data (G_OBJECT (canvas), "dragged-item", NULL);
+
+  gtk_widget_set_opacity (item, 1.0);
+}
+
+static gboolean
+drag_cancel (GtkDragSource       *source,
+             GdkDrag             *drag,
+             GdkDragCancelReason  reason)
+{
+  return FALSE;
+}
+
+static gboolean
+drag_drop (GtkDropTarget *target,
+           const GValue  *value,
+           double         x,
+           double         y)
+{
+  CanvasItem *item;
+  GtkWidget *canvas;
+  GtkWidget *last_child;
+
+  item = g_value_get_object (value);
+
+  canvas = gtk_widget_get_parent (GTK_WIDGET (item));
+  last_child = gtk_widget_get_last_child (canvas);
+  if (GTK_WIDGET (item) != last_child)
+    gtk_widget_insert_after (GTK_WIDGET (item), canvas, last_child);
+
+  gtk_fixed_move (GTK_FIXED (canvas), GTK_WIDGET (item), x - item->r, y - item->r);
+
+  return TRUE;
+}
+
+static void
+new_item_cb (GtkWidget *button, gpointer data)
+{
+  GtkWidget *canvas = data;
+  GtkWidget *popover;
+  GtkWidget *item;
+  GdkRectangle rect;
+
+  popover = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
+  gtk_popover_get_pointing_to (GTK_POPOVER (popover), &rect);
+
+  item = canvas_item_new ();
+  gtk_fixed_put (GTK_FIXED (canvas), item, rect.x, rect.y);
+  apply_transform (CANVAS_ITEM (item));
 
   gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
-static void
-new_spinner_cb (GtkWidget *button,
-                gpointer     data)
-{
-  GtkFixed *fixed = data;
-  GtkWidget *widget;
-
-  widget = gtk_spinner_new ();
-  gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
-  gtk_spinner_start (GTK_SPINNER (widget));
-  gtk_fixed_put (fixed, widget, pos_x, pos_y);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
-}
-
-static void
-copy_cb (GtkWidget *button, GtkWidget *child)
-{
-  GdkClipboard *clipboard;
-  GtkDemoWidget *demo;
-
-  demo = serialize_widget (child);
-
-  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-  gdk_clipboard_set (clipboard, GTK_TYPE_DEMO_WIDGET, demo);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
-}
-
-static void
-delete_cb (GtkWidget *button, GtkWidget *child)
-{
-  gtk_widget_destroy (child);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
-}
-
-static void
-cut_cb (GtkWidget *button, GtkWidget *child)
-{
-  copy_cb (button, child);
-  delete_cb (button, child);
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
-}
-
-static void
-value_read (GObject      *source,
-            GAsyncResult *res,
-            gpointer      data)
-{
-  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
-  GError *error = NULL;
-  const GValue *value;
-  GtkDemoWidget *demo;
-  GtkWidget *widget = NULL;
-
-  value = gdk_clipboard_read_value_finish (clipboard, res, &error);
-
-  if (value == NULL)
-    {
-      g_print ("error: %s\n", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  if (!G_VALUE_HOLDS (value, GTK_TYPE_DEMO_WIDGET))
-    {
-      g_print ("can't handle clipboard contents\n");
-      return;
-    }
-
-  demo = g_value_get_boxed (value);
-  widget = deserialize_widget (demo);
-
-  gtk_fixed_put (GTK_FIXED (data), widget, pos_x, pos_y);
-}
-
-static void
-paste_cb (GtkWidget *button, GtkWidget *fixed)
-{
-  GdkClipboard *clipboard;
-
-  clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-  if (gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET))
-    {
-      g_print ("Paste %s\n", g_type_name (GTK_TYPE_DEMO_WIDGET));
-      gdk_clipboard_read_value_async (clipboard, GTK_TYPE_DEMO_WIDGET, 0, NULL, value_read, fixed);
-    }
-  else
-    g_print ("Don't know how to handle clipboard contents\n");
-
-  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
-}
-
-static void
-edit_label_done (GtkWidget *entry, gpointer data)
-{
-  GtkWidget *fixed = gtk_widget_get_parent (entry);
-  GtkWidget *label;
-  int x, y;
-
-  gtk_fixed_get_child_position (GTK_FIXED (fixed), entry, &x, &y);
-
-  label = GTK_WIDGET (g_object_get_data (G_OBJECT (entry), "label"));
-  gtk_label_set_text (GTK_LABEL (label), gtk_editable_get_text (GTK_EDITABLE (entry)));
-
-  gtk_widget_destroy (entry);
-}
-
 static void
 edit_cb (GtkWidget *button, GtkWidget *child)
 {
-  GtkWidget *fixed = gtk_widget_get_parent (child);
-  int x, y;
-
-  gtk_fixed_get_child_position (GTK_FIXED (fixed), child, &x, &y);
-
-  if (GTK_IS_LABEL (child))
-    {
-      GtkWidget *entry = gtk_entry_new ();
-
-      g_object_set_data (G_OBJECT (entry), "label", child);
-
-      gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_LABEL (child)));
-      gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
-      g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
-      gtk_fixed_put (GTK_FIXED (fixed), entry, x, y);
-      gtk_widget_grab_focus (entry);
-    }
-  else if (GTK_IS_SPINNER (child))
-    {
-      gboolean active;
-
-      g_object_get (child, "active", &active, NULL);
-      g_object_set (child, "active", !active, NULL);
-    }
+  CanvasItem *item = CANVAS_ITEM (child);
 
   if (button)
     gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
+
+  if (!canvas_item_is_editing (item))
+    canvas_item_start_editing (item);
+}
+
+static void
+delete_cb (GtkWidget *button, GtkWidget *child)
+{
+  GtkWidget *canvas = gtk_widget_get_parent (child);
+
+  gtk_fixed_remove (GTK_FIXED (canvas), child);
+
+  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
 
 static void
@@ -260,66 +459,43 @@ pressed_cb (GtkGesture *gesture,
 
   widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
   child = gtk_widget_pick (widget, x, y, GTK_PICK_DEFAULT);
+  child = gtk_widget_get_ancestor (child, canvas_item_get_type ());
 
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
     {
       GtkWidget *menu;
       GtkWidget *box;
       GtkWidget *item;
-      GdkClipboard *clipboard;
 
-      pos_x = x;
-      pos_y = y;
-
-      menu = gtk_popover_new (widget);
+      menu = gtk_popover_new ();
+      gtk_widget_set_parent (menu, widget);
       gtk_popover_set_has_arrow (GTK_POPOVER (menu), FALSE);
       gtk_popover_set_pointing_to (GTK_POPOVER (menu), &(GdkRectangle){ x, y, 1, 1});
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (menu), box);
+      gtk_popover_set_child (GTK_POPOVER (menu), box);
 
-      item = gtk_button_new_with_label ("New Label");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      g_signal_connect (item, "clicked", G_CALLBACK (new_label_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("New Spinner");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      g_signal_connect (item, "clicked", G_CALLBACK (new_spinner_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      item = gtk_button_new_with_label ("New");
+      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
+      g_signal_connect (item, "clicked", G_CALLBACK (new_item_cb), widget);
+      gtk_box_append (GTK_BOX (box), item);
 
       item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      gtk_box_append (GTK_BOX (box), item);
 
       item = gtk_button_new_with_label ("Edit");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
       g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      gtk_box_append (GTK_BOX (box), item);
 
       item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      gtk_box_append (GTK_BOX (box), item);
 
-      item = gtk_button_new_with_label ("Cut");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (cut_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("Copy");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      gtk_widget_set_sensitive (item, child != NULL && child != widget);
-      g_signal_connect (item, "clicked", G_CALLBACK (copy_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
-      item = gtk_button_new_with_label ("Paste");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
-      clipboard = gdk_display_get_clipboard (gdk_display_get_default ());
-      gtk_widget_set_sensitive (item,
-                                gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GTK_TYPE_DEMO_WIDGET));
-      g_signal_connect (item, "clicked", G_CALLBACK (paste_cb), widget);
-      gtk_container_add (GTK_CONTAINER (box), item);
       item = gtk_button_new_with_label ("Delete");
-      gtk_button_set_relief (GTK_BUTTON (item), GTK_RELIEF_NONE);
+      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
       gtk_widget_set_sensitive (item, child != NULL && child != widget);
       g_signal_connect (item, "clicked", G_CALLBACK (delete_cb), child);
-      gtk_container_add (GTK_CONTAINER (box), item);
+      gtk_box_append (GTK_BOX (box), item);
 
       gtk_popover_popup (GTK_POPOVER (menu));
     }
@@ -334,17 +510,93 @@ released_cb (GtkGesture *gesture,
 {
   GtkWidget *widget;
   GtkWidget *child;
+  CanvasItem *item;
 
   widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
   child = gtk_widget_pick (widget, x, y, 0);
+  item = (CanvasItem *)gtk_widget_get_ancestor (child, canvas_item_get_type ());
+  if (!item)
+    return;
 
   if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
     {
-      if (child != NULL && child != widget)
-        edit_cb (NULL, child);
+      if (canvas_item_is_editing (item))
+        canvas_item_stop_editing (item);
+      else
+        canvas_item_start_editing (item);
     }
 }
 
+static GtkWidget *
+canvas_new (void)
+{
+  GtkWidget *canvas;
+  GtkDragSource *source;
+  GtkDropTarget *dest;
+  GtkGesture *gesture;
+
+  canvas = gtk_fixed_new ();
+  gtk_widget_set_hexpand (canvas, TRUE);
+  gtk_widget_set_vexpand (canvas, TRUE);
+  gtk_widget_add_css_class (canvas, "frame");
+
+  source = gtk_drag_source_new ();
+  gtk_drag_source_set_actions (source, GDK_ACTION_MOVE);
+  g_signal_connect (source, "prepare", G_CALLBACK (prepare), NULL);
+  g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), NULL);
+  g_signal_connect (source, "drag-end", G_CALLBACK (drag_end), NULL);
+  g_signal_connect (source, "drag-cancel", G_CALLBACK (drag_cancel), NULL);
+  gtk_widget_add_controller (canvas, GTK_EVENT_CONTROLLER (source));
+
+  dest = gtk_drop_target_new (GTK_TYPE_WIDGET, GDK_ACTION_MOVE);
+  g_signal_connect (dest, "drop", G_CALLBACK (drag_drop), NULL);
+  gtk_widget_add_controller (canvas, GTK_EVENT_CONTROLLER (dest));
+
+  gesture = gtk_gesture_click_new ();
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0);
+  g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), NULL);
+  g_signal_connect (gesture, "released", G_CALLBACK (released_cb), NULL);
+  gtk_widget_add_controller (canvas, GTK_EVENT_CONTROLLER (gesture));
+
+  return canvas;
+}
+
+static GdkContentProvider *
+css_drag_prepare (GtkDragSource *source,
+                  double         x,
+                  double         y,
+                  GtkWidget     *button)
+{
+  const char *class;
+  GdkPaintable *paintable;
+
+  class = (const char *)g_object_get_data (G_OBJECT (button), "css-class");
+
+  paintable = gtk_widget_paintable_new (button);
+  gtk_drag_source_set_icon (source, paintable, 0, 0);
+  g_object_unref (paintable);
+
+  return gdk_content_provider_new_typed (G_TYPE_STRING, class);
+}
+
+static GtkWidget *
+css_button_new (const char *class)
+{
+  GtkWidget *button;
+  GtkDragSource *source;
+
+  button = gtk_image_new ();
+  gtk_widget_set_size_request (button, 48, 32);
+  gtk_widget_add_css_class (button, class);
+  g_object_set_data (G_OBJECT (button), "css-class", (gpointer)class);
+
+  source = gtk_drag_source_new ();
+  g_signal_connect (source, "prepare", G_CALLBACK (css_drag_prepare), button);
+  gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (source));
+
+  return button;
+}
+
 static GtkWidget *window = NULL;
 
 GtkWidget *
@@ -352,43 +604,94 @@ do_dnd (GtkWidget *do_widget)
 {
   if (!window)
     {
-      GtkWidget *vbox, *fixed;
-      GtkGesture *multipress;
+      GtkWidget *button;
+      GtkWidget *sw;
+      GtkWidget *canvas;
+      GtkWidget *box, *box2, *box3;
+      const char *colors[] = {
+        "red", "green", "blue", "magenta", "orange", "gray", "black", "yellow",
+        "white", "gray", "brown", "pink",  "cyan", "bisque", "gold", "maroon",
+        "navy", "orchid", "olive", "peru", "salmon", "silver", "wheat",
+        NULL
+      };
+      int i;
+      int x, y;
       GtkCssProvider *provider;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Drag-and-drop");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
-
-      fixed = gtk_fixed_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), fixed);
-      gtk_widget_set_hexpand (fixed, TRUE);
-      gtk_widget_set_vexpand (fixed, TRUE);
-
-      multipress = gtk_gesture_click_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (multipress), 0);
-      g_signal_connect (multipress, "pressed", G_CALLBACK (pressed_cb), NULL);
-      g_signal_connect (multipress, "released", G_CALLBACK (released_cb), NULL);
-      gtk_widget_add_controller (fixed, GTK_EVENT_CONTROLLER (multipress));
+      button = gtk_color_button_new ();
+      g_object_unref (g_object_ref_sink (button));
 
       provider = gtk_css_provider_new ();
       gtk_css_provider_load_from_resource (provider, "/dnd/dnd.css");
       gtk_style_context_add_provider_for_display (gdk_display_get_default (),
                                                   GTK_STYLE_PROVIDER (provider),
                                                   800);
+      g_object_unref (provider);
+
+      window = gtk_window_new ();
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Drag-and-Drop");
+      gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
+      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);
+
+      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_box_append (GTK_BOX (box), box2);
+
+      canvas = canvas_new ();
+      gtk_box_append (GTK_BOX (box2), canvas);
+
+      n_items = 0;
+
+      x = y = 40;
+      for (i = 0; i < 4; i++)
+        {
+          GtkWidget *item;
+
+          item = canvas_item_new ();
+          gtk_fixed_put (GTK_FIXED (canvas), item, x, y);
+          apply_transform (CANVAS_ITEM (item));
+
+          x += 150;
+          y += 100;
+        }
+
+      sw = gtk_scrolled_window_new ();
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_NEVER);
+      gtk_box_append (GTK_BOX (box), sw);
+
+      box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_widget_add_css_class (box3, "linked");
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box3);
+
+      for (i = 0; colors[i]; i++)
+        {
+          GdkRGBA rgba;
+          GtkWidget *swatch;
+
+          gdk_rgba_parse (&rgba, colors[i]);
+
+          swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
+                                 "rgba", &rgba,
+                                 "selectable", FALSE,
+                                 NULL);
+          gtk_box_append (GTK_BOX (box3), swatch);
+        }
+
+      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow1"));
+      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow2"));
+      gtk_box_append (GTK_BOX (box3), css_button_new ("rainbow3"));
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/dnd.css

@@ -1,3 +1,37 @@
-spinner.demo {
-  opacity: 1;
+label.canvasitem {
+  padding: 10px;
+  margin: 1px;
+}
+
+.canvasitem.rainbow1,
+image.rainbow1 {
+  background: linear-gradient(140deg,red,orange,yellow,green,blue,purple);
+}
+
+.canvasitem.rainbow2,
+image.rainbow2 {
+  animation: rainbow2 1s infinite linear;
+}
+
+@keyframes rainbow2 {
+ 0% { background: linear-gradient(0deg,red,orange,yellow,green,blue,purple); }
+ 25% { background: linear-gradient(90deg,red,orange,yellow,green,blue,purple); }
+ 50% { background: linear-gradient(180deg,red,orange,yellow,green,blue,purple); }
+ 75% { background: linear-gradient(270deg,red,orange,yellow,green,blue,purple); }
+ 100% { background: linear-gradient(360deg,red,orange,yellow,green,blue,purple); }
+}
+
+.canvasitem.rainbow3,
+image.rainbow3 {
+  animation: rainbow3 1s infinite linear;
+}
+
+@keyframes rainbow3 {
+ 0% { background: linear-gradient(140deg,red,orange,yellow,green,blue,purple); }
+ 16.6% { background: linear-gradient(140deg,purple,red,orange,yellow,green,blue); }
+ 33.2% { background: linear-gradient(140deg,blue,purple,red,orange,yellow,green); }
+ 50% { background: linear-gradient(140deg,green,blue,purple,red,orange,yellow); }
+ 66.6% { background: linear-gradient(140deg,yellow,green,blue,purple,red,orange); }
+ 83.2% { background: linear-gradient(140deg,orange,yellow,green,blue,purple,red); }
+ 100% { background: linear-gradient(140deg,red,orange,yellow,green,blue,purple); }
 }

demos/gtk-demo/drawingarea.c

@@ -42,7 +42,9 @@ create_surface (GtkWidget *widget)
 }
 
 static void
-scribble_size_allocate (GtkWidget *widget)
+scribble_resize (GtkWidget *widget,
+                 int        width,
+                 int        height)
 {
   create_surface (widget);
 }
@@ -123,49 +125,164 @@ drag_end (GtkGestureDrag *gesture,
 }
 
 static void
-checkerboard_draw (GtkDrawingArea *da,
-                   cairo_t        *cr,
-                   int             width,
-                   int             height,
-                   gpointer        data)
+oval_path (cairo_t *cr,
+           double xc, double yc,
+           double xr, double yr)
 {
-  gint i, j, xcount, ycount;
+  cairo_save (cr);
 
-#define CHECK_SIZE 10
-#define SPACING 2
+  cairo_translate (cr, xc, yc);
+  cairo_scale (cr, 1.0, yr / xr);
+  cairo_move_to (cr, xr, 0.0);
+  cairo_arc (cr,
+             0, 0,
+             xr,
+             0, 2 * G_PI);
+  cairo_close_path (cr);
 
-  /* At the start of a draw handler, a clip region has been set on
-   * the Cairo context, and the contents have been cleared to the
-   * widget's background color. The docs for
-   * gdk_surface_begin_paint_region() give more details on how this
-   * works.
-   */
+  cairo_restore (cr);
+}
 
-  xcount = 0;
-  i = SPACING;
-  while (i < width)
+/* Fill the given area with checks in the standard style
+ * for showing compositing effects.
+ *
+ * It would make sense to do this as a repeating surface,
+ * but most implementations of RENDER currently have broken
+ * implementations of repeat + transform, even when the
+ * transform is a translation.
+ */
+static void
+fill_checks (cairo_t *cr,
+             int x,     int y,
+             int width, int height)
+{
+  int i, j;
+
+#define CHECK_SIZE 16
+
+  cairo_rectangle (cr, x, y, width, height);
+  cairo_set_source_rgb (cr, 0.4, 0.4, 0.4);
+  cairo_fill (cr);
+
+  /* Only works for CHECK_SIZE a power of 2 */
+  j = x & (-CHECK_SIZE);
+
+  for (; j < height; j += CHECK_SIZE)
     {
-      j = SPACING;
-      ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < height)
-        {
-          if (ycount % 2)
-            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
-          else
-            cairo_set_source_rgb (cr, 1, 1, 1);
-
-          /* If we're outside the clip, this will do nothing.
-           */
+      i = y & (-CHECK_SIZE);
+      for (; i < width; i += CHECK_SIZE)
+        if ((i / CHECK_SIZE + j / CHECK_SIZE) % 2 == 0)
           cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
-          cairo_fill (cr);
-
-          j += CHECK_SIZE + SPACING;
-          ++ycount;
-        }
-
-      i += CHECK_SIZE + SPACING;
-      ++xcount;
     }
+
+  cairo_set_source_rgb (cr, 0.7, 0.7, 0.7);
+  cairo_fill (cr);
+
+#undef CHECK_SIZE
+}
+
+/* Draw a red, green, and blue circle equally spaced inside
+ * the larger circle of radius r at (xc, yc)
+ */
+static void
+draw_3circles (cairo_t *cr,
+               double xc, double yc,
+               double radius,
+               double alpha)
+{
+  double subradius = radius * (2 / 3. - 0.1);
+
+  cairo_set_source_rgba (cr, 1., 0., 0., alpha);
+  oval_path (cr,
+             xc + radius / 3. * cos (G_PI * (0.5)),
+             yc - radius / 3. * sin (G_PI * (0.5)),
+             subradius, subradius);
+  cairo_fill (cr);
+
+  cairo_set_source_rgba (cr, 0., 1., 0., alpha);
+  oval_path (cr,
+             xc + radius / 3. * cos (G_PI * (0.5 + 2/.3)),
+             yc - radius / 3. * sin (G_PI * (0.5 + 2/.3)),
+             subradius, subradius);
+  cairo_fill (cr);
+
+  cairo_set_source_rgba (cr, 0., 0., 1., alpha);
+  oval_path (cr,
+             xc + radius / 3. * cos (G_PI * (0.5 + 4/.3)),
+             yc - radius / 3. * sin (G_PI * (0.5 + 4/.3)),
+             subradius, subradius);
+  cairo_fill (cr);
+}
+
+static void
+groups_draw (GtkDrawingArea *darea,
+             cairo_t        *cr,
+             int             width,
+             int             height,
+             gpointer        data)
+{
+  cairo_surface_t *overlay, *punch, *circles;
+  cairo_t *overlay_cr, *punch_cr, *circles_cr;
+
+  /* Fill the background */
+  double radius = 0.5 * (width < height ? width : height) - 10;
+  double xc = width / 2.;
+  double yc = height / 2.;
+
+  overlay = cairo_surface_create_similar (cairo_get_target (cr),
+                                          CAIRO_CONTENT_COLOR_ALPHA,
+                                          width, height);
+
+  punch = cairo_surface_create_similar (cairo_get_target (cr),
+                                        CAIRO_CONTENT_ALPHA,
+                                        width, height);
+
+  circles = cairo_surface_create_similar (cairo_get_target (cr),
+                                          CAIRO_CONTENT_COLOR_ALPHA,
+                                          width, height);
+
+  fill_checks (cr, 0, 0, width, height);
+
+  /* Draw a black circle on the overlay
+   */
+  overlay_cr = cairo_create (overlay);
+  cairo_set_source_rgb (overlay_cr, 0., 0., 0.);
+  oval_path (overlay_cr, xc, yc, radius, radius);
+  cairo_fill (overlay_cr);
+
+  /* Draw 3 circles to the punch surface, then cut
+   * that out of the main circle in the overlay
+   */
+  punch_cr = cairo_create (punch);
+  draw_3circles (punch_cr, xc, yc, radius, 1.0);
+  cairo_destroy (punch_cr);
+
+  cairo_set_operator (overlay_cr, CAIRO_OPERATOR_DEST_OUT);
+  cairo_set_source_surface (overlay_cr, punch, 0, 0);
+  cairo_paint (overlay_cr);
+
+  /* Now draw the 3 circles in a subgroup again
+   * at half intensity, and use OperatorAdd to join up
+   * without seams.
+   */
+  circles_cr = cairo_create (circles);
+
+  cairo_set_operator (circles_cr, CAIRO_OPERATOR_OVER);
+  draw_3circles (circles_cr, xc, yc, radius, 0.5);
+  cairo_destroy (circles_cr);
+
+  cairo_set_operator (overlay_cr, CAIRO_OPERATOR_ADD);
+  cairo_set_source_surface (overlay_cr, circles, 0, 0);
+  cairo_paint (overlay_cr);
+
+  cairo_destroy (overlay_cr);
+
+  cairo_set_source_surface (cr, overlay, 0, 0);
+  cairo_paint (cr);
+
+  cairo_surface_destroy (overlay);
+  cairo_surface_destroy (punch);
+  cairo_surface_destroy (circles);
 }
 
 static void
@@ -189,7 +306,7 @@ do_drawingarea (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
@@ -198,28 +315,29 @@ do_drawingarea (GtkWidget *do_widget)
                         G_CALLBACK (close_window), NULL);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox, "margin", 16, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 16);
+      gtk_widget_set_margin_end (vbox, 16);
+      gtk_widget_set_margin_top (vbox, 16);
+      gtk_widget_set_margin_bottom (vbox, 16);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       /*
-       * Create the checkerboard area
+       * Create the groups area
        */
-
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Checkerboard pattern</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+                            "<u>Knockout groups</u>");
+      gtk_box_append (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_vexpand (frame, TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_append (GTK_BOX (vbox), frame);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), checkerboard_draw, NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (frame), da);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), groups_draw, NULL, NULL);
+      gtk_frame_set_child (GTK_FRAME (frame), da);
 
       /*
        * Create the scribble area
@@ -228,21 +346,20 @@ do_drawingarea (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Scribble area</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
       gtk_widget_set_vexpand (frame, TRUE);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_append (GTK_BOX (vbox), frame);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), scribble_draw, NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (frame), da);
+      gtk_frame_set_child (GTK_FRAME (frame), da);
 
-      g_signal_connect (da, "size-allocate",
-                        G_CALLBACK (scribble_size_allocate), NULL);
+      g_signal_connect (da, "resize",
+                        G_CALLBACK (scribble_resize), NULL);
 
       drag = gtk_gesture_drag_new ();
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
@@ -257,7 +374,7 @@ do_drawingarea (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
       gtk_widget_show (window);
   else
-      gtk_widget_destroy (window);
+      gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/dropdown.c

@@ -0,0 +1,305 @@
+/* Drop Downs
+ *
+ * The GtkDropDown widget is a modern alternative to GtkComboBox.
+ * It uses list models instead of tree models, and the content is
+ * displayed using widgets instead of cell renderers.
+ *
+ * The examples here demonstrate how to use different kinds of
+ * list models with GtkDropDown, how to use search and how to
+ * display the selected item differently from the presentation
+ * in the popup.
+ */
+
+#include <gtk/gtk.h>
+
+
+#define STRING_TYPE_HOLDER (string_holder_get_type ())
+G_DECLARE_FINAL_TYPE (StringHolder, string_holder, STRING, HOLDER, GObject)
+
+struct _StringHolder {
+  GObject parent_instance;
+  char *title;
+  char *icon;
+  char *description;
+};
+
+G_DEFINE_TYPE (StringHolder, string_holder, G_TYPE_OBJECT);
+
+static void
+string_holder_init (StringHolder *holder)
+{
+}
+
+static void
+string_holder_finalize (GObject *object)
+{
+  StringHolder *holder = STRING_HOLDER (object);
+
+  g_free (holder->title);
+  g_free (holder->icon);
+  g_free (holder->description);
+
+  G_OBJECT_CLASS (string_holder_parent_class)->finalize (object);
+}
+
+static void
+string_holder_class_init (StringHolderClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  object_class->finalize = string_holder_finalize;
+}
+
+static StringHolder *
+string_holder_new (const char *title, const char *icon, const char *description)
+{
+  StringHolder *holder = g_object_new (STRING_TYPE_HOLDER, NULL);
+  holder->title = g_strdup (title);
+  holder->icon = g_strdup (icon);
+  holder->description = g_strdup (description);
+  return holder;
+}
+
+static void
+strings_setup_item_single_line (GtkSignalListItemFactory *factory,
+                                GtkListItem              *item)
+{
+  GtkWidget *box, *image, *title;
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+
+  image = gtk_image_new ();
+  title = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (title), 0.0);
+
+  gtk_box_append (GTK_BOX (box), image);
+  gtk_box_append (GTK_BOX (box), title);
+
+  g_object_set_data (G_OBJECT (item), "title", title);
+  g_object_set_data (G_OBJECT (item), "image", image);
+
+  gtk_list_item_set_child (item, box);
+}
+
+static void
+strings_setup_item_full (GtkSignalListItemFactory *factory,
+                         GtkListItem              *item)
+{
+  GtkWidget *box, *box2, *image, *title, *description;
+
+  image = gtk_image_new ();
+  title = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (title), 0.0);
+  description = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (description), 0.0);
+  gtk_style_context_add_class (gtk_widget_get_style_context (description), "dim-label");
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+  gtk_box_append (GTK_BOX (box), image);
+  gtk_box_append (GTK_BOX (box), box2);
+  gtk_box_append (GTK_BOX (box2), title);
+  gtk_box_append (GTK_BOX (box2), description);
+
+  g_object_set_data (G_OBJECT (item), "title", title);
+  g_object_set_data (G_OBJECT (item), "image", image);
+  g_object_set_data (G_OBJECT (item), "description", description);
+
+  gtk_list_item_set_child (item, box);
+}
+
+static void
+strings_bind_item (GtkSignalListItemFactory *factory,
+                    GtkListItem              *item)
+{
+  GtkWidget *image, *title, *description;
+  StringHolder *holder;
+
+  holder = gtk_list_item_get_item (item);
+
+  title = g_object_get_data (G_OBJECT (item), "title");
+  image = g_object_get_data (G_OBJECT (item), "image");
+  description = g_object_get_data (G_OBJECT (item), "description");
+
+  gtk_label_set_label (GTK_LABEL (title), holder->title);
+  if (image)
+    {
+      gtk_image_set_from_icon_name (GTK_IMAGE (image), holder->icon);
+      gtk_widget_set_visible (image, holder->icon != NULL);
+    }
+  if (description)
+    {
+      gtk_label_set_label (GTK_LABEL (description), holder->description);
+      gtk_widget_set_visible (description , holder->description != NULL);
+    }
+}
+
+static GtkListItemFactory *
+strings_factory_new (gboolean full)
+{
+  GtkListItemFactory *factory;
+
+  factory = gtk_signal_list_item_factory_new ();
+  if (full)
+    g_signal_connect (factory, "setup", G_CALLBACK (strings_setup_item_full), NULL);
+  else
+    g_signal_connect (factory, "setup", G_CALLBACK (strings_setup_item_single_line), NULL);
+  g_signal_connect (factory, "bind", G_CALLBACK (strings_bind_item), NULL);
+
+  return factory;
+}
+
+static GListModel *
+strings_model_new (const char *const *titles,
+                   const char *const *icons,
+                   const char *const *descriptions)
+{
+  GListStore *store;
+  int i;
+
+  store = g_list_store_new (STRING_TYPE_HOLDER);
+  for (i = 0; titles[i]; i++)
+    {
+      StringHolder *holder = string_holder_new (titles[i],
+                                                icons ? icons[i] : NULL,
+                                                descriptions ? descriptions[i] : NULL);
+      g_list_store_append (store, holder);
+      g_object_unref (holder);
+    }
+
+  return G_LIST_MODEL (store);
+}
+
+static GtkWidget *
+drop_down_new_from_strings (const char *const *titles,
+                            const char *const *icons,
+                            const char *const *descriptions)
+{
+  GtkWidget *widget;
+  GListModel *model;
+  GtkListItemFactory *factory;
+  GtkListItemFactory *list_factory;
+
+  g_return_val_if_fail (titles != NULL, NULL);
+  g_return_val_if_fail (icons == NULL || g_strv_length ((char **)icons) == g_strv_length ((char **)titles), NULL);
+  g_return_val_if_fail (descriptions == NULL || g_strv_length ((char **)icons) == g_strv_length ((char **)descriptions), NULL);
+
+  model = strings_model_new (titles, icons, descriptions);
+  factory = strings_factory_new (FALSE);
+  if (icons != NULL || descriptions != NULL)
+    list_factory = strings_factory_new (TRUE);
+  else
+    list_factory = NULL;
+
+  widget = g_object_new (GTK_TYPE_DROP_DOWN,
+                         "model", model,
+                         "factory", factory,
+                         "list-factory", list_factory,
+                         NULL);
+
+  g_object_unref (model);
+  g_object_unref (factory);
+  if (list_factory)
+    g_object_unref (list_factory);
+
+  return widget;
+}
+
+static char *
+get_family_name (gpointer item)
+{
+  return g_strdup (pango_font_family_get_name (PANGO_FONT_FAMILY (item)));
+}
+
+static char *
+get_title (gpointer item)
+{
+  return g_strdup (STRING_HOLDER (item)->title);
+}
+
+GtkWidget *
+do_dropdown (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *button, *box, *spin, *check;
+  GListModel *model;
+  GtkExpression *expression;
+  const char * const times[] = { "1 minute", "2 minutes", "5 minutes", "20 minutes", NULL };
+  const char * const many_times[] = {
+    "1 minute", "2 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes",
+    "25 minutes", "30 minutes", "35 minutes", "40 minutes", "45 minutes", "50 minutes",
+    "55 minutes", "1 hour", "2 hours", "3 hours", "5 hours", "6 hours", "7 hours",
+    "8 hours", "9 hours", "10 hours", "11 hours", "12 hours", NULL
+  };
+  const char * const device_titles[] = { "Digital Output", "Headphones", "Digital Output", "Analog Output", NULL };
+  const char * const device_icons[] = {  "audio-card-symbolic", "audio-headphones-symbolic", "audio-card-symbolic", "audio-card-symbolic", NULL };
+  const char * const device_descriptions[] = {
+    "Built-in Audio", "Built-in audio", "Thinkpad Tunderbolt 3 Dock USB Audio", "Thinkpad Tunderbolt 3 Dock USB Audio", NULL
+  };
+
+  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), "Drop Downs");
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+      gtk_widget_set_margin_start (box, 10);
+      gtk_widget_set_margin_end (box, 10);
+      gtk_widget_set_margin_top (box, 10);
+      gtk_widget_set_margin_bottom (box, 10);
+      gtk_window_set_child (GTK_WINDOW (window), box);
+
+      button = gtk_drop_down_new ();
+
+      model = G_LIST_MODEL (pango_cairo_font_map_get_default ());
+      gtk_drop_down_set_model (GTK_DROP_DOWN (button), model);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (button), 0);
+
+      expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
+                                                0, NULL,
+                                                (GCallback)get_family_name,
+                                                NULL, NULL);
+      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
+      gtk_expression_unref (expression);
+      gtk_box_append (GTK_BOX (box), button);
+
+      spin = gtk_spin_button_new_with_range (-1, g_list_model_get_n_items (G_LIST_MODEL (model)), 1);
+      gtk_widget_set_halign (spin, GTK_ALIGN_START);
+      g_object_bind_property  (button, "selected", spin, "value", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
+      gtk_box_append (GTK_BOX (box), spin);
+
+      check = gtk_check_button_new_with_label ("Enable search");
+      g_object_bind_property  (button, "enable-search", check, "active", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
+      gtk_box_append (GTK_BOX (box), check);
+
+      g_object_unref (model);
+
+      button = drop_down_new_from_strings (times, NULL, NULL);
+      gtk_box_append (GTK_BOX (box), button);
+
+      button = drop_down_new_from_strings (many_times, NULL, NULL);
+      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
+      expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
+                                                0, NULL,
+                                                (GCallback)get_title,
+                                                NULL, NULL);
+      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
+      gtk_expression_unref (expression);
+      gtk_box_append (GTK_BOX (box), button);
+
+      button = drop_down_new_from_strings (device_titles, device_icons, device_descriptions);
+      gtk_box_append (GTK_BOX (box), button);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/editable_cells.c

@@ -275,6 +275,9 @@ cell_edited (GtkCellRendererText *cell,
                             g_array_index (articles, Item, i).product, -1);
       }
       break;
+
+    default:
+      g_assert_not_reached ();
     }
 
   gtk_tree_path_free (path);
@@ -345,27 +348,28 @@ do_editable_cells (GtkWidget *do_widget)
       GtkTreeModel *items_model;
       GtkTreeModel *numbers_model;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 5);
+      gtk_widget_set_margin_end (vbox, 5);
+      gtk_widget_set_margin_top (vbox, 5);
+      gtk_widget_set_margin_bottom (vbox, 5);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
-      gtk_container_add (GTK_CONTAINER (vbox),
+      gtk_box_append (GTK_BOX (vbox),
                           gtk_label_new ("Shopping list (you can edit the cells!)"));
 
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+      sw = gtk_scrolled_window_new ();
+      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_append (GTK_BOX (vbox), sw);
 
       /* create models */
       items_model = create_items_model ();
@@ -382,22 +386,22 @@ do_editable_cells (GtkWidget *do_widget)
       g_object_unref (numbers_model);
       g_object_unref (items_model);
 
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
 
       /* some buttons */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_append (GTK_BOX (vbox), hbox);
 
       button = gtk_button_new_with_label ("Add item");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (add_item), treeview);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);
 
       button = gtk_button_new_with_label ("Remove item");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (remove_item), treeview);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_append (GTK_BOX (hbox), button);
 
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }
@@ -405,7 +409,7 @@ do_editable_cells (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/entry_completion.c

@@ -1,4 +1,4 @@
-/* Entry/Entry Completion
+/* Entry/Completion
  *
  * GtkEntryCompletion provides a mechanism for adding support for
  * completion in GtkEntry.
@@ -9,25 +9,51 @@
 #include <gtk/gtk.h>
 
 /* Creates a tree model containing the completions */
-GtkTreeModel *
+static GtkTreeModel *
 create_completion_model (void)
 {
+  const char *strings[] = {
+    "GNOME",
+    "gnominious",
+    "Gnomonic projection",
+    "Gnosophy",
+    "total",
+    "totally",
+    "toto",
+    "tottery",
+    "totterer",
+    "Totten trust",
+    "Tottenham hotspurs",
+    "totipotent",
+    "totipotency",
+    "totemism",
+    "totem pole",
+    "Totara",
+    "totalizer",
+    "totalizator",
+    "totalitarianism",
+    "total parenteral nutrition",
+    "total eclipse",
+    "Totipresence",
+    "Totipalmi",
+    "zombie",
+    "aæx",
+    "aæy",
+    "aæz",
+    NULL
+  };
+  int i;
   GtkListStore *store;
   GtkTreeIter iter;
 
   store = gtk_list_store_new (1, G_TYPE_STRING);
 
-  /* Append one word */
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, "GNOME", -1);
-
-  /* Append another word */
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, "total", -1);
-
-  /* And another word */
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, "totally", -1);
+  for (i = 0; strings[i]; i++)
+    {
+      /* Append one word */
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter, 0, strings[i], -1);
+    }
 
   return GTK_TREE_MODEL (store);
 }
@@ -45,26 +71,27 @@ do_entry_completion (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
+      gtk_window_set_title (GTK_WINDOW (window), "Completion");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 5);
+      gtk_widget_set_margin_end (vbox, 5);
+      gtk_widget_set_margin_top (vbox, 5);
+      gtk_widget_set_margin_bottom (vbox, 5);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_label_set_markup (GTK_LABEL (label), "Try writing <b>total</b> or <b>gnome</b> for example.");
+      gtk_box_append (GTK_BOX (vbox), label);
 
       /* Create our entry */
       entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_append (GTK_BOX (vbox), entry);
 
       /* Create the completion object */
       completion = gtk_entry_completion_new ();
@@ -80,12 +107,15 @@ do_entry_completion (GtkWidget *do_widget)
 
       /* Use model column 0 as the text column */
       gtk_entry_completion_set_text_column (completion, 0);
+
+      gtk_entry_completion_set_inline_completion (completion, TRUE);
+      gtk_entry_completion_set_inline_selection (completion, TRUE);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/entry_undo.c

@@ -1,8 +1,8 @@
-/* Entry/Entry Undo
+/* Entry/Undo and Redo
  *
  * GtkEntry can provide basic Undo/Redo support using standard keyboard
- * accelerators such as Primary+z to undo and Primary+Shift+z to redo.
- * Additionally, Primary+y can be used to redo.
+ * accelerators such as Control+z to undo and Control+Shift+z to redo.
+ * Additionally, Control+y can be used to redo.
  *
  * Use gtk_entry_set_enable_undo() to enable undo/redo support.
  */
@@ -20,33 +20,35 @@ do_entry_undo (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
+      gtk_window_set_title (GTK_WINDOW (window), "Undo and Redo");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 5);
+      gtk_widget_set_margin_end (vbox, 5);
+      gtk_widget_set_margin_top (vbox, 5);
+      gtk_widget_set_margin_bottom (vbox, 5);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "Use Primary+z or Primary+Shift+z to undo or redo changes");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       /* Create our entry */
       entry = gtk_entry_new ();
       gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_append (GTK_BOX (vbox), entry);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/expander.c

@@ -15,7 +15,7 @@ static GtkWidget *window = NULL;
 static void
 response_cb (GtkDialog *dialog, gint response_id)
 {
-  gtk_widget_destroy (window);
+  gtk_window_destroy (GTK_WINDOW (window));
   window = NULL;
 }
 
@@ -57,9 +57,9 @@ do_expander (GtkWidget *do_widget)
 
       expander = gtk_expander_new ("Details:");
       gtk_widget_set_vexpand (expander, TRUE);
-      sw = gtk_scrolled_window_new (NULL, NULL);
+      sw = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
+      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
@@ -78,9 +78,9 @@ do_expander (GtkWidget *do_widget)
                                 "A second paragraph will contain even more "
                                 "innuendo, just to make you scroll down or "
                                 "resize the window. Do it already !", -1);
-      gtk_container_add (GTK_CONTAINER (sw), tv);
-      gtk_container_add (GTK_CONTAINER (expander), sw);
-      gtk_container_add (GTK_CONTAINER (area), expander);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
+      gtk_expander_set_child (GTK_EXPANDER (expander), sw);
+      gtk_box_append (GTK_BOX (area), expander);
       g_signal_connect (expander, "notify::expanded",
                         G_CALLBACK (expander_cb), window);
 
@@ -90,7 +90,7 @@ do_expander (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/filtermodel.c

@@ -125,8 +125,7 @@ do_filtermodel (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       store = (GtkListStore*)gtk_builder_get_object (builder, "liststore1");
 
@@ -199,7 +198,7 @@ do_filtermodel (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/filtermodel.ui

@@ -31,7 +31,10 @@
     <property name="title" translatable="yes">Filter Model</property>
     <child>
       <object class="GtkGrid" id="grid1">
-        <property name="margin">10</property>
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</property>
         <property name="column-homogeneous">1</property>
@@ -53,7 +56,6 @@
         </child>
         <child>
           <object class="GtkTreeView" id="treeview1">
-            <property name="can-focus">1</property>
             <property name="model">liststore1</property>
             <property name="headers-clickable">0</property>
             <child internal-child="selection">
@@ -92,7 +94,6 @@
         </child>
         <child>
           <object class="GtkTreeView" id="treeview2">
-            <property name="can-focus">1</property>
             <property name="headers-clickable">0</property>
             <property name="search-column">0</property>
             <child internal-child="selection">
@@ -175,7 +176,6 @@
         </child>
         <child>
           <object class="GtkTreeView" id="treeview3">
-            <property name="can-focus">1</property>
             <property name="headers-clickable">0</property>
             <property name="search-column">0</property>
             <child internal-child="selection">

demos/gtk-demo/fishbowl.c

@@ -22,29 +22,11 @@ gsize n_icon_names = 0;
 static void
 init_icon_names (GtkIconTheme *theme)
 {
-  GPtrArray *icons;
-  GList *l, *icon_list;
-
   if (icon_names)
     return;
 
-  icon_list = gtk_icon_theme_list_icons (theme);
-  icons = g_ptr_array_new ();
-
-  for (l = icon_list; l; l = l->next)
-    {
-      if (g_str_has_suffix (l->data, "symbolic"))
-        continue;
-
-      g_ptr_array_add (icons, g_strdup (l->data));
-    }
-
-  n_icon_names = icons->len;
-  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
-  icon_names = (char **) g_ptr_array_free (icons, FALSE);
-
-  /* don't free strings, we assigned them to the array */
-  g_list_free_full (icon_list, g_free);
+  icon_names = gtk_icon_theme_get_icon_names (theme);
+  n_icon_names = g_strv_length (icon_names);
 }
 
 static const char *
@@ -55,6 +37,7 @@ get_random_icon_name (GtkIconTheme *theme)
   return icon_names[g_random_int_range(0, n_icon_names)];
 }
 
+/* Can't be static because it's also used in iconscroll.c */
 GtkWidget *
 create_icon (void)
 {
@@ -79,7 +62,7 @@ create_blurred_button (void)
 {
   GtkWidget *w = gtk_button_new ();
 
-  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");
+  gtk_widget_add_css_class (w, "blurred-button");
 
   return w;
 }
@@ -176,9 +159,9 @@ static GtkWidget *
 create_menu_button (void)
 {
   GtkWidget *w = gtk_menu_button_new ();
-  GtkWidget *popover = gtk_popover_new (NULL);
+  GtkWidget *popover = gtk_popover_new ();
 
-  gtk_container_add (GTK_CONTAINER (popover), gtk_button_new_with_label ("Hey!"));
+  gtk_popover_set_child (GTK_POPOVER (popover), gtk_button_new_with_label ("Hey!"));
   gtk_popover_set_autohide (GTK_POPOVER (popover), FALSE);
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (w), popover);
   g_signal_connect (w, "map", G_CALLBACK (mapped), NULL);
@@ -211,7 +194,7 @@ static void
 set_widget_type (GtkFishbowl *fishbowl,
                  int          widget_type_index)
 {
-  GtkWidget *window, *headerbar;
+  GtkWidget *window;
 
   if (widget_type_index == selected_widget_type)
     return;
@@ -222,9 +205,8 @@ set_widget_type (GtkFishbowl *fishbowl,
                                   widget_types[selected_widget_type].create_func);
 
   window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (fishbowl)));
-  headerbar = gtk_window_get_titlebar (GTK_WINDOW (window));
-  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
-                            widget_types[selected_widget_type].name);
+  gtk_window_set_title (GTK_WINDOW (window),
+                        widget_types[selected_widget_type].name);
 }
 
 void
@@ -267,6 +249,14 @@ fishbowl_changes_toggled_cb (GtkToggleButton *button,
     gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow");
 }
 
+char *
+format_header_cb (GObject *object,
+                  guint    count,
+                  double   fps)
+{
+  return g_strdup_printf ("%u Icons, %.2f fps", count, fps);
+}
+
 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
 {
@@ -291,15 +281,13 @@ do_fishbowl (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
       bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
       selected_widget_type = -1;
       set_widget_type (GTK_FISHBOWL (bowl), 0);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_widget_realize (window);
       g_object_unref (builder);
@@ -308,7 +296,7 @@ do_fishbowl (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/fishbowl.ui

@@ -28,28 +28,18 @@
         </child>
         <child type="end">
           <object class="GtkLabel">
-            <property name="label">fps</property>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkLabel">
-            <property name="label" bind-source="bowl" bind-property="framerate-string"/>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkLabel">
-            <property name="label">Icons, </property>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkLabel">
-            <property name="label" bind-source="bowl" bind-property="count"/>
+            <binding name="label">
+              <closure type="gchararray" function="format_header_cb">
+                <lookup name="count">bowl</lookup>
+                <lookup name="framerate">bowl</lookup>
+              </closure>
+            </binding>
           </object>
         </child>
         <child type="end">
           <object class="GtkToggleButton" id="changes_allow">
             <property name="icon-name">changes-allow</property>
-            <property name="relief">none</property>
+            <property name="has-frame">0</property>
             <signal name="notify::active" handler="fishbowl_changes_toggled_cb"/>
           </object>
         </child>
@@ -58,6 +48,7 @@
     <child>
       <object class="GtkFishbowl" id="bowl">
         <property name="visible">True</property>
+        <property name="overflow">hidden</property>
         <property name="animating">True</property>
         <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean | sync-create"/>
       </object>

demos/gtk-demo/fixed.c

@@ -1,4 +1,4 @@
-/* Fixed layout
+/* Fixed Layout
  *
  * GtkFixed is a container that allows placing and transforming
  * widgets manually.
@@ -52,8 +52,8 @@ create_faces (void)
       /* Add a face */
       faces[i].face = gtk_frame_new (NULL);
       gtk_widget_set_size_request (faces[i].face, face_size, face_size);
-      gtk_style_context_add_class (gtk_widget_get_style_context (faces[i].face), faces[i].css_class);
-      gtk_container_add (GTK_CONTAINER (fixed), faces[i].face);
+      gtk_widget_add_css_class (faces[i].face, faces[i].css_class);
+      gtk_fixed_put (GTK_FIXED (fixed), faces[i].face, 0, 0);
 
       /* Set up the transformation for each face */
       transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w, h));
@@ -124,22 +124,22 @@ create_demo_window (GtkWidget *do_widget)
 {
   GtkWidget *window, *sw, *fixed, *cube;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "Fixed layout");
+  gtk_window_set_title (GTK_WINDOW (window), "Fixed Layout");
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), sw);
+  sw = gtk_scrolled_window_new ();
+  gtk_window_set_child (GTK_WINDOW (window), sw);
 
   fixed = gtk_fixed_new ();
-  gtk_container_add (GTK_CONTAINER (sw), fixed);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), fixed);
   gtk_widget_set_halign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
   gtk_widget_set_valign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
 
   cube = create_faces ();
-  gtk_container_add (GTK_CONTAINER (fixed), cube);
+  gtk_fixed_put (GTK_FIXED (fixed), cube, 0, 0);
   gtk_widget_set_overflow (fixed, GTK_OVERFLOW_VISIBLE);
 
   provider = gtk_css_provider_new ();
@@ -161,7 +161,7 @@ do_fixed (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (demo_window))
     gtk_widget_show (demo_window);
   else
-    gtk_widget_destroy (demo_window);
+    gtk_window_destroy (GTK_WINDOW (demo_window));
 
   return demo_window;
 }

demos/gtk-demo/flowbox.c

@@ -1,9 +1,10 @@
 /* Flow Box
  *
  * GtkFlowBox allows flexible and responsive grids which reflow
- * as needed and support sorting and filtering.
+ * as needed and support sorting and filtering. The children of
+ * a GtkFlowBox are regular widgets
  *
- * The children of a GtkFlowBox are regular widgets
+ * The dataset used here has 665 colors.
  */
 
 #include <gtk/gtk.h>
@@ -37,7 +38,7 @@ color_swatch_new (const gchar *color)
   gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (area), 24);
   gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (area), 24);
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (area), draw_color, (gpointer) color, NULL);
-  gtk_container_add (GTK_CONTAINER (button), area);
+  gtk_button_set_child (GTK_BUTTON (button), area);
 
   return button;
 }
@@ -719,33 +720,31 @@ do_flowbox (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Flow Box");
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      scrolled = gtk_scrolled_window_new (NULL, NULL);
+      scrolled = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
       flowbox = gtk_flow_box_new ();
       gtk_widget_set_valign (flowbox, GTK_ALIGN_START);
       gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (flowbox), 30);
       gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (flowbox), GTK_SELECTION_NONE);
 
-      gtk_container_add (GTK_CONTAINER (scrolled), flowbox);
-      gtk_container_add (GTK_CONTAINER (window), scrolled);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), flowbox);
+      gtk_window_set_child (GTK_WINDOW (window), scrolled);
 
       for (i = 0; colors[i]; i++)
-        gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));
+        gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), color_swatch_new (colors[i]), -1);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/font-features.ui

@@ -4,13 +4,12 @@
   <object class="GtkWindow" id="window">
     <property name="default-width">600</property>
     <property name="default-height">500</property>
+    <property name="title">Font Explorer</property>
     <child type="titlebar">
       <object class="GtkHeaderBar">
         <property name="show-title-buttons">1</property>
-        <property name="title">Font Explorer</property>
         <child>
           <object class="GtkButton" id="reset">
-            <property name="can-focus">1</property>
             <property name="receives-default">1</property>
             <property name="tooltip-text">Reset</property>
             <signal name="clicked" handler="font_features_reset_features" swapped="no"/>
@@ -27,18 +26,19 @@
       <object class="GtkBox">
         <child>
           <object class="GtkScrolledWindow">
-            <property name="can-focus">1</property>
             <property name="hscrollbar-policy">never</property>
             <child>
               <object class="GtkViewport">
                 <child>
                   <object class="GtkBox">
-                    <property name="margin">10</property>
+                    <property name="margin-start">10</property>
+                    <property name="margin-end">10</property>
+                    <property name="margin-top">10</property>
+                    <property name="margin-bottom">10</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkFontButton" id="font">
-                        <property name="can-focus">1</property>
                         <property name="receives-default">1</property>
                         <property name="font">Sans 12</property>
                         <property name="level">family|style|size|variations|features</property>
@@ -61,7 +61,6 @@
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkComboBox" id="script_lang">
-                                <property name="can-focus">1</property>
                                 <property name="margin-top">10</property>
                                 <signal name="changed" handler="font_features_script_changed" swapped="no"/>
                                 <child>
@@ -109,7 +108,10 @@
             <property name="orientation">vertical</property>
             <property name="hexpand">1</property>
             <property name="vexpand">1</property>
-            <property name="margin">20</property>
+            <property name="margin-start">20</property>
+            <property name="margin-end">20</property>
+            <property name="margin-top">20</property>
+            <property name="margin-bottom">20</property>
             <property name="spacing">20</property>
             <child>
               <object class="GtkStack" id="stack">

demos/gtk-demo/font_features.c

@@ -25,14 +25,14 @@
 
 #define MAKE_TAG(a,b,c,d) (unsigned int)(((a) << 24) | ((b) << 16) | ((c) <<  8) | (d))
 
-static GtkWidget *label;
+static GtkWidget *the_label;
 static GtkWidget *settings;
 static GtkWidget *description;
 static GtkWidget *font;
 static GtkWidget *script_lang;
 static GtkWidget *resetbutton;
 static GtkWidget *stack;
-static GtkWidget *entry;
+static GtkWidget *the_entry;
 static GtkWidget *variations_heading;
 static GtkWidget *variations_grid;
 static GtkWidget *instance_combo;
@@ -194,7 +194,7 @@ add_check_group (GtkWidget   *box,
   pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   pango_attr_list_unref (attrs);
-  gtk_container_add (GTK_CONTAINER (group), label);
+  gtk_box_append (GTK_BOX (group), label);
 
   for (i = 0; tags[i]; i++)
     {
@@ -211,7 +211,7 @@ add_check_group (GtkWidget   *box,
       g_signal_connect (feat, "notify::inconsistent", G_CALLBACK (update_display), NULL);
       g_signal_connect (feat, "clicked", G_CALLBACK (feat_clicked), NULL);
 
-      gtk_container_add (GTK_CONTAINER (group), feat);
+      gtk_box_append (GTK_BOX (group), feat);
 
       item = g_new (FeatureItem, 1);
       item->name = tags[i];
@@ -223,7 +223,7 @@ add_check_group (GtkWidget   *box,
       feature_items = g_list_prepend (feature_items, item);
     }
 
-  gtk_container_add (GTK_CONTAINER (box), group);
+  gtk_box_append (GTK_BOX (box), group);
 }
 
 static void
@@ -248,7 +248,7 @@ add_radio_group (GtkWidget *box,
   pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
   gtk_label_set_attributes (GTK_LABEL (label), attrs);
   pango_attr_list_unref (attrs);
-  gtk_container_add (GTK_CONTAINER (group), label);
+  gtk_box_append (GTK_BOX (group), label);
 
   for (i = 0; tags[i]; i++)
     {
@@ -268,7 +268,7 @@ add_radio_group (GtkWidget *box,
       g_signal_connect (feat, "notify::active", G_CALLBACK (update_display), NULL);
       g_object_set_data (G_OBJECT (feat), "default", group_button);
 
-      gtk_container_add (GTK_CONTAINER (group), feat);
+      gtk_box_append (GTK_BOX (group), feat);
 
       item = g_new (FeatureItem, 1);
       item->name = tags[i];
@@ -280,7 +280,7 @@ add_radio_group (GtkWidget *box,
       feature_items = g_list_prepend (feature_items, item);
     }
 
-  gtk_container_add (GTK_CONTAINER (box), group);
+  gtk_box_append (GTK_BOX (box), group);
 }
 
 static void
@@ -301,9 +301,9 @@ update_display (void)
   char *font_desc;
   char *features;
 
-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_editable_get_text (GTK_EDITABLE (the_entry));
 
-  if (gtk_label_get_selection_bounds (GTK_LABEL (label), &ins, &bound))
+  if (gtk_label_get_selection_bounds (GTK_LABEL (the_label), &ins, &bound))
     {
       start = g_utf8_offset_to_pointer (text, ins) - text;
       end = g_utf8_offset_to_pointer (text, bound) - text;
@@ -409,8 +409,8 @@ update_display (void)
 
   gtk_label_set_text (GTK_LABEL (description), font_desc);
   gtk_label_set_text (GTK_LABEL (settings), features);
-  gtk_label_set_text (GTK_LABEL (label), text);
-  gtk_label_set_attributes (GTK_LABEL (label), attrs);
+  gtk_label_set_text (GTK_LABEL (the_label), text);
+  gtk_label_set_attributes (GTK_LABEL (the_label), attrs);
 
   g_free (font_desc);
   pango_font_description_free (desc);
@@ -548,7 +548,7 @@ update_script_combo (void)
     {
       const char *langname;
       char langbuf[5];
-      GtkTreeIter iter;
+      GtkTreeIter tree_iter;
 
       if (pair->lang_tag == HB_OT_TAG_DEFAULT_LANGUAGE)
         langname = NC_("Language", "Default");
@@ -563,7 +563,7 @@ update_script_combo (void)
             }
         }
 
-      gtk_list_store_insert_with_values (store, &iter, -1,
+      gtk_list_store_insert_with_values (store, &tree_iter, -1,
                                          0, langname,
                                          1, pair->script_index,
                                          2, pair->lang_index,
@@ -572,7 +572,7 @@ update_script_combo (void)
       if (pair->lang_tag == active)
         {
           have_active = TRUE;
-          active_iter = iter;
+          active_iter = tree_iter;
         }
     }
 
@@ -751,7 +751,7 @@ add_font_variations (GString *s)
   GHashTableIter iter;
   Axis *axis;
   char buf[G_ASCII_DTOSTR_BUF_SIZE];
-  char *sep = "";
+  const char *sep = "";
 
   g_hash_table_iter_init (&iter, axes);
   while (g_hash_table_iter_next (&iter, (gpointer *)NULL, (gpointer *)&axis))
@@ -1025,7 +1025,7 @@ denorm_coord (hb_ot_var_axis_info_t *axis, int coord)
 static void
 update_font_variations (void)
 {
-  GtkWidget *child, *next;
+  GtkWidget *child;
   PangoFont *pango_font = NULL;
   hb_font_t *hb_font;
   hb_face_t *hb_face;
@@ -1037,12 +1037,8 @@ update_font_variations (void)
   int i;
 
   child = gtk_widget_get_first_child (variations_grid);
-  while (child != NULL)
-    {
-      next = gtk_widget_get_next_sibling (child);
-      gtk_widget_destroy (child);
-      child = next;
-    }
+  while ((child = gtk_widget_get_first_child (variations_grid)))
+    gtk_grid_remove (GTK_GRID (variations_grid), child);
 
   instance_combo = NULL;
 
@@ -1129,7 +1125,7 @@ font_features_reset_features (void)
 {
   GList *l;
 
-  gtk_label_select_region (GTK_LABEL (label), 0, 0);
+  gtk_label_select_region (GTK_LABEL (the_label), 0, 0);
 
   g_list_free_full (ranges, free_range);
   ranges = NULL;
@@ -1156,9 +1152,9 @@ static char *text;
 static void
 switch_to_entry (void)
 {
-  text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (entry)));
+  text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (the_entry)));
   gtk_stack_set_visible_child_name (GTK_STACK (stack), "entry");
-  gtk_widget_grab_focus (entry);
+  gtk_widget_grab_focus (the_entry);
 }
 
 static void
@@ -1217,20 +1213,20 @@ do_font_features (GtkWidget *do_widget)
 
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list"));
-      label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
+      the_label = GTK_WIDGET (gtk_builder_get_object (builder, "label"));
       settings = GTK_WIDGET (gtk_builder_get_object (builder, "settings"));
       description = GTK_WIDGET (gtk_builder_get_object (builder, "description"));
       resetbutton = GTK_WIDGET (gtk_builder_get_object (builder, "reset"));
       font = GTK_WIDGET (gtk_builder_get_object (builder, "font"));
       script_lang = GTK_WIDGET (gtk_builder_get_object (builder, "script_lang"));
       stack = GTK_WIDGET (gtk_builder_get_object (builder, "stack"));
-      entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
+      the_entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
       edit_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "edit_toggle"));
 
       controller = gtk_event_controller_key_new ();
-      g_object_set_data_full (G_OBJECT (entry), "controller", g_object_ref (controller), g_object_unref);
-      g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), entry);
-      gtk_widget_add_controller (entry, controller);
+      g_object_set_data_full (G_OBJECT (the_entry), "controller", g_object_ref (controller), g_object_unref);
+      g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), the_entry);
+      gtk_widget_add_controller (the_entry, controller);
 
       add_check_group (feature_list, _("Kerning"), (const char *[]){ "kern", NULL });
       add_check_group (feature_list, _("Ligatures"), (const char *[]){ "liga",
@@ -1333,8 +1329,7 @@ do_font_features (GtkWidget *do_widget)
 
       font_features_font_changed ();
 
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       g_object_unref (builder);
 
@@ -1344,7 +1339,7 @@ do_font_features (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_window_present (GTK_WINDOW (window));
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/fontplane.c

@@ -140,17 +140,6 @@ update_value (GtkFontPlane *plane,
   gtk_widget_queue_draw (widget);
 }
 
-static void
-hold_action (GtkGestureLongPress *gesture,
-             gdouble              x,
-             gdouble              y,
-             GtkFontPlane       *plane)
-{
-  gboolean handled;
-
-  g_signal_emit_by_name (plane, "popup-menu", &handled);
-}
-
 static void
 plane_drag_gesture_begin (GtkGestureDrag *gesture,
                           gdouble         start_x,
@@ -161,13 +150,6 @@ plane_drag_gesture_begin (GtkGestureDrag *gesture,
 
   button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture));
 
-  if (button == GDK_BUTTON_SECONDARY)
-    {
-      gboolean handled;
-
-      g_signal_emit_by_name (plane, "popup-menu", &handled);
-    }
-
   if (button != GDK_BUTTON_PRIMARY)
     {
       gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_DENIED);
@@ -207,8 +189,6 @@ gtk_font_plane_init (GtkFontPlane *plane)
 {
   GtkGesture *gesture;
 
-  gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
-
   gesture = gtk_gesture_drag_new ();
   g_signal_connect (gesture, "drag-begin",
 		    G_CALLBACK (plane_drag_gesture_begin), plane);
@@ -218,13 +198,6 @@ gtk_font_plane_init (GtkFontPlane *plane)
 		    G_CALLBACK (plane_drag_gesture_end), plane);
   gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0);
   gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
-
-  gesture = gtk_gesture_long_press_new ();
-  g_signal_connect (gesture, "pressed",
-                    G_CALLBACK (hold_action), plane);
-  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture),
-                                     TRUE);
-  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
 }
 
 static void

demos/gtk-demo/fontrendering.c

@@ -43,7 +43,6 @@ update_image (void)
   cairo_font_options_t *fopt;
   cairo_hint_style_t hintstyle;
   cairo_hint_metrics_t hintmetrics;
-  int i;
 
   if (!context)
     context = gtk_widget_create_pango_context (image);
@@ -116,6 +115,7 @@ update_image (void)
 
       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (show_grid)))
         {
+          int i;
           cairo_set_source_rgba (cr, 0.2, 0, 0, 0.2);
           for (i = 1; i < ink.height + 20; i++)
             {
@@ -281,7 +281,7 @@ do_fontrendering (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/fontrendering.ui

@@ -193,7 +193,7 @@
         <child>
           <object class="GtkScrolledWindow">
             <property name="propagate-natural-height">1</property>
-            <property name="shadow-type">in</property>
+            <property name="has-frame">1</property>
             <property name="hexpand">1</property>
             <property name="vexpand">1</property>
             <child>

demos/gtk-demo/gears.c

@@ -0,0 +1,137 @@
+/* OpenGL/Gears
+ *
+ * This is a classic OpenGL demo, running in a GtkGLArea.
+ */
+
+
+#include <stdlib.h>
+#include <gtk/gtk.h>
+
+#include "gtkgears.h"
+
+/************************************************************************
+ *                 DEMO CODE                                            *
+ ************************************************************************/
+
+static void
+on_axis_value_change (GtkAdjustment *adjustment,
+                      gpointer       data)
+{
+  GtkGears *gears = GTK_GEARS (data);
+  int axis = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (adjustment), "axis"));
+
+  gtk_gears_set_axis (gears, axis, gtk_adjustment_get_value (adjustment));
+}
+
+
+static GtkWidget *
+create_axis_slider (GtkGears *gears,
+                    int axis)
+{
+  GtkWidget *box, *label, *slider;
+  GtkAdjustment *adj;
+  const char *text;
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
+
+  switch (axis)
+    {
+    case GTK_GEARS_X_AXIS:
+      text = "X";
+      break;
+
+    case GTK_GEARS_Y_AXIS:
+      text = "Y";
+      break;
+
+    case GTK_GEARS_Z_AXIS:
+      text = "Z";
+      break;
+
+    default:
+      g_assert_not_reached ();
+    }
+
+  label = gtk_label_new (text);
+  gtk_box_append (GTK_BOX (box), label);
+  gtk_widget_show (label);
+
+  adj = gtk_adjustment_new (gtk_gears_get_axis (gears, axis), 0.0, 360.0, 1.0, 12.0, 0.0);
+  g_object_set_data (G_OBJECT (adj), "axis", GINT_TO_POINTER (axis));
+  g_signal_connect (adj, "value-changed",
+                    G_CALLBACK (on_axis_value_change),
+                    gears);
+  slider = gtk_scale_new (GTK_ORIENTATION_VERTICAL, adj);
+  gtk_scale_set_draw_value (GTK_SCALE (slider), FALSE);
+  gtk_box_append (GTK_BOX (box), slider);
+  gtk_widget_set_vexpand (slider, TRUE);
+  gtk_widget_show (slider);
+
+  gtk_widget_show (box);
+
+  return box;
+}
+
+GtkWidget *
+do_gears (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *box, *hbox, *fps_label, *gears, *overlay, *frame;
+  int i;
+
+  if (!window)
+    {
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Gears");
+      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
+      gtk_window_set_default_size (GTK_WINDOW (window), 640, 640);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      overlay = gtk_overlay_new ();
+      gtk_widget_set_margin_start (overlay, 12);
+      gtk_widget_set_margin_end (overlay, 12);
+      gtk_widget_set_margin_top (overlay, 12);
+      gtk_widget_set_margin_bottom (overlay, 12);
+
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
+
+      frame = gtk_frame_new (NULL);
+      gtk_widget_set_halign (frame, GTK_ALIGN_START);
+      gtk_widget_set_valign (frame, GTK_ALIGN_START);
+      gtk_widget_add_css_class (frame, "app-notification");
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), frame);
+
+      fps_label = gtk_label_new ("");
+      gtk_widget_set_halign (fps_label, GTK_ALIGN_START);
+      gtk_frame_set_child (GTK_FRAME (frame), fps_label);
+
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
+      gtk_box_set_spacing (GTK_BOX (box), 6);
+      gtk_overlay_set_child (GTK_OVERLAY (overlay), box);
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
+      gtk_box_set_spacing (GTK_BOX (box), 6);
+      gtk_box_append (GTK_BOX (box), hbox);
+
+      gears = gtk_gears_new ();
+      gtk_widget_set_hexpand (gears, TRUE);
+      gtk_widget_set_vexpand (gears, TRUE);
+      gtk_box_append (GTK_BOX (hbox), gears);
+
+      for (i = 0; i < GTK_GEARS_N_AXIS; i++)
+        gtk_box_append (GTK_BOX (hbox), create_axis_slider (GTK_GEARS (gears), i));
+
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
+      gtk_box_set_spacing (GTK_BOX (hbox), 6);
+      gtk_box_append (GTK_BOX (box), hbox);
+
+      gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label));
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/geninclude.py

@@ -13,17 +13,16 @@ in_files = sys.argv[2:]
 file_output = """
 typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
 
-typedef struct _Demo Demo;
+typedef struct _DemoData DemoData;
 
-struct _Demo
+struct _DemoData
 {
-  gchar *name;
-  gchar *title;
-  gchar *filename;
+  const char *name;
+  const char *title;
+  const char *filename;
   GDoDemoFunc func;
-  Demo *children;
+  DemoData *children;
 };
-
 """
 
 # Demo = namedtuple('Demo', ['name', 'title', 'file', 'func'])
@@ -67,7 +66,7 @@ for demo in demos:
 i = 0
 for parent in parents:
     id = parent_ids[i]
-    file_output += "\nDemo child" + str(id) + "[] = {\n"
+    file_output += "\nDemoData child" + str(id) + "[] = {\n"
     # iterate over all demos and check if the name starts with the given parent name
     for child in demos:
         if child[1].startswith(parent + "/"):
@@ -82,7 +81,7 @@ for parent in parents:
 # Sort demos by title
 demos = sorted(demos, key=lambda x: x[1])
 
-file_output += "\nDemo gtk_demos[] = {\n"
+file_output += "\nDemoData gtk_demos[] = {\n"
 for demo in demos:
     # Do not generate one of these for demos with a parent demo
     if "/" not in demo[1]:

demos/gtk-demo/gestures.c

@@ -146,14 +146,13 @@ do_gestures (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
       gtk_window_set_title (GTK_WINDOW (window), "Gestures");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       drawing_area = gtk_drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), drawing_area);
+      gtk_window_set_child (GTK_WINDOW (window), drawing_area);
 
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area),
                                       drawing_area_draw,
@@ -210,7 +209,7 @@ do_gestures (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/glarea.c

@@ -1,4 +1,4 @@
-/* OpenGL Area
+/* OpenGL/OpenGL Area
  *
  * GtkGLArea is a widget that allows custom drawing using OpenGL calls.
  */
@@ -354,7 +354,7 @@ create_axis_slider (int axis)
     }
 
   label = gtk_label_new (text);
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_append (GTK_BOX (box), label);
   gtk_widget_show (label);
 
   adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0);
@@ -362,7 +362,7 @@ create_axis_slider (int axis)
                     G_CALLBACK (on_axis_value_change),
                     GINT_TO_POINTER (axis));
   slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adj);
-  gtk_container_add (GTK_CONTAINER (box), slider);
+  gtk_box_append (GTK_BOX (box), slider);
   gtk_widget_set_hexpand (slider, TRUE);
   gtk_widget_show (slider);
 
@@ -383,27 +383,30 @@ close_window (GtkWidget *widget)
   rotation_angles[Z_AXIS] = 0.0;
 }
 
-GtkWidget *
+static GtkWidget *
 create_glarea_window (GtkWidget *do_widget)
 {
   GtkWidget *window, *box, *button, *controls;
   int i;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
   gtk_window_set_title (GTK_WINDOW (window), "OpenGL Area");
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  g_object_set (box, "margin", 12, NULL);
+  gtk_widget_set_margin_start (box, 12);
+  gtk_widget_set_margin_end (box, 12);
+  gtk_widget_set_margin_top (box, 12);
+  gtk_widget_set_margin_bottom (box, 12);
   gtk_box_set_spacing (GTK_BOX (box), 6);
-  gtk_container_add (GTK_CONTAINER (window), box);
+  gtk_window_set_child (GTK_WINDOW (window), box);
 
   gl_area = gtk_gl_area_new ();
   gtk_widget_set_hexpand (gl_area, TRUE);
   gtk_widget_set_vexpand (gl_area, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), gl_area);
+  gtk_box_append (GTK_BOX (box), gl_area);
 
   /* We need to initialize and free GL resources, so we use
    * the realize and unrealize signals on the widget
@@ -415,16 +418,16 @@ create_glarea_window (GtkWidget *do_widget)
   g_signal_connect (gl_area, "render", G_CALLBACK (render), NULL);
 
   controls = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_container_add (GTK_CONTAINER (box), controls);
+  gtk_box_append (GTK_BOX (box), controls);
   gtk_widget_set_hexpand (controls, TRUE);
 
   for (i = 0; i < N_AXIS; i++)
-    gtk_container_add (GTK_CONTAINER (controls), create_axis_slider (i));
+    gtk_box_append (GTK_BOX (controls), create_axis_slider (i));
 
   button = gtk_button_new_with_label ("Quit");
   gtk_widget_set_hexpand (button, TRUE);
-  gtk_container_add (GTK_CONTAINER (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
+  gtk_box_append (GTK_BOX (box), button);
+  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
 
   return window;
 }
@@ -438,7 +441,7 @@ do_glarea (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (demo_window))
     gtk_widget_show (demo_window);
   else
-    gtk_widget_destroy (demo_window);
+    gtk_window_destroy (GTK_WINDOW (demo_window));
 
   return demo_window;
 }

demos/gtk-demo/gtkfishbowl.c

@@ -25,7 +25,7 @@ typedef struct _GtkFishbowlChild         GtkFishbowlChild;
 struct _GtkFishbowlPrivate
 {
   GtkFishCreationFunc creation_func;
-  GList *children;
+  GHashTable *children;
   guint count;
 
   gint64 last_frame_time;
@@ -53,7 +53,6 @@ enum {
    PROP_BENCHMARK,
    PROP_COUNT,
    PROP_FRAMERATE,
-   PROP_FRAMERATE_STRING,
    PROP_UPDATE_DELAY,
    NUM_PROPERTIES
 };
@@ -68,6 +67,8 @@ gtk_fishbowl_init (GtkFishbowl *fishbowl)
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
 
   priv->update_delay = G_USEC_PER_SEC;
+  priv->children = g_hash_table_new_full (NULL, NULL,
+                                          NULL, (GDestroyNotify) g_free);
 }
 
 /**
@@ -94,20 +95,18 @@ gtk_fishbowl_measure (GtkWidget      *widget,
 {
   GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+  GHashTableIter iter;
+  gpointer key, value;
   GtkFishbowlChild *child;
-  GList *children;
   gint child_min, child_nat;
 
   *minimum = 0;
   *natural = 0;
 
-  for (children = priv->children; children; children = children->next)
+  g_hash_table_iter_init (&iter, priv->children);
+  while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      child = children->data;
-
-      if (!gtk_widget_get_visible (child->widget))
-        continue;
-
+      child = value;
 
       if (orientation == GTK_ORIENTATION_HORIZONTAL)
         {
@@ -137,14 +136,13 @@ gtk_fishbowl_size_allocate (GtkWidget *widget,
   GtkFishbowlChild *child;
   GtkAllocation child_allocation;
   GtkRequisition child_requisition;
-  GList *children;
+  GHashTableIter iter;
+  gpointer key, value;
 
-  for (children = priv->children; children; children = children->next)
+  g_hash_table_iter_init (&iter, priv->children);
+  while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      child = children->data;
-
-      if (!gtk_widget_get_visible (child->widget))
-        continue;
+      child = value;
 
       gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL);
       child_allocation.x = round (child->x * (width - child_requisition.width));
@@ -182,7 +180,7 @@ gtk_fishbowl_add (GtkFishbowl *fishbowl,
 
   gtk_widget_set_parent (widget, GTK_WIDGET (fishbowl));
 
-  priv->children = g_list_prepend (priv->children, child_info);
+  g_hash_table_insert (priv->children, widget, child_info);
   priv->count++;
   g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
 }
@@ -192,34 +190,26 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
                      GtkWidget   *widget)
 {
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child;
-  GtkWidget *widget_bowl = GTK_WIDGET (fishbowl);
-  GList *children;
 
-  for (children = priv->children; children; children = children->next)
+  if (g_hash_table_remove (priv->children, widget))
     {
-      child = children->data;
+      gtk_widget_unparent (widget);
 
-      if (child->widget == widget)
-        {
-          gboolean was_visible = gtk_widget_get_visible (widget);
-
-          gtk_widget_unparent (widget);
-
-          priv->children = g_list_remove_link (priv->children, children);
-          g_list_free (children);
-          g_free (child);
-
-          if (was_visible && gtk_widget_get_visible (widget_bowl))
-            gtk_widget_queue_resize (widget_bowl);
-
-          priv->count--;
-          g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
-          break;
-        }
+      priv->count--;
+      g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
     }
 }
 
+static void
+gtk_fishbowl_finalize (GObject *object)
+{
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (object);
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+
+  g_hash_table_destroy (priv->children);
+  priv->children = NULL;
+}
+
 static void
 gtk_fishbowl_dispose (GObject *object)
 {
@@ -289,14 +279,6 @@ gtk_fishbowl_get_property (GObject         *object,
       g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
       break;
 
-    case PROP_FRAMERATE_STRING:
-      {
-        char *s = g_strdup_printf ("%.2f", gtk_fishbowl_get_framerate (fishbowl));
-        g_value_set_string (value, s);
-        g_free (s);
-      }
-      break;
-
     case PROP_UPDATE_DELAY:
       g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
       break;
@@ -313,6 +295,7 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
+  object_class->finalize = gtk_fishbowl_finalize;
   object_class->dispose = gtk_fishbowl_dispose;
   object_class->set_property = gtk_fishbowl_set_property;
   object_class->get_property = gtk_fishbowl_get_property;
@@ -350,13 +333,6 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                            0,
                            G_PARAM_READABLE);
 
-  props[PROP_FRAMERATE_STRING] =
-      g_param_spec_string ("framerate-string",
-                           "Framerate as string",
-                           "Framerate as string, with 2 decimals",
-                           NULL,
-                           G_PARAM_READABLE);
-
   props[PROP_UPDATE_DELAY] =
       g_param_spec_int64 ("update-delay",
                           "Update delay",
@@ -508,7 +484,6 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
   priv->framerate = ((int)(priv->framerate * 100))/100.0;
 
   g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE_STRING]);
 
   if (!priv->benchmark)
     return;
@@ -552,8 +527,9 @@ gtk_fishbowl_tick (GtkWidget     *widget,
   GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
   GtkFishbowlChild *child;
-  GList *l;
   gint64 frame_time, elapsed;
+  GHashTableIter iter;
+  gpointer key, value;
   gboolean do_update;
 
   frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
@@ -565,9 +541,10 @@ gtk_fishbowl_tick (GtkWidget     *widget,
   if (elapsed == frame_time)
     return G_SOURCE_CONTINUE;
 
-  for (l = priv->children; l; l = l->next)
+  g_hash_table_iter_init (&iter, priv->children);
+  while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      child = l->data;
+      child = value;
 
       child->x += child->dx * ((double) elapsed / G_USEC_PER_SEC);
       child->y += child->dy * ((double) elapsed / G_USEC_PER_SEC);

demos/gtk-demo/gtkgears.c

@@ -197,7 +197,7 @@ gtk_gears_class_init (GtkGearsClass *klass)
  * @param v the vertex to fill
  * @param x the x coordinate
  * @param y the y coordinate
- * @param z the z coortinate
+ * @param z the z coordinate
  * @param n pointer to the normal table
  *
  * @return the operation error code

demos/gtk-demo/headerbar.c

@@ -2,9 +2,8 @@
  *
  * GtkHeaderBar is a container that is suitable for implementing
  * window titlebars. One of its features is that it can position
- * a title (and optional subtitle) centered with regard to the
- * full width, regardless of variable-width content at the left
- * or right.
+ * a title centered with regard to the full width, regardless of
+ * variable-width content at the left or right.
  *
  * It is commonly used with gtk_window_set_titlebar()
  */
@@ -23,44 +22,43 @@ do_headerbar (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_title (GTK_WINDOW (window), "Welcome to Facebook - Log in, sign up or learn more");
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
 
       header = gtk_header_bar_new ();
       gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Welcome to Facebook - Log in, sign up or learn more");
-      gtk_header_bar_set_has_subtitle (GTK_HEADER_BAR (header), FALSE);
 
       button = gtk_button_new ();
       icon = g_themed_icon_new ("mail-send-receive-symbolic");
       image = gtk_image_new_from_gicon (icon);
       g_object_unref (icon);
-      gtk_container_add (GTK_CONTAINER (button), image);
+      gtk_button_set_child (GTK_BUTTON (button), image);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked");
+      gtk_widget_add_css_class (box, "linked");
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
+      gtk_box_append (GTK_BOX (box), button);
       button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
-      gtk_container_add (GTK_CONTAINER (box), button);
+      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
+      gtk_box_append (GTK_BOX (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);
 
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
 
-      gtk_container_add (GTK_CONTAINER (window), gtk_text_view_new ());
+      gtk_window_set_child (GTK_WINDOW (window), gtk_text_view_new ());
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/help-overlay.ui

@@ -0,0 +1,25 @@
+<interface>
+  <object class="GtkShortcutsWindow" id="help_overlay">
+    <child>
+      <object class="GtkShortcutsSection">
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="title">General</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="accelerator">F1</property>
+                <property name="title">Show About Dialog</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="accelerator">&lt;Control&gt;q</property>
+                <property name="title">Quit</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

demos/gtk-demo/hypertext.c

@@ -17,7 +17,7 @@
 static void
 insert_link (GtkTextBuffer *buffer,
              GtkTextIter   *iter,
-             gchar         *text,
+             const char    *text,
              gint           page)
 {
   GtkTextTag *tag;
@@ -232,14 +232,12 @@ do_hypertext (GtkWidget *do_widget)
       GtkTextBuffer *buffer;
       GtkEventController *controller;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -262,12 +260,12 @@ do_hypertext (GtkWidget *do_widget)
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
       gtk_text_buffer_set_enable_undo (buffer, TRUE);
 
-      sw = gtk_scrolled_window_new (NULL, NULL);
+      sw = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (window), sw);
-      gtk_container_add (GTK_CONTAINER (sw), view);
+      gtk_window_set_child (GTK_WINDOW (window), sw);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
 
       show_page (buffer, 1);
     }
@@ -275,7 +273,7 @@ do_hypertext (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/iconscroll.c

@@ -12,7 +12,7 @@ static GtkWidget *window = NULL;
 static GtkWidget *scrolledwindow;
 static int selected;
 
-#define N_WIDGET_TYPES 4
+#define N_WIDGET_TYPES 6
 
 
 static int hincrement = 5;
@@ -52,7 +52,10 @@ populate_icons (void)
 
   grid = gtk_grid_new ();
   gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
-  g_object_set (grid, "margin", 10, NULL);
+  gtk_widget_set_margin_start (grid, 10);
+  gtk_widget_set_margin_end (grid, 10);
+  gtk_widget_set_margin_top (grid, 10);
+  gtk_widget_set_margin_bottom (grid, 10);
   gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
 
@@ -61,11 +64,12 @@ populate_icons (void)
       gtk_grid_attach (GTK_GRID (grid), create_icon (), left, top, 1, 1);
 
   hincrement = 0;
+  vincrement = 5;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_NEVER,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), grid);
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), grid);
 }
 
 static char *content;
@@ -97,11 +101,12 @@ populate_text (gboolean hilight)
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
 
   hincrement = 0;
+  vincrement = 5;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_NEVER,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), textview);
+                                  GTK_POLICY_NEVER,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), textview);
 }
 
 static void
@@ -121,11 +126,48 @@ populate_image (void)
   gtk_picture_set_can_shrink (GTK_PICTURE (image), FALSE);
 
   hincrement = 5;
+  vincrement = 5;
 
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-		                  GTK_POLICY_AUTOMATIC,
-		                  GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (scrolledwindow), image);
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), image);
+}
+
+extern GtkWidget *create_weather_view (void);
+
+static void
+populate_list (void)
+{
+  GtkWidget *list;
+
+  list = create_weather_view ();
+
+  hincrement = 5;
+  vincrement = 0;
+
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), list);
+}
+
+extern GtkWidget *create_color_grid (void);
+
+static void
+populate_grid (void)
+{
+  GtkWidget *list;
+
+  list = create_color_grid ();
+
+  hincrement = 0;
+  vincrement = 5;
+
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), list);
 }
 
 static void
@@ -134,9 +176,8 @@ set_widget_type (int type)
   if (tick_cb)
     gtk_widget_remove_tick_callback (window, tick_cb);
 
-  if (gtk_bin_get_child (GTK_BIN (scrolledwindow)))
-    gtk_container_remove (GTK_CONTAINER (scrolledwindow),
-                          gtk_bin_get_child (GTK_BIN (scrolledwindow)));
+  if (gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (scrolledwindow)))
+    gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), NULL);
 
   selected = type;
 
@@ -162,6 +203,16 @@ set_widget_type (int type)
       populate_image ();
       break;
 
+    case 4:
+      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a list");
+      populate_list ();
+      break;
+
+    case 5:
+      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a grid");
+      populate_grid ();
+      break;
+
     default:
       g_assert_not_reached ();
     }
@@ -207,23 +258,23 @@ do_iconscroll (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+
       scrolledwindow = GTK_WIDGET (gtk_builder_get_object (builder, "scrolledwindow"));
       gtk_widget_realize (window);
       hadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "hadjustment"));
       vadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "vadjustment"));
       set_widget_type (0);
+
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/iconview.c

@@ -228,7 +228,7 @@ home_clicked (GtkButton *item,
 
 static void close_window(void)
 {
-  gtk_widget_destroy (window);
+  gtk_window_destroy (GTK_WINDOW (window));
   window = NULL;
 
   g_object_unref (file_pixbuf);
@@ -250,7 +250,7 @@ do_iconview (GtkWidget *do_widget)
       GtkWidget *tool_bar;
       GtkWidget *home_button;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
       gtk_window_set_display (GTK_WINDOW (window),
@@ -263,28 +263,27 @@ do_iconview (GtkWidget *do_widget)
       load_pixbufs ();
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       tool_bar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_container_add (GTK_CONTAINER (vbox), tool_bar);
+      gtk_box_append (GTK_BOX (vbox), tool_bar);
 
       up_button = gtk_button_new_with_mnemonic ("_Up");
       gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-      gtk_container_add (GTK_CONTAINER (tool_bar), up_button);
+      gtk_box_append (GTK_BOX (tool_bar), up_button);
 
       home_button = gtk_button_new_with_mnemonic ("_Home");
-      gtk_container_add (GTK_CONTAINER (tool_bar), home_button);
+      gtk_box_append (GTK_BOX (tool_bar), home_button);
 
 
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+      sw = gtk_scrolled_window_new ();
+      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
       gtk_widget_set_vexpand (sw, TRUE);
 
-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_append (GTK_BOX (vbox), sw);
 
       /* Create the store and fill it with the contents of '/' */
       parent = g_strdup ("/");
@@ -313,7 +312,7 @@ do_iconview (GtkWidget *do_widget)
       /* Connect to the "item-activated" signal */
       g_signal_connect (icon_view, "item-activated",
                         G_CALLBACK (item_activated), store);
-      gtk_container_add (GTK_CONTAINER (sw), icon_view);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), icon_view);
 
       gtk_widget_grab_focus (icon_view);
     }
@@ -321,7 +320,7 @@ do_iconview (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/iconview_edit.c

@@ -106,14 +106,12 @@ do_iconview_edit (GtkWidget *do_widget)
       GtkListStore *store;
       GtkCellRenderer *renderer;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       store = create_store ();
       fill_store (store);
@@ -146,13 +144,13 @@ do_iconview_edit (GtkWidget *do_widget)
                                       "text", COL_TEXT,
                                       NULL);
 
-      gtk_container_add (GTK_CONTAINER (window), icon_view);
+      gtk_window_set_child (GTK_WINDOW (window), icon_view);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/images.c

@@ -91,7 +91,7 @@ progressive_timeout (gpointer data)
           g_error_free (error);
 
           g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+                            G_CALLBACK (gtk_window_destroy), NULL);
 
           g_object_unref (image_stream);
           image_stream = NULL;
@@ -119,7 +119,7 @@ progressive_timeout (gpointer data)
           g_error_free (error);
 
           g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+                            G_CALLBACK (gtk_window_destroy), NULL);
 
           g_object_unref (image_stream);
           image_stream = NULL;
@@ -152,7 +152,7 @@ progressive_timeout (gpointer data)
               g_error_free (error);
 
               g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_widget_destroy), NULL);
+                                G_CALLBACK (gtk_window_destroy), NULL);
 
               gtk_widget_show (dialog);
 
@@ -189,7 +189,7 @@ progressive_timeout (gpointer data)
               g_error_free (error);
 
               g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_widget_destroy), NULL);
+                                G_CALLBACK (gtk_window_destroy), NULL);
 
               gtk_widget_show (dialog);
 
@@ -223,7 +223,7 @@ progressive_timeout (gpointer data)
           g_error_free (error);
 
           g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_widget_destroy), NULL);
+                            G_CALLBACK (gtk_window_destroy), NULL);
 
           gtk_widget_show (dialog);
 
@@ -293,24 +293,16 @@ static void
 toggle_sensitivity_callback (GtkWidget *togglebutton,
                              gpointer   user_data)
 {
-  GtkContainer *container = user_data;
-  GList *list;
-  GList *tmp;
+  GtkWidget *child;
 
-  list = gtk_container_get_children (container);
-
-  tmp = list;
-  while (tmp != NULL)
+  for (child = gtk_widget_get_first_child (GTK_WIDGET (user_data));
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
     {
       /* don't disable our toggle */
-      if (GTK_WIDGET (tmp->data) != togglebutton)
-        gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
-                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
-
-      tmp = tmp->next;
+      if (child != togglebutton)
+        gtk_widget_set_sensitive (child, !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
     }
-
-  g_list_free (list);
 }
 
 
@@ -331,41 +323,42 @@ do_images (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Images");
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (cleanup_callback), NULL);
 
       base_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (base_vbox, "margin", 16, NULL);
-      gtk_container_add (GTK_CONTAINER (window), base_vbox);
+      gtk_widget_set_margin_start (base_vbox, 16);
+      gtk_widget_set_margin_end (base_vbox, 16);
+      gtk_widget_set_margin_top (base_vbox, 16);
+      gtk_widget_set_margin_bottom (base_vbox, 16);
+      gtk_window_set_child (GTK_WINDOW (window), base_vbox);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
-      gtk_container_add (GTK_CONTAINER (base_vbox), hbox);
+      gtk_box_append (GTK_BOX (base_vbox), hbox);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      gtk_box_append (GTK_BOX (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Image loaded from a file</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_append (GTK_BOX (vbox), frame);
 
       image = gtk_image_new_from_icon_name ("gtk3-demo");
       gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
 
-      gtk_container_add (GTK_CONTAINER (frame), image);
+      gtk_frame_set_child (GTK_FRAME (frame), image);
 
 
       /* Animation */
@@ -373,98 +366,94 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Animation loaded from a file</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_append (GTK_BOX (vbox), frame);
 
       picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");
 
-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      gtk_frame_set_child (GTK_FRAME (frame), picture);
 
       /* Symbolic icon */
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Symbolic themed icon</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_append (GTK_BOX (vbox), frame);
 
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon);
       gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
 
-      gtk_container_add (GTK_CONTAINER (frame), image);
+      gtk_frame_set_child (GTK_FRAME (frame), image);
 
 
       /* Progressive */
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      gtk_box_append (GTK_BOX (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Progressive image loading</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_append (GTK_BOX (vbox), frame);
 
       /* Create an empty image for now; the progressive loader
        * will create the pixbuf and fill it in.
        */
       picture = gtk_picture_new ();
-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      gtk_frame_set_child (GTK_FRAME (frame), picture);
 
       start_progressive_loading (picture);
 
       /* Video */
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      gtk_box_append (GTK_BOX (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Displaying video</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_append (GTK_BOX (vbox), frame);
 
       video = gtk_video_new_for_resource ("/images/gtk-logo.webm");
       gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE);
-      gtk_container_add (GTK_CONTAINER (frame), video);
+      gtk_frame_set_child (GTK_FRAME (frame), video);
 
       /* Widget paintables */
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox);
+      gtk_box_append (GTK_BOX (hbox), vbox);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>GtkWidgetPaintable</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
       paintable = gtk_widget_paintable_new (do_widget);
       picture = gtk_picture_new_for_paintable (paintable);
       gtk_widget_set_size_request (picture, 100, 100);
       gtk_widget_set_valign (picture, GTK_ALIGN_START);
-      gtk_container_add (GTK_CONTAINER (vbox), picture);
+      gtk_box_append (GTK_BOX (vbox), picture);
 
       /* Sensitivity control */
       button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_container_add (GTK_CONTAINER (base_vbox), button);
+      gtk_box_append (GTK_BOX (base_vbox), button);
 
       g_signal_connect (button, "toggled",
                         G_CALLBACK (toggle_sensitivity_callback),
@@ -474,7 +463,7 @@ do_images (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/infobar.c

@@ -29,10 +29,8 @@ on_bar_response (GtkInfoBar *info_bar,
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                             "Your response has id %d", response_id);
 
-  g_signal_connect_swapped (dialog,
-                            "response",
-                            G_CALLBACK (gtk_widget_destroy),
-                            dialog);
+  g_signal_connect_swapped (dialog, "response",
+                            G_CALLBACK (gtk_window_destroy), dialog);
 
   gtk_widget_show (dialog);
 }
@@ -44,7 +42,6 @@ do_infobar (GtkWidget *do_widget)
   GtkWidget *frame;
   GtkWidget *bar;
   GtkWidget *vbox;
-  GtkWidget *vbox2;
   GtkWidget *label;
   GtkWidget *actions;
   GtkWidget *button;
@@ -52,102 +49,104 @@ do_infobar (GtkWidget *do_widget)
   if (!window)
     {
       actions = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+      gtk_widget_add_css_class (actions, "linked");
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
-
-      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      g_object_set (vbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 8);
+      gtk_widget_set_margin_end (vbox, 8);
+      gtk_widget_set_margin_top (vbox, 8);
+      gtk_widget_set_margin_bottom (vbox, 8);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
 
       button = gtk_toggle_button_new_with_label ("Message");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
 
       button = gtk_toggle_button_new_with_label ("Warning");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);
 
       bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
       gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
       g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
       gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK);
 
       button = gtk_toggle_button_new_with_label ("Question");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
 
       button = gtk_toggle_button_new_with_label ("Error");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
 
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_append (GTK_BOX (vbox), bar);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
       gtk_label_set_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);
+      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
 
       button = gtk_toggle_button_new_with_label ("Other");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_container_add (GTK_CONTAINER (actions), button);
+      gtk_box_append (GTK_BOX (actions), button);
 
-      frame = gtk_frame_new ("Info bars");
+      frame = gtk_frame_new ("An example of different info bars");
       gtk_widget_set_margin_top (frame, 8);
       gtk_widget_set_margin_bottom (frame, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_append (GTK_BOX (vbox), frame);
 
-      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox2, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (frame), vbox2);
+      gtk_widget_set_halign (actions, GTK_ALIGN_CENTER);
 
-      /* Standard message dialog */
-      label = gtk_label_new ("An example of different info bars");
-      gtk_container_add (GTK_CONTAINER (vbox2), label);
-
-      gtk_container_add (GTK_CONTAINER (vbox2), actions);
+      gtk_widget_set_margin_start (actions, 8);
+      gtk_widget_set_margin_end (actions, 8);
+      gtk_widget_set_margin_top (actions, 8);
+      gtk_widget_set_margin_bottom (actions, 8);
+      gtk_frame_set_child (GTK_FRAME (frame), actions);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/links.c

@@ -1,7 +1,7 @@
 /* Links
  *
  * GtkLabel can show hyperlinks. The default action is to call
- * gtk_show_uri_on_window() on their URI, but it is possible to override
+ * gtk_show_uri() on their URI, but it is possible to override
  * this with a custom handler.
  */
 
@@ -12,7 +12,7 @@ response_cb (GtkWidget *dialog,
              gint       response_id,
              gpointer   data)
 {
-  gtk_widget_destroy (dialog);
+  gtk_window_destroy (GTK_WINDOW (dialog));
 }
 
 static gboolean
@@ -30,6 +30,8 @@ activate_link (GtkWidget   *label,
                  GTK_DIALOG_DESTROY_WITH_PARENT,
                  GTK_MESSAGE_INFO,
                  GTK_BUTTONS_OK,
+                 "Keyboard navigation");
+      gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
                  "The term <i>keynav</i> is a shorthand for "
                  "keyboard navigation and refers to the process of using "
                  "a program (exclusively) via keyboard input.");
@@ -52,33 +54,40 @@ do_links (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Links");
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
-                             "title=\"plain text\">text</a> may be marked up\n"
-                             "as hyperlinks, which can be clicked\n"
-                             "or activated via <a href=\"keynav\">keynav</a>\n"
-                             "and they work fine with other markup, like when\n"
+                             "title=\"plain text\">text</a> may be marked up "
+                             "as hyperlinks, which can be clicked "
+                             "or activated via <a href=\"keynav\">keynav</a> "
+                             "and they work fine with other markup, like when "
                              "searching on <a href=\"http://www.google.com/\">"
                              "<span color=\"#0266C8\">G</span><span color=\"#F90101\">o</span>"
                              "<span color=\"#F2B50F\">o</span><span color=\"#0266C8\">g</span>"
                              "<span color=\"#00933B\">l</span><span color=\"#F90101\">e</span>"
                              "</a>.");
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+      gtk_label_set_max_width_chars (GTK_LABEL (label), 40);
+      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
+      gtk_label_set_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD);
       g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
-      gtk_container_add (GTK_CONTAINER (window), label);
+      gtk_widget_set_margin_start (label, 20);
+      gtk_widget_set_margin_end (label, 20);
+      gtk_widget_set_margin_top (label, 20);
+      gtk_widget_set_margin_bottom (label, 20);
+      gtk_window_set_child (GTK_WINDOW (window), label);
       gtk_widget_show (label);
     }
 
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/list_store.c

@@ -16,10 +16,9 @@ typedef struct
 {
   const gboolean  fixed;
   const guint     number;
-  const gchar    *severity;
-  const gchar    *description;
-}
-Bug;
+  const char     *severity;
+  const char     *description;
+} Bug;
 
 enum
 {
@@ -34,7 +33,7 @@ enum
   NUM_COLUMNS
 };
 
-static Bug data[] =
+static Bug bugs[] =
 {
   { FALSE, 60482, "Normal",     "scrollable notebooks and hidden tabs" },
   { FALSE, 60620, "Critical",   "gdk_surface_clear_area (gdksurface-win32.c) is not thread-safe" },
@@ -98,9 +97,9 @@ create_model (void)
                               G_TYPE_BOOLEAN);
 
   /* add data to the list store */
-  for (i = 0; i < G_N_ELEMENTS (data); i++)
+  for (i = 0; i < G_N_ELEMENTS (bugs); i++)
     {
-      gchar *icon_name;
+      const char *icon_name;
       gboolean sensitive;
 
       if (i == 1 || i == 3)
@@ -113,10 +112,10 @@ create_model (void)
         sensitive = TRUE;
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-                          COLUMN_FIXED, data[i].fixed,
-                          COLUMN_NUMBER, data[i].number,
-                          COLUMN_SEVERITY, data[i].severity,
-                          COLUMN_DESCRIPTION, data[i].description,
+                          COLUMN_FIXED, bugs[i].fixed,
+                          COLUMN_NUMBER, bugs[i].number,
+                          COLUMN_SEVERITY, bugs[i].severity,
+                          COLUMN_DESCRIPTION, bugs[i].description,
                           COLUMN_PULSE, 0,
                           COLUMN_ICON, icon_name,
                           COLUMN_ACTIVE, FALSE,
@@ -129,23 +128,23 @@ create_model (void)
 
 static void
 fixed_toggled (GtkCellRendererToggle *cell,
-               gchar                 *path_str,
+               char                  *path_str,
                gpointer               data)
 {
-  GtkTreeModel *model = (GtkTreeModel *)data;
+  GtkTreeModel *tree_model = (GtkTreeModel *)data;
   GtkTreeIter  iter;
   GtkTreePath *path = gtk_tree_path_new_from_string (path_str);
   gboolean fixed;
 
   /* get toggled iter */
-  gtk_tree_model_get_iter (model, &iter, path);
-  gtk_tree_model_get (model, &iter, COLUMN_FIXED, &fixed, -1);
+  gtk_tree_model_get_iter (tree_model, &iter, path);
+  gtk_tree_model_get (tree_model, &iter, COLUMN_FIXED, &fixed, -1);
 
   /* do something with the value */
   fixed ^= 1;
 
   /* set new value */
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_FIXED, fixed, -1);
+  gtk_list_store_set (GTK_LIST_STORE (tree_model), &iter, COLUMN_FIXED, fixed, -1);
 
   /* clean up */
   gtk_tree_path_free (path);
@@ -156,7 +155,6 @@ add_columns (GtkTreeView *treeview)
 {
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
-  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
 
   /* column for fixed toggles */
   renderer = gtk_cell_renderer_toggle_new ();
@@ -255,28 +253,28 @@ do_list_store (GtkWidget *do_widget)
       GtkWidget *treeview;
 
       /* create window, etc */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Store");
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_widget_set_margin_start (vbox, 8);
+      gtk_widget_set_margin_end (vbox, 8);
+      gtk_widget_set_margin_top (vbox, 8);
+      gtk_widget_set_margin_bottom (vbox, 8);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_append (GTK_BOX (vbox), label);
 
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+      sw = gtk_scrolled_window_new ();
+      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_append (GTK_BOX (vbox), sw);
 
       /* create tree model */
       model = create_model ();
@@ -289,7 +287,7 @@ do_list_store (GtkWidget *do_widget)
 
       g_object_unref (model);
 
-      gtk_container_add (GTK_CONTAINER (sw), treeview);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
 
       /* add columns to the tree view */
       add_columns (GTK_TREE_VIEW (treeview));
@@ -309,7 +307,7 @@ do_list_store (GtkWidget *do_widget)
     }
   else
     {
-      gtk_widget_destroy (window);
+      gtk_window_destroy (GTK_WINDOW (window));
       window = NULL;
       if (timeout != 0)
         {

demos/gtk-demo/listbox.c

@@ -236,7 +236,6 @@ reshare_clicked (GtkMessageRow *row,
 
   priv->message->n_reshares++;
   gtk_message_row_update (row);
-
 }
 
 static void
@@ -255,11 +254,12 @@ gtk_message_row_state_flags_changed (GtkWidget    *widget,
 {
   GtkMessageRowPrivate *priv = GTK_MESSAGE_ROW (widget)->priv;
   GtkStateFlags flags;
+  gboolean visible;
 
   flags = gtk_widget_get_state_flags (widget);
 
-  gtk_widget_set_visible (priv->extra_buttons_box,
-                          flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED));
+  visible = flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED) ? TRUE : FALSE;
+  gtk_widget_set_visible (priv->extra_buttons_box, visible);
 
   GTK_WIDGET_CLASS (gtk_message_row_parent_class)->state_flags_changed (widget, previous_state_flags);
 }
@@ -347,28 +347,23 @@ do_listbox (GtkWidget *do_widget)
     {
       avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE, NULL);
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Box");
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   400, 600);
-
-      /* NULL window variable when window is closed */
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &window);
+      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-      gtk_container_add (GTK_CONTAINER (window), vbox);
+      gtk_window_set_child (GTK_WINDOW (window), vbox);
       label = gtk_label_new ("Messages from GTK and friends");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
-      scrolled = gtk_scrolled_window_new (NULL, NULL);
+      gtk_box_append (GTK_BOX (vbox), label);
+      scrolled = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
       gtk_widget_set_vexpand (scrolled, TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), scrolled);
+      gtk_box_append (GTK_BOX (vbox), scrolled);
       listbox = gtk_list_box_new ();
-      gtk_container_add (GTK_CONTAINER (scrolled), listbox);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), listbox);
 
       gtk_list_box_set_sort_func (GTK_LIST_BOX (listbox), (GtkListBoxSortFunc)gtk_message_row_sort, listbox, NULL);
       gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (listbox), FALSE);
@@ -382,7 +377,7 @@ do_listbox (GtkWidget *do_widget)
           message = gtk_message_new (lines[i]);
           row = gtk_message_row_new (message);
           gtk_widget_show (GTK_WIDGET (row));
-          gtk_container_add (GTK_CONTAINER (listbox), GTK_WIDGET (row));
+          gtk_list_box_insert (GTK_LIST_BOX (listbox), GTK_WIDGET (row), -1);
         }
 
       g_strfreev (lines);
@@ -392,7 +387,7 @@ do_listbox (GtkWidget *do_widget)
   if (!gtk_widget_get_visible (window))
     gtk_widget_show (window);
   else
-    gtk_widget_destroy (window);
+    gtk_window_destroy (GTK_WINDOW (window));
 
   return window;
 }

demos/gtk-demo/listbox.ui

@@ -38,10 +38,9 @@
             <property name="baseline-position">top</property>
             <child>
               <object class="GtkButton" id="button2">
-                <property name="can-focus">1</property>
                 <property name="receives-default">1</property>
                 <property name="valign">baseline</property>
-                <property name="relief">none</property>
+                <property name="has-frame">0</property>
                 <child>
                   <object class="GtkLabel" id="source_name">
                     <property name="valign">baseline</property>
@@ -109,9 +108,8 @@
             <child>
               <object class="GtkLinkButton" id="resent_by_button">
                 <property name="label" translatable="0">reshareer</property>
-                <property name="can-focus">1</property>
                 <property name="receives-default">1</property>
-                <property name="relief">none</property>
+                <property name="has-frame">0</property>
                 <property name="uri">http://www.gtk.org</property>
               </object>
             </child>
@@ -127,9 +125,8 @@
             <child>
               <object class="GtkButton" id="expand_button">
                 <property name="label" translatable="yes">Expand</property>
-                <property name="can-focus">1</property>
                 <property name="receives-default">1</property>
-                <property name="relief">none</property>
+                <property name="has-frame">0</property>
                 <signal name="clicked" handler="expand_clicked" swapped="yes"/>
               </object>
             </child>
@@ -140,35 +137,31 @@
                 <child>
                   <object class="GtkButton" id="reply-button">
                     <property name="label" translatable="yes">Reply</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="relief">none</property>
+                    <property name="has-frame">0</property>
                   </object>
                 </child>
                 <child>
                   <object class="GtkButton" id="reshare-button">
                     <property name="label" translatable="yes">Reshare</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="relief">none</property>
+                    <property name="has-frame">0</property>
                     <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkButton" id="favorite-buttton">
+                  <object class="GtkButton" id="favorite-button">
                     <property name="label" translatable="yes">Favorite</property>
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
-                    <property name="relief">none</property>
+                    <property name="has-frame">0</property>
                     <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
                   </object>
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="more-button">
-                    <property name="can-focus">1</property>
                     <property name="receives-default">1</property>
                     <property name="menu-model">menu1</property>
-                    <property name="relief">none</property>
+                    <property name="has-frame">0</property>
                     <property name="label" translatable="yes">More...</property>
                   </object>
                 </child>
@@ -192,7 +185,6 @@
                     <property name="spacing">8</property>
                     <child>
                       <object class="GtkFrame" id="frame1">
-                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkLabel" id="n_reshares_label">
                             <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
@@ -205,7 +197,6 @@ Reshares</property>
                     </child>
                     <child>
                       <object class="GtkFrame" id="frame2">
-                        <property name="shadow-type">none</property>
                         <child>
                           <object class="GtkLabel" id="n_favorites_label">
                             <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
@@ -231,9 +222,8 @@ FAVORITES</property>
                     <child>
                       <object class="GtkButton" id="button5">
                         <property name="label" translatable="yes">Details</property>
-                        <property name="can-focus">1</property>
                         <property name="receives-default">1</property>
-                        <property name="relief">none</property>
+                        <property name="has-frame">0</property>
                         <style>
                           <class name="dim-label"/>
                         </style>

demos/gtk-demo/listview_applauncher.c

@@ -0,0 +1,202 @@
+/* Lists/Application launcher
+ *
+ * This demo uses the GtkListView widget as a fancy application launcher.
+ *
+ * It is also a very small introduction to listviews.
+ */
+
+#include <gtk/gtk.h>
+
+/* This is the function that creates the #GListModel that we need.
+ * GTK list widgets need a #GListModel to display, as models support change
+ * notifications.
+ * Unfortunately various older APIs do not provide list models, so we create
+ * our own.
+ */
+static GListModel *
+create_application_list (void)
+{
+  GListStore *store;
+  GList *apps, *l;
+
+  /* We use a #GListStore here, which is a simple array-like list implementation
+   * for manual management.
+   * List models need to know what type of data they provide, so we need to
+   * provide the type here. As we want to do a list of applications, #GAppInfo
+   * is the object we provide.
+   */
+  store = g_list_store_new (G_TYPE_APP_INFO);
+
+  apps = g_app_info_get_all ();
+
+  for (l = apps; l; l = l->next)
+    g_list_store_append (store, l->data);
+
+  g_list_free_full (apps, g_object_unref);
+
+  return G_LIST_MODEL (store);
+}
+
+/* This is the function we use for setting up new listitems to display.
+ * We add just an #GtkImage and a #GtkKabel here to display the application's
+ * icon and name, as this is just a simple demo.
+ */
+static void
+setup_listitem_cb (GtkListItemFactory *factory,
+                   GtkListItem        *list_item)
+{
+  GtkWidget *box;
+  GtkWidget *image;
+  GtkWidget *label;
+
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  image = gtk_image_new ();
+  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+  gtk_box_append (GTK_BOX (box), image);
+  label = gtk_label_new ("");
+  gtk_box_append (GTK_BOX (box), label);
+  gtk_list_item_set_child (list_item, box);
+}
+
+/* Here we need to prepare the listitem for displaying its item. We get the
+ * listitem already set up from the previous function, so we can reuse the
+ * #GtkImage widget we set up above.
+ * We get the item - which we know is a #GAppInfo because it comes out of
+ * the model we set up above, grab its icon and display it.
+ */
+static void
+bind_listitem_cb (GtkListItemFactory *factory,
+                  GtkListItem        *list_item)
+{
+  GtkWidget *image;
+  GtkWidget *label;
+  GAppInfo *app_info;
+
+  image = gtk_widget_get_first_child (gtk_list_item_get_child (list_item));
+  label = gtk_widget_get_next_sibling (image);
+  app_info = gtk_list_item_get_item (list_item);
+
+  gtk_image_set_from_gicon (GTK_IMAGE (image), g_app_info_get_icon (app_info));
+  gtk_label_set_label (GTK_LABEL (label), g_app_info_get_display_name (app_info));
+}
+
+/* In more complex code, we would also need functions to unbind and teardown
+ * the listitem, but this is simple code, so the default implementations are
+ * enough. If we had connected signals, this step would have been necessary.
+ *
+ * The #GtkSignalListItemFactory documentation contains more information about
+ * this step.
+ */
+
+/* This function is called whenever an item in the list is activated. This is
+ * the simple way to allow reacting to the Enter key or double-clicking on a
+ * listitem.
+ * Of course, it is possible to use far more complex interactions by turning
+ * off activation and adding buttons or other widgets in the setup function
+ * above, but this is a simple demo, so we'll use the simple way.
+ */
+static void
+activate_cb (GtkListView  *list,
+             guint         position,
+             gpointer      unused)
+{
+  GAppInfo *app_info;
+  GdkAppLaunchContext *context;
+  GError *error = NULL;
+
+  app_info = g_list_model_get_item (gtk_list_view_get_model (list), position);
+
+  /* Prepare the context for launching the application and launch it. This
+   * code is explained in detail in the documentation for #GdkAppLaunchContext
+   * and #GAppInfo.
+   */
+  context = gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (list)));
+  if (!g_app_info_launch (app_info,
+                          NULL,
+                          G_APP_LAUNCH_CONTEXT (context),
+                          &error))
+    {
+      GtkWidget *dialog;
+
+      /* And because error handling is important, even a simple demo has it:
+       * We display an error dialog that something went wrong.
+       */
+      dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (list))),
+                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+                                       GTK_MESSAGE_ERROR,
+                                       GTK_BUTTONS_CLOSE,
+                                       "Could not launch %s", g_app_info_get_display_name (app_info));
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
+      g_clear_error (&error);
+      gtk_widget_show (dialog);
+    }
+
+  g_object_unref (context);
+  g_object_unref (app_info);
+}
+
+static GtkWidget *window = NULL;
+
+GtkWidget *
+do_listview_applauncher (GtkWidget *do_widget)
+{
+  if (window == NULL)
+    {
+      GtkWidget *list, *sw;
+      GListModel *model;
+      GtkListItemFactory *factory;
+
+      /* Create a window and set a few defaults */
+      window = gtk_window_new ();
+      gtk_window_set_default_size (GTK_WINDOW (window), 640, 320);
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Application Launcher");
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
+
+      /* The #GtkListitemFactory is what is used to create #GtkListItems
+       * to display the data from the model. So it is absolutely necessary
+       * to create one.
+       * We will use a #GtkSignalListItemFactory because it is the simplest
+       * one to use. Different ones are available for different use cases.
+       * The most powerful one is #GtkBuilderListItemFactory which uses
+       * #GtkBuilder .ui files, so it requires little code.
+       */
+      factory = gtk_signal_list_item_factory_new ();
+      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
+      g_signal_connect (factory, "bind", G_CALLBACK (bind_listitem_cb), NULL);
+
+      /* Create the list widget here.
+       */
+      list = gtk_list_view_new_with_factory (factory);
+      /* We connect the activate signal here. It's the function we defined
+       * above for launching the selected application.
+       */
+      g_signal_connect (list, "activate", G_CALLBACK (activate_cb), NULL);
+
+      /* And of course we need to set the data model. Here we call the function
+       * we wrote above that gives us the list of applications. Then we set
+       * it on the list widget.
+       * The list will now take items from the model and use the factory
+       * to create as many listitems as it needs to show itself to the user.
+       */
+      model = create_application_list ();
+      gtk_list_view_set_model (GTK_LIST_VIEW (list), model);
+      g_object_unref (model);
+
+      /* List widgets should always be contained in a #GtkScrolledWindow,
+       * because otherwise they might get too large or they might not
+       * be scrollable.
+       */
+      sw = gtk_scrolled_window_new ();
+      gtk_window_set_child (GTK_WINDOW (window), sw);
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/listview_clocks.c

@@ -0,0 +1,506 @@
+/* Lists/Clocks
+ *
+ * This demo displays the time in different timezones.
+ *
+ * The goal is to show how to set up expressions that track changes
+ * in objects and make them update widgets. For that, we create a
+ * GtkClock object that updates its time every second and then use
+ * various ways to display that time.
+ *
+ * Typically, this will be done using GtkBuilder .ui files with the
+ * help of the <binding> tag, but this demo shows the code that runs
+ * behind that.
+ */
+
+#include <gtk/gtk.h>
+
+#define GTK_TYPE_CLOCK (gtk_clock_get_type ())
+G_DECLARE_FINAL_TYPE (GtkClock, gtk_clock, GTK, CLOCK, GObject)
+
+/* This is our object. It's just a timezone */
+typedef struct _GtkClock GtkClock;
+struct _GtkClock
+{
+  GObject parent_instance;
+
+  /* We allow this to be NULL for the local timezone */
+  GTimeZone *timezone;
+  /* Name of the location we're displaying time for */
+  char *location;
+};
+
+enum {
+  PROP_0,
+  PROP_LOCATION,
+  PROP_TIME,
+  PROP_TIMEZONE,
+
+  N_PROPS
+};
+
+/* This function returns the current time in the clock's timezone.
+ * Note that this returns a new object every time, so we need to
+ * remember to unref it after use.
+ */
+static GDateTime *
+gtk_clock_get_time (GtkClock *clock)
+{
+  if (clock->timezone)
+    return g_date_time_new_now (clock->timezone);
+  else
+    return g_date_time_new_now_local ();
+}
+
+/* Here, we implement the functionality required by the GdkPaintable
+ * interface. This way we have a trivial way to display an analog clock.
+ * It also allows demonstrating how to directly use objects in the
+ * listview later by making this object do something interesting.
+ */
+static void
+gtk_clock_snapshot (GdkPaintable *paintable,
+                    GdkSnapshot  *snapshot,
+                    double        width,
+                    double        height)
+{
+  GtkClock *self = GTK_CLOCK (paintable);
+  GDateTime *time;
+  GskRoundedRect outline;
+
+#define BLACK ((GdkRGBA) { 0, 0, 0, 1 })
+
+  /* save/restore() is necessary so we can undo the transforms we start
+   * out with.
+   */
+  gtk_snapshot_save (snapshot);
+
+  /* First, we move the (0, 0) point to the center of the area so
+   * we can draw everything relative to it.
+   */
+  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2, height / 2));
+
+  /* Next we scale it, so that we can pretend that the clock is
+   * 100px in size. That way, we don't need to do any complicated
+   * math later. We use MIN() here so that we use the smaller
+   * dimension for sizing. That way we don't overdraw but keep
+   * the aspect ratio.
+   */
+  gtk_snapshot_scale (snapshot, MIN (width, height) / 100.0, MIN (width, height) / 100.0);
+
+  /* Now we have a circle with diameter 100px (and radius 50px) that
+   * has its (0, 0) point at the center. Let's draw a simple clock into it.
+   */
+  time = gtk_clock_get_time (self);
+
+  /* First, draw a circle. This is a neat little trick to draw a circle
+   * without requiring Cairo.
+   */
+  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-50, -50, 100, 100), 50);
+  gtk_snapshot_append_border (snapshot,
+                              &outline,
+                              (float[4]) { 4, 4, 4, 4 },
+                              (GdkRGBA [4]) { BLACK, BLACK, BLACK, BLACK });
+
+  /* Next, draw the hour hand.
+   * We do this using tranforms again: Instead of computing where the angle
+   * points to, we just rotate everything and then draw the hand as if it
+   * was :00. We don't even need to care about am/pm here because rotations
+   * just work.
+   */
+  gtk_snapshot_save (snapshot);
+  gtk_snapshot_rotate (snapshot, 30 * g_date_time_get_hour (time) + 0.5 * g_date_time_get_minute (time));
+  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -23, 4, 25), 2);
+  gtk_snapshot_push_rounded_clip (snapshot, &outline);
+  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
+  gtk_snapshot_pop (snapshot);
+  gtk_snapshot_restore (snapshot);
+
+  /* And the same as above for the minute hand. Just make this one longer
+   * so people can tell the hands apart.
+   */
+  gtk_snapshot_save (snapshot);
+  gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_minute (time));
+  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 45), 2);
+  gtk_snapshot_push_rounded_clip (snapshot, &outline);
+  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
+  gtk_snapshot_pop (snapshot);
+  gtk_snapshot_restore (snapshot);
+
+  /* and finally, the second indicator. */
+  gtk_snapshot_save (snapshot);
+  gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_second (time));
+  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 10), 2);
+  gtk_snapshot_push_rounded_clip (snapshot, &outline);
+  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
+  gtk_snapshot_pop (snapshot);
+  gtk_snapshot_restore (snapshot);
+
+  /* And finally, don't forget to restore the initial save() that
+   * we did for the initial transformations.
+   */
+  gtk_snapshot_restore (snapshot);
+
+  g_date_time_unref (time);
+}
+
+/* Our desired size is 100px. That sounds okay for an analog clock */
+static int
+gtk_clock_get_intrinsic_width (GdkPaintable *paintable)
+{
+  return 100;
+}
+
+static int
+gtk_clock_get_intrinsic_height (GdkPaintable *paintable)
+{
+  return 100;
+}
+
+/* Initialize the paintable interface. This way we turn our clocks
+ * into objects that can be drawn. There are more functions to this
+ * interface to define desired size, but this is enough.
+ */
+static void
+gtk_clock_paintable_init (GdkPaintableInterface *iface)
+{
+  iface->snapshot = gtk_clock_snapshot;
+  iface->get_intrinsic_width = gtk_clock_get_intrinsic_width;
+  iface->get_intrinsic_height = gtk_clock_get_intrinsic_height;
+}
+
+/* Finally, we define the type. The important part is adding the
+ * paintable interface, so GTK knows that this object can indeed
+ * be drawn.
+ */
+G_DEFINE_TYPE_WITH_CODE (GtkClock, gtk_clock, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
+                                                gtk_clock_paintable_init))
+
+static GParamSpec *properties[N_PROPS] = { NULL, };
+
+static void
+gtk_clock_get_property (GObject    *object,
+                        guint       property_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
+{
+  GtkClock *self = GTK_CLOCK (object);
+
+  switch (property_id)
+    {
+    case PROP_LOCATION:
+      g_value_set_string (value, self->location);
+      break;
+
+    case PROP_TIME:
+      g_value_take_boxed (value, gtk_clock_get_time (self));
+      break;
+
+    case PROP_TIMEZONE:
+      g_value_set_boxed (value, self->timezone);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_clock_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GtkClock *self = GTK_CLOCK (object);
+
+  switch (property_id)
+    {
+    case PROP_LOCATION:
+      self->location = g_value_dup_string (value);
+      break;
+
+    case PROP_TIMEZONE:
+      self->timezone = g_value_dup_boxed (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+/* This is the list of all the ticking clocks */
+static GSList *ticking_clocks = NULL;
+
+/* This is the ID of the timeout source that is updating all
+ * ticking clocks.
+ */
+static guint ticking_clock_id = 0;
+
+/* Every second, this function is called to tell everybody that
+ * the clocks are ticking.
+ */
+static gboolean
+gtk_clock_tick (gpointer unused)
+{
+  GSList *l;
+
+  for (l = ticking_clocks; l; l = l->next)
+    {
+      GtkClock *clock = l->data;
+
+      /* We will now return a different value for the time property,
+       * so notify about that.
+       */
+      g_object_notify_by_pspec (G_OBJECT (clock), properties[PROP_TIME]);
+
+      /* We will also draw the hands of the clock differently.
+       * So notify about that, too.
+       */
+      gdk_paintable_invalidate_contents (GDK_PAINTABLE (clock));
+    }
+
+  return G_SOURCE_CONTINUE;
+}
+
+static void
+gtk_clock_stop_ticking (GtkClock *self)
+{
+  ticking_clocks = g_slist_remove (ticking_clocks, self);
+
+  /* If no clock is remaining, stop running the tick updates */
+  if (ticking_clocks == NULL && ticking_clock_id != 0)
+    g_clear_handle_id (&ticking_clock_id, g_source_remove);
+}
+
+static void
+gtk_clock_start_ticking (GtkClock *self)
+{
+  /* if no clock is ticking yet, start */
+  if (ticking_clock_id == 0)
+    ticking_clock_id = g_timeout_add_seconds (1, gtk_clock_tick, NULL);
+
+  ticking_clocks = g_slist_prepend (ticking_clocks, self);
+}
+
+static void
+gtk_clock_finalize (GObject *object)
+{
+  GtkClock *self = GTK_CLOCK (object);
+
+  gtk_clock_stop_ticking (self);
+
+  g_free (self->location);
+  g_clear_pointer (&self->timezone, g_time_zone_unref);
+
+  G_OBJECT_CLASS (gtk_clock_parent_class)->finalize (object);
+}
+
+static void
+gtk_clock_class_init (GtkClockClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->get_property = gtk_clock_get_property;
+  gobject_class->set_property = gtk_clock_set_property;
+  gobject_class->finalize = gtk_clock_finalize;
+
+  properties[PROP_LOCATION] =
+    g_param_spec_string ("location", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  properties[PROP_TIME] =
+    g_param_spec_boxed ("time", NULL, NULL, G_TYPE_DATE_TIME, G_PARAM_READABLE);
+  properties[PROP_TIMEZONE] =
+    g_param_spec_boxed ("timezone", NULL, NULL, G_TYPE_TIME_ZONE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+
+  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+}
+
+static void
+gtk_clock_init (GtkClock *self)
+{
+  gtk_clock_start_ticking (self);
+}
+
+static GtkClock *
+gtk_clock_new (const char *location,
+               GTimeZone  *_tz)
+{
+  GtkClock *result;
+
+  result = g_object_new (GTK_TYPE_CLOCK,
+                         "location", location,
+                         "timezone", _tz,
+                         NULL);
+
+  g_clear_pointer (&_tz, g_time_zone_unref);
+
+  return result;
+}
+
+static GListModel *
+create_clocks_model (void)
+{
+  GListStore *result;
+  GtkClock *clock;
+
+  result = g_list_store_new (GTK_TYPE_CLOCK);
+
+  /* local time */
+  clock = gtk_clock_new ("local", NULL);
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  /* UTC time */
+  clock = gtk_clock_new ("UTC", g_time_zone_new_utc ());
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  /* A bunch of timezones with GTK hackers */
+  clock = gtk_clock_new ("San Francisco", g_time_zone_new ("America/Los_Angeles"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  clock = gtk_clock_new ("Xalapa", g_time_zone_new ("America/Mexico_City"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  clock = gtk_clock_new ("Boston", g_time_zone_new ("America/New_York"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  clock = gtk_clock_new ("London", g_time_zone_new ("Europe/London"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  clock = gtk_clock_new ("Berlin", g_time_zone_new ("Europe/Berlin"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  clock = gtk_clock_new ("Moscow", g_time_zone_new ("Europe/Moscow"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  clock = gtk_clock_new ("New Delhi", g_time_zone_new ("Asia/Kolkata"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+  clock = gtk_clock_new ("Shanghai", g_time_zone_new ("Asia/Shanghai"));
+  g_list_store_append (result, clock);
+  g_object_unref (clock);
+
+  return G_LIST_MODEL (result);
+}
+
+static char *
+convert_time_to_string (GObject   *image,
+                        GDateTime *time,
+                        gpointer   unused)
+{
+  return g_date_time_format (time, "%x\n%X");
+}
+
+/* And this function is the crux for this whole demo.
+ * It shows how to use expressions to set up bindings.
+ */
+static void
+setup_listitem_cb (GtkListItemFactory *factory,
+                   GtkListItem        *list_item)
+{
+  GtkWidget *box, *picture, *location_label, *time_label;
+  GtkExpression *clock_expression, *expression;
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_list_item_set_child (list_item, box);
+
+  /* First, we create an expression that gets us the clock from the listitem:
+   * 1. Create an expression that gets the list item.
+   * 2. Use that expression's "item" property to get the clock
+   */
+  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
+  clock_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
+
+  /* Bind the clock's location to a label.
+   * This is easy: We just get the "location" property of the clock.
+   */
+  expression = gtk_property_expression_new (GTK_TYPE_CLOCK,
+                                            gtk_expression_ref (clock_expression),
+                                            "location");
+  /* Now create the label and bind the expression to it. */
+  location_label = gtk_label_new (NULL);
+  gtk_expression_bind (expression, location_label, "label", location_label);
+  gtk_box_append (GTK_BOX (box), location_label);
+
+
+  /* Here we bind the item itself to a GdkPicture.
+   * This is simply done by using the clock expression itself.
+   */
+  expression = gtk_expression_ref (clock_expression);
+  /* Now create the widget and bind the expression to it. */
+  picture = gtk_picture_new ();
+  gtk_expression_bind (expression, picture, "paintable", picture);
+  gtk_box_append (GTK_BOX (box), picture);
+
+
+  /* And finally, everything comes together.
+   * We create a label for displaying the time as text.
+   * For that, we need to transform the "GDateTime" of the
+   * time property into a string so that the label can display it.
+   */
+  expression = gtk_property_expression_new (GTK_TYPE_CLOCK,
+                                            gtk_expression_ref (clock_expression),
+                                            "time");
+  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
+                                            NULL,
+                                            1, (GtkExpression *[1]) { expression },
+                                            G_CALLBACK (convert_time_to_string),
+                                            NULL, NULL);
+  /* Now create the label and bind the expression to it. */
+  time_label = gtk_label_new (NULL);
+  gtk_expression_bind (expression, time_label, "label", time_label);
+  gtk_box_append (GTK_BOX (box), time_label);
+
+  gtk_expression_unref (clock_expression);
+}
+
+static GtkWidget *window = NULL;
+
+GtkWidget *
+do_listview_clocks (GtkWidget *do_widget)
+{
+  if (window == NULL)
+    {
+      GtkWidget *gridview, *sw;
+      GtkListItemFactory *factory;
+      GListModel *model;
+      GtkNoSelection *selection;
+
+      /* This is the normal window setup code every demo does */
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Clocks");
+      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);
+
+      /* List widgets go into a scrolled window. Always. */
+      sw = gtk_scrolled_window_new ();
+      gtk_window_set_child (GTK_WINDOW (window), sw);
+
+      /* Create the factory that creates the listitems. Because we
+       * used bindings above during setup, we only need to connect
+       * to the setup signal.
+       * The bindings take care of the bind step.
+       */
+      factory = gtk_signal_list_item_factory_new ();
+      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
+
+      gridview = gtk_grid_view_new_with_factory (factory);
+      gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
+      gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
+
+      model = create_clocks_model ();
+      selection = gtk_no_selection_new (model);
+      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
+      g_object_unref (selection);
+      g_object_unref (model);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/listview_colors.c

@@ -0,0 +1,979 @@
+/* Lists/Colors
+ *
+ * This demo displays a grid of colors.
+ *
+ * It is using a GtkGridView, and shows how to display
+ * and sort the data in various ways. The controls for
+ * this are implemented using GtkDropDown.
+ *
+ * The dataset used here has up to 16 777 216 items.
+ *
+ * Note that this demo also functions as a performance
+ * test for some of the list model machinery, and the
+ * biggest sizes here can lock up the application for
+ * extended times when used with sorting.
+ */
+
+#include <gtk/gtk.h>
+
+#include <stdlib.h>
+
+#define GTK_TYPE_COLOR (gtk_color_get_type ())
+G_DECLARE_FINAL_TYPE (GtkColor, gtk_color, GTK, COLOR, GObject)
+
+/* This is our object. It's just a color */
+typedef struct _GtkColor GtkColor;
+struct _GtkColor
+{
+  GObject parent_instance;
+
+  char *name;
+  GdkRGBA color;
+  int h, s, v;
+};
+
+enum {
+  PROP_0,
+  PROP_NAME,
+  PROP_COLOR,
+  PROP_RED,
+  PROP_GREEN,
+  PROP_BLUE,
+  PROP_HUE,
+  PROP_SATURATION,
+  PROP_VALUE,
+
+  N_COLOR_PROPS
+};
+
+static void
+gtk_color_snapshot (GdkPaintable *paintable,
+                    GdkSnapshot  *snapshot,
+                    double        width,
+                    double        height)
+{
+  GtkColor *self = GTK_COLOR (paintable);
+
+  gtk_snapshot_append_color (snapshot, &self->color, &GRAPHENE_RECT_INIT (0, 0, width, height));
+}
+
+static int
+gtk_color_get_intrinsic_width (GdkPaintable *paintable)
+{
+  return 32;
+}
+
+static int
+gtk_color_get_intrinsic_height (GdkPaintable *paintable)
+{
+  return 32;
+}
+
+static void
+gtk_color_paintable_init (GdkPaintableInterface *iface)
+{
+  iface->snapshot = gtk_color_snapshot;
+  iface->get_intrinsic_width = gtk_color_get_intrinsic_width;
+  iface->get_intrinsic_height = gtk_color_get_intrinsic_height;
+}
+
+/*
+ * Finally, we define the type. The important part is adding the paintable
+ * interface, so GTK knows that this object can indeed be drawm.
+ */
+G_DEFINE_TYPE_WITH_CODE (GtkColor, gtk_color, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
+                                                gtk_color_paintable_init))
+
+static GParamSpec *color_properties[N_COLOR_PROPS] = { NULL, };
+
+static void
+rgb_to_hsv (GdkRGBA *rgba,
+            gdouble *h_out,
+            gdouble *s_out,
+            gdouble *v_out)
+{
+  gdouble red, green, blue;
+  gdouble h, s, v;
+  gdouble min, max;
+  gdouble delta;
+
+  red = rgba->red;
+  green = rgba->green;
+  blue = rgba->blue;
+
+  h = 0.0;
+
+  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;
+    }
+
+  v = max;
+
+  if (max != 0.0)
+    s = (max - min) / max;
+  else
+    s = 0.0;
+
+  if (s == 0.0)
+    h = 0.0;
+  else
+    {
+      delta = max - min;
+
+      if (red == max)
+        h = (green - blue) / delta;
+      else if (green == max)
+        h = 2 + (blue - red) / delta;
+      else if (blue == max)
+        h = 4 + (red - green) / delta;
+
+      h /= 6.0;
+
+      if (h < 0.0)
+        h += 1.0;
+      else if (h > 1.0)
+        h -= 1.0;
+    }
+
+  *h_out = h;
+  *s_out = s;
+  *v_out = v;
+}
+
+static void
+gtk_color_get_property (GObject    *object,
+                        guint       property_id,
+                        GValue     *value,
+                        GParamSpec *pspec)
+{
+  GtkColor *self = GTK_COLOR (object);
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      g_value_set_string (value, self->name);
+      break;
+
+    case PROP_COLOR:
+      g_value_set_boxed (value, &self->color);
+      break;
+
+    case PROP_RED:
+      g_value_set_float (value, self->color.red);
+      break;
+
+    case PROP_GREEN:
+      g_value_set_float (value, self->color.green);
+      break;
+
+    case PROP_BLUE:
+      g_value_set_float (value, self->color.blue);
+      break;
+
+    case PROP_HUE:
+      g_value_set_int (value, self->h);
+      break;
+
+    case PROP_SATURATION:
+      g_value_set_int (value, self->s);
+      break;
+
+    case PROP_VALUE:
+      g_value_set_int (value, self->v);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_color_set_property (GObject      *object,
+                        guint         property_id,
+                        const GValue *value,
+                        GParamSpec   *pspec)
+{
+  GtkColor *self = GTK_COLOR (object);
+  double h, s, v;
+
+  switch (property_id)
+    {
+    case PROP_NAME:
+      self->name = g_value_dup_string (value);
+      break;
+
+    case PROP_COLOR:
+      self->color = *(GdkRGBA *) g_value_dup_boxed (value);
+      rgb_to_hsv (&self->color, &h, &s, &v);
+      self->h = round (360 * h);
+      self->s = round (100 * s);
+      self->v = round (100 * v);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_color_finalize (GObject *object)
+{
+  GtkColor *self = GTK_COLOR (object);
+
+  g_free (self->name);
+
+  G_OBJECT_CLASS (gtk_color_parent_class)->finalize (object);
+}
+
+static void
+gtk_color_class_init (GtkColorClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->get_property = gtk_color_get_property;
+  gobject_class->set_property = gtk_color_set_property;
+  gobject_class->finalize = gtk_color_finalize;
+
+  color_properties[PROP_NAME] =
+    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  color_properties[PROP_COLOR] =
+    g_param_spec_boxed ("color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
+  color_properties[PROP_RED] =
+    g_param_spec_float ("red", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
+  color_properties[PROP_GREEN] =
+    g_param_spec_float ("green", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
+  color_properties[PROP_BLUE] =
+    g_param_spec_float ("blue", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
+  color_properties[PROP_HUE] =
+    g_param_spec_int ("hue", NULL, NULL, 0, 360, 0, G_PARAM_READABLE);
+  color_properties[PROP_SATURATION] =
+    g_param_spec_int ("saturation", NULL, NULL, 0, 100, 0, G_PARAM_READABLE);
+  color_properties[PROP_VALUE] =
+    g_param_spec_int ("value", NULL, NULL, 0, 100, 0, G_PARAM_READABLE);
+
+  g_object_class_install_properties (gobject_class, N_COLOR_PROPS, color_properties);
+}
+
+static void
+gtk_color_init (GtkColor *self)
+{
+}
+
+static GtkColor *
+gtk_color_new (const char *name,
+               float r, float g, float b)
+{
+  GtkColor *result;
+  GdkRGBA color = { r, g, b, 1.0 };
+
+  result = g_object_new (GTK_TYPE_COLOR,
+                         "name", name,
+                         "color", &color,
+                         NULL);
+
+  return result;
+}
+
+#define N_COLORS (256 * 256 * 256)
+
+#define GTK_TYPE_COLOR_LIST (gtk_color_list_get_type ())
+G_DECLARE_FINAL_TYPE (GtkColorList, gtk_color_list, GTK, COLOR_LIST, GObject)
+
+enum {
+  LIST_PROP_0,
+  LIST_PROP_SIZE,
+
+  N_LIST_PROPS
+};
+
+typedef struct _GtkColorList GtkColorList;
+struct _GtkColorList
+{
+  GObject parent_instance;
+
+  GtkColor **colors; /* Always N_COLORS */
+
+  guint size; /* How many colors we allow */
+};
+
+static GType
+gtk_color_list_get_item_type (GListModel *list)
+{
+  return GTK_TYPE_COLOR;
+}
+
+static guint
+gtk_color_list_get_n_items (GListModel *list)
+{
+  GtkColorList *self = GTK_COLOR_LIST (list);
+
+  return self->size;
+}
+
+static guint
+position_to_color (guint position)
+{
+  static guint map[] = {
+    0xFF0000, 0x00FF00, 0x0000FF,
+    0x7F0000, 0x007F00, 0x00007F,
+    0x3F0000, 0x003F00, 0x00003F,
+    0x1F0000, 0x001F00, 0x00001F,
+    0x0F0000, 0x000F00, 0x00000F,
+    0x070000, 0x000700, 0x000007,
+    0x030000, 0x000300, 0x000003,
+    0x010000, 0x000100, 0x000001
+  };
+  guint result, i;
+
+  result = 0;
+
+  for (i = 0; i < G_N_ELEMENTS (map); i++)
+    {
+      if (position & (1 << i))
+        result ^= map[i];
+    }
+
+  return result;
+}
+
+static gpointer
+gtk_color_list_get_item (GListModel *list,
+                         guint       position)
+{
+  GtkColorList *self = GTK_COLOR_LIST (list);
+
+  if (position >= self->size)
+    return NULL;
+
+  position = position_to_color (position);
+
+  if (self->colors[position] == NULL)
+    {
+      guint red, green, blue;
+
+      red = (position >> 16) & 0xFF;
+      green = (position >> 8) & 0xFF;
+      blue = position & 0xFF;
+
+      self->colors[position] = gtk_color_new ("", red / 255., green / 255., blue / 255.);
+    }
+
+  return g_object_ref (self->colors[position]);
+}
+
+static void
+gtk_color_list_model_init (GListModelInterface *iface)
+{
+  iface->get_item_type = gtk_color_list_get_item_type;
+  iface->get_n_items = gtk_color_list_get_n_items;
+  iface->get_item = gtk_color_list_get_item;
+}
+
+G_DEFINE_TYPE_WITH_CODE (GtkColorList, gtk_color_list, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
+                                                gtk_color_list_model_init))
+
+static GParamSpec *list_properties[N_LIST_PROPS] = { NULL, };
+
+static void
+gtk_color_list_get_property (GObject    *object,
+                             guint       property_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GtkColorList *self = GTK_COLOR_LIST (object);
+
+  switch (property_id)
+    {
+    case LIST_PROP_SIZE:
+      g_value_set_uint (value, self->size);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_color_list_set_size (GtkColorList *self,
+                         guint         size)
+{
+  guint old_size = self->size;
+
+  self->size = size;
+  if (self->size > old_size)
+    g_list_model_items_changed (G_LIST_MODEL (self), old_size, 0, self->size - old_size);
+  else if (old_size > self->size)
+    g_list_model_items_changed (G_LIST_MODEL (self), self->size, old_size - self->size, 0);
+
+  g_object_notify_by_pspec (G_OBJECT (self), list_properties[LIST_PROP_SIZE]);
+}
+
+static void
+gtk_color_list_set_property (GObject      *object,
+                             guint         property_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+{
+  GtkColorList *self = GTK_COLOR_LIST (object);
+
+  switch (property_id)
+    {
+    case LIST_PROP_SIZE:
+      gtk_color_list_set_size (self, g_value_get_uint (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_color_list_dispose (GObject *object)
+{
+  GtkColorList *self = GTK_COLOR_LIST (object);
+  guint i;
+
+  for (i = 0; i < N_COLORS; i++)
+    {
+      g_clear_object (&self->colors[i]);
+    }
+  g_free (self->colors);
+
+  G_OBJECT_CLASS (gtk_color_parent_class)->finalize (object);
+}
+
+static void
+gtk_color_list_class_init (GtkColorListClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->get_property = gtk_color_list_get_property;
+  gobject_class->set_property = gtk_color_list_set_property;
+  gobject_class->dispose = gtk_color_list_dispose;
+
+  list_properties[LIST_PROP_SIZE] =
+    g_param_spec_uint ("size", NULL, NULL, 0, N_COLORS, 0, G_PARAM_READWRITE);
+
+  g_object_class_install_properties (gobject_class, N_LIST_PROPS, list_properties);
+}
+
+static void
+gtk_color_list_init (GtkColorList *self)
+{
+  GBytes *data;
+  char **lines;
+  guint i;
+
+  self->colors = g_new0 (GtkColor *, N_COLORS);
+
+  data = g_resources_lookup_data ("/listview_colors/color.names.txt", 0, NULL);
+  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
+
+  for (i = 0; lines[i]; i++)
+    {
+      const char *name;
+      char **fields;
+      int red, green, blue;
+      guint pos;
+
+      if (lines[i][0] == '#' || lines[i][0] == '\0')
+        continue;
+
+      fields = g_strsplit (lines[i], " ", 0);
+      name = fields[1];
+      red = atoi (fields[3]);
+      green = atoi (fields[4]);
+      blue = atoi (fields[5]);
+
+      pos = ((red & 0xFF) << 16) | ((green & 0xFF) << 8) | blue;
+      if (self->colors[pos] == NULL)
+        self->colors[pos] = gtk_color_new (name, red / 255., green / 255., blue / 255.);
+
+      g_strfreev (fields);
+    }
+  g_strfreev (lines);
+
+  g_bytes_unref (data);
+}
+
+static GListModel *
+gtk_color_list_new (guint size)
+{
+  return g_object_new (GTK_TYPE_COLOR_LIST,
+                       "size", size,
+                       NULL);
+}
+
+static char *
+get_rgb_markup (gpointer this,
+                GtkColor *color)
+{
+  if (!color)
+    return NULL;
+
+  return g_strdup_printf ("<b>R:</b> %d <b>G:</b> %d <b>B:</b> %d",
+                          (int)(color->color.red * 255), 
+                          (int)(color->color.green * 255),
+                          (int)(color->color.blue * 255));
+}
+
+static char *
+get_hsv_markup (gpointer this,
+                GtkColor *color)
+{
+  if (!color)
+    return NULL;
+
+  return g_strdup_printf ("<b>H:</b> %d <b>S:</b> %d <b>V:</b> %d",
+                          color->h, 
+                          color->s,
+                          color->v);
+}
+
+static void
+setup_simple_listitem_cb (GtkListItemFactory *factory,
+                          GtkListItem        *list_item)
+{
+  GtkWidget *picture;
+  GtkExpression *color_expression, *expression;
+
+  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
+  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
+
+  picture = gtk_picture_new ();
+  gtk_widget_set_size_request (picture, 32, 32);
+  gtk_expression_bind (color_expression, picture, "paintable", NULL);
+
+  gtk_list_item_set_child (list_item, picture);
+}
+
+static void
+setup_listitem_cb (GtkListItemFactory *factory,
+                   GtkListItem        *list_item)
+{
+  GtkWidget *box, *picture, *name_label, *rgb_label, *hsv_label;
+  GtkExpression *color_expression, *expression;
+  GtkExpression *params[1];
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_list_item_set_child (list_item, box);
+
+  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
+  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
+
+  expression = gtk_property_expression_new (GTK_TYPE_COLOR,
+                                            gtk_expression_ref (color_expression),
+                                            "name");
+  name_label = gtk_label_new (NULL);
+  gtk_expression_bind (expression, name_label, "label", NULL);
+  gtk_box_append (GTK_BOX (box), name_label);
+
+  expression = gtk_expression_ref (color_expression);
+  picture = gtk_picture_new ();
+  gtk_expression_bind (expression, picture, "paintable", NULL);
+  gtk_box_append (GTK_BOX (box), picture);
+
+  params[0] = gtk_expression_ref (color_expression);
+  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
+                                            NULL,
+                                            1, params,
+                                            (GCallback)get_rgb_markup,
+                                            NULL, NULL);
+
+  rgb_label = gtk_label_new (NULL);
+  gtk_label_set_use_markup (GTK_LABEL (rgb_label), TRUE);
+  gtk_expression_bind (expression, rgb_label, "label", NULL);
+  gtk_box_append (GTK_BOX (box), rgb_label);
+
+  params[0] = gtk_expression_ref (color_expression);
+  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
+                                            NULL,
+                                            1, params,
+                                            (GCallback)get_hsv_markup,
+                                            NULL, NULL);
+
+  hsv_label = gtk_label_new (NULL);
+  gtk_label_set_use_markup (GTK_LABEL (hsv_label), TRUE);
+  gtk_expression_bind (expression, hsv_label, "label", NULL);
+  gtk_box_append (GTK_BOX (box), hsv_label);
+
+  gtk_expression_unref (color_expression);
+}
+
+static void
+set_title (gpointer    item,
+           const char *title)
+{
+  g_object_set_data (G_OBJECT (item), "title", (gpointer)title);
+}
+
+static char *
+get_title (gpointer item)
+{
+  return g_strdup ((char *)g_object_get_data (G_OBJECT (item), "title"));
+}
+
+GtkWidget *
+create_color_grid (void)
+{
+  GtkWidget *gridview;
+  GtkListItemFactory *factory;
+  GListModel *model, *selection;
+
+  gridview = gtk_grid_view_new ();
+  gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
+  gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
+
+  factory = gtk_signal_list_item_factory_new ();
+  g_signal_connect (factory, "setup", G_CALLBACK (setup_simple_listitem_cb), NULL);
+  gtk_grid_view_set_factory (GTK_GRID_VIEW (gridview), factory);
+  g_object_unref (factory);
+
+  gtk_grid_view_set_max_columns (GTK_GRID_VIEW (gridview), 24);
+  gtk_grid_view_set_enable_rubberband (GTK_GRID_VIEW (gridview), TRUE);
+
+  model = G_LIST_MODEL (gtk_sort_list_model_new (gtk_color_list_new (0), NULL));
+
+  selection = G_LIST_MODEL (gtk_multi_selection_new (model));
+  gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
+  g_object_unref (selection);
+  g_object_unref (model);
+
+  return gridview;
+}
+
+static gboolean
+add_colors (GtkWidget     *widget,
+            GdkFrameClock *clock,
+            gpointer       data)
+{
+  GtkColorList *colors = data;
+  guint limit;
+
+  limit = GPOINTER_TO_UINT (g_object_get_data (data, "limit"));
+  gtk_color_list_set_size (colors, MIN (limit, colors->size + MAX (1, limit / 4096)));
+  
+  if (colors->size >= limit)
+    return G_SOURCE_REMOVE;
+  else
+    return G_SOURCE_CONTINUE;
+}
+
+static void
+refill (GtkWidget    *button,
+        GtkColorList *colors)
+{
+  gtk_color_list_set_size (colors, 0);
+  gtk_widget_add_tick_callback (button, add_colors, g_object_ref (colors), g_object_unref);
+}
+ 
+static void
+limit_changed_cb (GtkDropDown  *dropdown,
+                  GParamSpec   *pspec,
+                  GtkColorList *colors)
+{
+  guint new_limit, old_limit;
+
+  old_limit = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (colors), "limit"));
+  new_limit = 1 << (3 * (gtk_drop_down_get_selected (dropdown) + 1));
+
+  g_object_set_data (G_OBJECT (colors), "limit", GUINT_TO_POINTER (new_limit));
+
+  if (old_limit == colors->size)
+    gtk_color_list_set_size (colors, new_limit);
+}
+
+static void
+limit_changed_cb2 (GtkDropDown  *dropdown,
+                   GParamSpec   *pspec,
+                   GtkLabel     *label)
+{
+  char *string;
+  int len;
+  guint limit;
+
+  limit = 1 << (3 * (gtk_drop_down_get_selected (dropdown) + 1));
+
+  string = g_strdup_printf ("%'u", limit);
+  len = g_utf8_strlen (string, -1);
+  g_free (string);
+
+  gtk_label_set_width_chars (label, len + 2); /* for " /" */
+}
+
+static void
+items_changed_cb (GListModel *model,
+                  guint       position,
+                  guint       removed,
+                  guint       added,
+                  GtkWidget  *label)
+{
+  guint n = g_list_model_get_n_items (model);
+  char *text;
+
+  text = g_strdup_printf ("%'u /", n);
+  gtk_label_set_label (GTK_LABEL (label), text);
+  g_free (text);
+}
+
+static void
+setup_number_item (GtkSignalListItemFactory *factory,
+                   GtkListItem              *item)
+{
+  GtkWidget *label;
+  PangoAttrList *attrs;
+
+  label = gtk_label_new ("");
+  gtk_label_set_xalign (GTK_LABEL (label), 1);
+
+  attrs = pango_attr_list_new ();
+  pango_attr_list_insert (attrs, pango_attr_font_features_new ("tnum"));
+  gtk_label_set_attributes (GTK_LABEL (label), attrs);
+  pango_attr_list_unref (attrs);
+
+  gtk_list_item_set_child (item, label);
+}
+
+static void
+bind_number_item (GtkSignalListItemFactory *factory,
+                  GtkListItem              *item)
+{
+  GtkWidget *label;
+  guint limit;
+  char *string;
+
+  label = gtk_list_item_get_child (item);
+
+  limit = 1 << (3 * (gtk_list_item_get_position (item) + 1));
+  string = g_strdup_printf ("%'u", limit);
+  gtk_label_set_label (GTK_LABEL (label), string);
+  g_free (string);
+}
+
+static GtkWidget *window = NULL;
+
+GtkWidget *
+do_listview_colors (GtkWidget *do_widget)
+{
+  if (window == NULL)
+    {
+      GtkWidget *header, *gridview, *sw, *box, *dropdown;
+      GtkListItemFactory *factory;
+      GListStore *factories;
+      GListModel *model;
+      GtkSorter *sorter;
+      GtkSorter *multi_sorter;
+      GListStore *sorters;
+      GtkExpression *expression;
+      GtkWidget *button;
+      GtkWidget *label;
+      PangoAttrList *attrs;
+      char *string;
+      guint len;
+
+      window = gtk_window_new ();
+      gtk_window_set_title (GTK_WINDOW (window), "Colors");
+      header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_window_set_titlebar (GTK_WINDOW (window), header);
+
+      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);
+
+      sw = gtk_scrolled_window_new ();
+      gtk_window_set_child (GTK_WINDOW (window), sw);
+
+      gridview = create_color_grid ();
+      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
+      model = gtk_grid_view_get_model (GTK_GRID_VIEW (gridview));
+      g_object_get (model, "model", &model, NULL);
+
+      button = gtk_button_new_with_mnemonic ("_Refill");
+      g_signal_connect (button, "clicked",
+                        G_CALLBACK (refill),
+                        gtk_sort_list_model_get_model (GTK_SORT_LIST_MODEL (model)));
+
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
+
+      label = gtk_label_new ("0 /");
+      attrs = pango_attr_list_new ();
+      pango_attr_list_insert (attrs, pango_attr_font_features_new ("tnum"));
+      gtk_label_set_attributes (GTK_LABEL (label), attrs);
+      pango_attr_list_unref (attrs);
+      string = g_strdup_printf ("%'u", 4096);
+      len = g_utf8_strlen (string, -1);
+      g_free (string);
+      gtk_label_set_width_chars (GTK_LABEL (label), len + 2);
+      gtk_label_set_xalign (GTK_LABEL (label), 1);
+
+      g_signal_connect (gtk_grid_view_get_model (GTK_GRID_VIEW (gridview)),
+                        "items-changed", G_CALLBACK (items_changed_cb), label);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), label);
+
+      dropdown = gtk_drop_down_new ();
+      gtk_drop_down_set_from_strings (GTK_DROP_DOWN (dropdown), (const char *[]) { "8", "64", "512", "4096", "32768", "262144", "2097152", "16777216", NULL });
+      g_signal_connect (dropdown, "notify::selected",
+                        G_CALLBACK (limit_changed_cb), 
+                        gtk_sort_list_model_get_model (GTK_SORT_LIST_MODEL (model)));
+      g_signal_connect (dropdown, "notify::selected",
+                        G_CALLBACK (limit_changed_cb2), 
+                        label);
+      factory = gtk_signal_list_item_factory_new ();
+      g_signal_connect (factory, "setup", G_CALLBACK (setup_number_item), NULL);
+      g_signal_connect (factory, "bind", G_CALLBACK (bind_number_item), NULL);
+      gtk_drop_down_set_factory (GTK_DROP_DOWN (dropdown), factory);
+      g_object_unref (factory);
+      gtk_drop_down_set_selected (GTK_DROP_DOWN (dropdown), 3); /* 4096 */
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), dropdown);
+
+      sorters = g_list_store_new (GTK_TYPE_SORTER);
+
+      /* An empty multisorter doesn't do any sorting and the sortmodel is
+       * smart enough to know that.
+       */
+      sorter = gtk_multi_sorter_new ();
+      set_title (sorter, "Unsorted");
+      g_list_store_append (sorters, sorter);
+      g_object_unref (sorter);
+
+      sorter = gtk_string_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "name"));
+      set_title (sorter, "Name");
+      g_list_store_append (sorters, sorter);
+      g_object_unref (sorter);
+
+      multi_sorter = gtk_multi_sorter_new ();
+
+      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "red"));
+      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
+      set_title (sorter, "Red");
+      g_list_store_append (sorters, sorter);
+      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
+
+      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "green"));
+      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
+      set_title (sorter, "Green");
+      g_list_store_append (sorters, sorter);
+      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
+
+      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "blue"));
+      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
+      set_title (sorter, "Blue");
+      g_list_store_append (sorters, sorter);
+      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
+
+      set_title (multi_sorter, "RGB");
+      g_list_store_append (sorters, multi_sorter);
+      g_object_unref (multi_sorter);
+
+      multi_sorter = gtk_multi_sorter_new ();
+
+      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "hue"));
+      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
+      set_title (sorter, "Hue");
+      g_list_store_append (sorters, sorter);
+      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
+
+      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "saturation"));
+      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
+      set_title (sorter, "Saturation");
+      g_list_store_append (sorters, sorter);
+      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
+
+      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "value"));
+      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
+      set_title (sorter, "Value");
+      g_list_store_append (sorters, sorter);
+      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
+
+      set_title (multi_sorter, "HSV");
+      g_list_store_append (sorters, multi_sorter);
+      g_object_unref (multi_sorter);
+
+      dropdown = gtk_drop_down_new ();
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+      gtk_box_append (GTK_BOX (box), gtk_label_new ("Sort by:"));
+      gtk_box_append (GTK_BOX (box), dropdown);
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
+
+      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
+                                                NULL,
+                                                0, NULL,
+                                                (GCallback)get_title,
+                                                NULL, NULL);
+      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
+      gtk_expression_unref (expression);
+
+      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (sorters));
+      g_object_unref (sorters);
+
+      g_object_bind_property (dropdown, "selected-item", model, "sorter", G_BINDING_SYNC_CREATE);
+
+      factories = g_list_store_new (GTK_TYPE_LIST_ITEM_FACTORY);
+
+      factory = gtk_signal_list_item_factory_new ();
+      g_signal_connect (factory, "setup", G_CALLBACK (setup_simple_listitem_cb), NULL);
+      set_title (factory, "Colors");
+      g_list_store_append (factories, factory);
+
+      factory = gtk_signal_list_item_factory_new ();
+      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
+      set_title (factory, "Everything");
+      g_list_store_append (factories, factory);
+
+      dropdown = gtk_drop_down_new ();
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+      gtk_box_append (GTK_BOX (box), gtk_label_new ("Show:"));
+      gtk_box_append (GTK_BOX (box), dropdown);
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
+
+      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
+                                                NULL,
+                                                0, NULL,
+                                                (GCallback)get_title,
+                                                NULL, NULL);
+      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
+      gtk_expression_unref (expression);
+
+      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (factories));
+      g_object_unref (factories);
+
+      g_object_bind_property (dropdown, "selected-item", gridview, "factory", G_BINDING_SYNC_CREATE);
+      g_object_unref (model);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/listview_filebrowser.c

@@ -0,0 +1,281 @@
+/* Lists/File browser
+ *
+ * This demo shows off the different layouts that are quickly achievable
+ * with GtkListview and GtkGridView by implementing a file browser with
+ * different views.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+
+/* Create a simple object that holds the data for the different views */
+typedef struct _FileBrowserView FileBrowserView;
+struct _FileBrowserView
+{
+  GObject parent_instance;
+
+  GtkListItemFactory *factory;
+  char *icon_name;
+  char *title;
+  GtkOrientation orientation;
+};
+
+enum {
+  PROP_0,
+  PROP_FACTORY,
+  PROP_ICON_NAME,
+  PROP_TITLE,
+  PROP_ORIENTATION,
+
+  N_PROPS
+};
+
+#define FILE_BROWSER_TYPE_VIEW (file_browser_view_get_type ())
+G_DECLARE_FINAL_TYPE (FileBrowserView, file_browser_view, FILE_BROWSER, VIEW, GObject);
+
+G_DEFINE_TYPE (FileBrowserView, file_browser_view, G_TYPE_OBJECT);
+static GParamSpec *properties[N_PROPS] = { NULL, };
+
+static void
+file_browser_view_get_property (GObject    *object,
+                                guint       property_id,
+                                GValue     *value,
+                                GParamSpec *pspec)
+{
+  FileBrowserView *self = FILE_BROWSER_VIEW (object);
+
+  switch (property_id)
+    {
+    case PROP_FACTORY:
+      g_value_set_object (value, self->factory);
+      break;
+
+    case PROP_ICON_NAME:
+      g_value_set_string (value, self->icon_name);
+      break;
+
+    case PROP_TITLE:
+      g_value_set_string (value, self->title);
+      break;
+
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, self->orientation);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+file_browser_view_set_property (GObject      *object,
+                                guint         prop_id,
+                                const GValue *value,
+                                GParamSpec   *pspec)
+{
+  FileBrowserView *self = FILE_BROWSER_VIEW (object);
+
+  switch (prop_id)
+    {
+    case PROP_FACTORY:
+      g_set_object (&self->factory, g_value_get_object (value));
+      break;
+
+    case PROP_ICON_NAME:
+      g_free (self->icon_name);
+      self->icon_name = g_value_dup_string (value);
+      break;
+
+    case PROP_TITLE:
+      g_free (self->title);
+      self->title = g_value_dup_string (value);
+      break;
+
+    case PROP_ORIENTATION:
+      self->orientation = g_value_get_enum (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+file_browser_view_finalize (GObject *object)
+{
+  FileBrowserView *self = FILE_BROWSER_VIEW (object);
+
+  g_object_unref (self->factory);
+  g_free (self->icon_name);
+  g_free (self->title);
+
+  G_OBJECT_CLASS (file_browser_view_parent_class)->dispose (object);
+}
+
+static void
+file_browser_view_class_init (FileBrowserViewClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->get_property = file_browser_view_get_property;
+  gobject_class->set_property = file_browser_view_set_property;
+  gobject_class->finalize = file_browser_view_finalize;
+
+  properties[PROP_FACTORY] =
+    g_param_spec_object ("factory",
+                         "factory",
+                         "factory to use in the main view",
+                         GTK_TYPE_LIST_ITEM_FACTORY,
+                         G_PARAM_READWRITE);
+  properties[PROP_ICON_NAME] =
+    g_param_spec_string ("icon-name",
+                         "icon name",
+                         "icon to display for selecting this view",
+                         NULL,
+                         G_PARAM_READWRITE);
+  properties[PROP_TITLE] =
+    g_param_spec_string ("title",
+                         "title",
+                         "title to display for selecting this view",
+                         NULL,
+                         G_PARAM_READWRITE);
+  properties[PROP_ORIENTATION] =
+    g_param_spec_enum ("orientation",
+                       "orientation",
+                       "orientation of the view",
+                       GTK_TYPE_ORIENTATION,
+                       GTK_ORIENTATION_VERTICAL,
+                       G_PARAM_READWRITE);
+
+  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+}
+
+static void file_browser_view_init (FileBrowserView *self)
+{
+}
+
+char *
+filebrowser_get_display_name (GObject *object,
+                              GFileInfo *info)
+{
+  if (!info)
+    return NULL;
+
+  return g_strdup (g_file_info_get_attribute_string (info, "standard::display-name"));
+}
+
+char *
+filebrowser_get_content_type (GObject *object,
+                              GFileInfo *info)
+{
+  if (!info)
+    return NULL;
+
+  return g_strdup (g_file_info_get_attribute_string (info, "standard::content-type"));
+}
+
+char *
+filebrowser_get_size (GObject *object,
+                      GFileInfo *info)
+{
+  if (!info)
+    return NULL;
+
+  return g_format_size (g_file_info_get_attribute_uint64 (info, "standard::size"));
+}
+
+GIcon *
+filebrowser_get_icon (GObject *object,
+                      GFileInfo *info)
+{
+  GIcon *icon;
+
+  if (info)
+    icon = G_ICON (g_file_info_get_attribute_object (info, "standard::icon"));
+  else
+    icon = NULL;
+
+  if (icon)
+    g_object_ref (icon);
+
+  return icon;
+}
+
+void
+filebrowser_up_clicked_cb (GtkButton        *button,
+                           GtkDirectoryList *list)
+{
+  GFile *file;
+
+  file = g_file_get_parent (gtk_directory_list_get_file (list));
+  if (file == NULL)
+    return;
+
+  gtk_directory_list_set_file (list, file);
+}
+
+void
+filebrowser_view_activated_cb (GtkGridView      *view,
+                               guint             pos,
+                               GtkDirectoryList *list)
+{
+  GFileInfo *info;
+
+  info = g_list_model_get_item (gtk_grid_view_get_model (view), pos);
+  if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
+    gtk_directory_list_set_file (list, G_FILE (g_file_info_get_attribute_object (info, "standard::file")));
+
+  g_object_unref (info);
+}
+
+GtkWidget *
+do_listview_filebrowser (GtkWidget *do_widget)
+{
+  if (!window)
+    {
+      GtkWidget *view;
+      GtkBuilder *builder;
+      GtkDirectoryList *dirlist;
+      GFile *file;
+      char *cwd;
+      GtkCssProvider *provider;
+
+      provider = gtk_css_provider_new ();
+      gtk_css_provider_load_from_resource (provider, "/listview_filebrowser/listview_filebrowser.css");
+      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
+                                                  GTK_STYLE_PROVIDER (provider),
+                                                  800);
+      g_object_unref (provider);
+
+      builder = gtk_builder_new_from_resource ("/listview_filebrowser/listview_filebrowser.ui");
+      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);
+
+      /* Create the model and fill it with the contents of the current directory */
+      cwd = g_get_current_dir ();
+      file = g_file_new_for_path (cwd);
+      g_free (cwd);
+      dirlist = GTK_DIRECTORY_LIST (gtk_builder_get_object (builder, "dirlist"));
+      gtk_directory_list_set_file (dirlist, file);
+      g_object_unref (file);
+
+      /* grab focus in the view */
+      view = GTK_WIDGET (gtk_builder_get_object (builder, "view"));
+      gtk_widget_grab_focus (view);
+
+      g_object_unref (builder);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/listview_filebrowser.css

@@ -0,0 +1,11 @@
+list.viewswitcher {
+  border: 1px solid gray;
+}
+
+list.viewswitcher > row {
+  padding: 5px;
+}
+
+list.viewswitcher row:selected {
+  background: gray;
+}

demos/gtk-demo/listview_filebrowser.ui

@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GListStore" id="viewlist">
+    <property name="item-type">FileBrowserView</property>
+    <child>
+      <object class="FileBrowserView">
+        <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="GtkImage">
+            <binding name="gicon">
+              <closure type="GIcon" function="filebrowser_get_icon">
+                <lookup name="item">GtkListItem</lookup>
+              </closure>
+            </binding>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="halign">start</property>
+            <binding name="label">
+              <closure type="gchararray" function="filebrowser_get_display_name">
+                <lookup name="item">GtkListItem</lookup>
+              </closure>
+            </binding>
+          </object>
+        </child>
+      </object>
+    </property>
+  </template>
+</interface>
+            ]]></property>
+          </object>
+        </property>
+        <property name="icon-name">view-list-symbolic</property>
+        <property name="title" translatable="yes">List</property>
+        <property name="orientation">horizontal</property>
+      </object>
+    </child>
+    <child>
+      <object class="FileBrowserView">
+        <property name="icon-name">view-grid-symbolic</property>
+        <property name="title" translatable="yes">Grid</property>
+        <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">
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkImage">
+            <property name="icon-size">large</property>
+            <binding name="gicon">
+              <closure type="GIcon" function="filebrowser_get_icon">
+                <lookup name="item">GtkListItem</lookup>
+              </closure>
+            </binding>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="wrap">1</property>
+            <property name="wrap-mode">word-char</property>
+            <property name="lines">2</property>
+            <property name="ellipsize">end</property>
+            <property name="width-chars">10</property>
+            <property name="max-width-chars">30</property>
+            <binding name="label">
+              <closure type="gchararray" function="filebrowser_get_display_name">
+                <lookup name="item">GtkListItem</lookup>
+              </closure>
+            </binding>
+          </object>
+        </child>
+      </object>
+    </property>
+  </template>
+</interface>
+            ]]></property>
+          </object>
+        </property>
+        <property name="orientation">vertical</property>
+      </object>
+    </child>
+    <child>
+      <object class="FileBrowserView">
+        <property name="icon-name">view-paged-symbolic</property>
+        <property name="title" translatable="yes">Paged</property>
+        <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="GtkImage">
+            <property name="icon-size">large</property>
+            <binding name="gicon">
+              <closure type="GIcon" function="filebrowser_get_icon">
+                <lookup name="item">GtkListItem</lookup>
+              </closure>
+            </binding>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="halign">start</property>
+                <binding name="label">
+                  <closure type="gchararray" function="filebrowser_get_display_name">
+                    <lookup name="item">GtkListItem</lookup>
+                  </closure>
+                </binding>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="halign">start</property>
+                <binding name="label">
+                  <closure type="gchararray" function="filebrowser_get_size">
+                    <lookup name="item">GtkListItem</lookup>
+                  </closure>
+                </binding>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="halign">start</property>
+                <binding name="label">
+                  <closure type="gchararray" function="filebrowser_get_content_type">
+                    <lookup name="item">GtkListItem</lookup>
+                  </closure>
+                </binding>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </property>
+  </template>
+</interface>
+            ]]></property>
+          </object>
+        </property>
+        <property name="orientation">horizontal</property>
+      </object>
+    </child>
+  </object>
+  <object class="GtkDirectoryList" id="dirlist">
+    <property name="attributes">standard::name,standard::display-name,standard::icon,standard::size,standard::content-type</property>
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="title" translatable="yes">File browser</property>
+    <property name="default-width">600</property>
+    <property name="default-height">400</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="">
+        <property name="show-title-buttons">1</property>
+        <child>
+          <object class="GtkButton">
+            <property name="icon-name">go-up-symbolic</property>
+            <signal name="clicked" handler="filebrowser_up_clicked_cb" object="dirlist" swapped="no"/>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkListView">
+            <property name="valign">center</property>
+            <property name="orientation">horizontal</property>
+            <style>
+              <class name="linked"/>
+              <class name="viewswitcher"/>
+            </style>
+            <property name="model">
+              <object class="GtkSingleSelection" id="selected-view">
+                <property name="model">viewlist</property>
+              </object>
+            </property>
+            <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="GtkImage">
+        <binding name="icon-name">
+          <lookup type="FileBrowserView" name="icon-name">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+        <binding name="tooltip-text">
+          <lookup type="FileBrowserView" name="title">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>
+                ]]></property>
+              </object>
+            </property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkScrolledWindow">
+        <property name="can-focus">1</property>
+        <child>
+          <object class="GtkGridView" id="view">
+            <property name="model">dirlist</property>
+            <property name="max-columns">15</property>
+            <binding name="factory">
+              <lookup name="factory" type="FileBrowserView">
+                <lookup name="selected-item">selected-view</lookup>
+              </lookup>
+            </binding>
+            <binding name="orientation">
+              <lookup name="orientation" type="FileBrowserView">
+                <lookup name="selected-item">selected-view</lookup>
+              </lookup>
+            </binding>
+            <signal name="activate" handler="filebrowser_view_activated_cb" object="dirlist" swapped="no"/>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

demos/gtk-demo/listview_minesweeper.c

@@ -0,0 +1,472 @@
+/* Lists/Minesweeper
+ *
+ * This demo shows how to develop a user interface for small game using a
+ * gridview.
+ *
+ * It demonstrates how to use the activate signal and single-press behavior
+ * to implement rather different interaction behavior to a typical list.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+/*** The cell object ***/
+
+/* Create an object that holds the data for a cell in the game */
+typedef struct _SweeperCell SweeperCell;
+struct _SweeperCell
+{
+  GObject parent_instance;
+
+  gboolean is_mine;
+  gboolean is_visible;
+  guint neighbor_mines;
+};
+
+enum {
+  CELL_PROP_0,
+  CELL_PROP_LABEL,
+
+  N_CELL_PROPS
+};
+
+#define SWEEPER_TYPE_CELL (sweeper_cell_get_type ())
+G_DECLARE_FINAL_TYPE (SweeperCell, sweeper_cell, SWEEPER, CELL, GObject);
+
+G_DEFINE_TYPE (SweeperCell, sweeper_cell, G_TYPE_OBJECT);
+static GParamSpec *cell_properties[N_CELL_PROPS] = { NULL, };
+
+static const char *
+sweeper_cell_get_label (SweeperCell *self)
+{
+  static const char *minecount_labels[10] = { "", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+  if (!self->is_visible)
+    return "?";
+  
+  if (self->is_mine)
+    return "💣";
+
+  return minecount_labels[self->neighbor_mines];
+}
+
+static void
+sweeper_cell_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  SweeperCell *self = SWEEPER_CELL (object);
+
+  switch (property_id)
+    {
+    case CELL_PROP_LABEL:
+      g_value_set_string (value, sweeper_cell_get_label (self));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+sweeper_cell_class_init (SweeperCellClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->get_property = sweeper_cell_get_property;
+
+  cell_properties[CELL_PROP_LABEL] =
+    g_param_spec_string ("label",
+                         "label",
+                         "label to display for this row",
+                         NULL,
+                         G_PARAM_READABLE);
+
+  g_object_class_install_properties (gobject_class, N_CELL_PROPS, cell_properties);
+}
+
+static void
+sweeper_cell_init (SweeperCell *self)
+{
+}
+
+static void
+sweeper_cell_reveal (SweeperCell *self)
+{
+  if (self->is_visible)
+    return;
+
+  self->is_visible = TRUE;
+
+  g_object_notify_by_pspec (G_OBJECT (self), cell_properties[CELL_PROP_LABEL]);
+}
+
+static SweeperCell *
+sweeper_cell_new (void)
+{
+  return g_object_new (SWEEPER_TYPE_CELL, NULL);
+}
+
+/*** The board object ***/
+
+/* Create an object that holds the data for the game */
+typedef struct _SweeperGame SweeperGame;
+struct _SweeperGame
+{
+  GObject parent_instance;
+
+  GPtrArray *cells;
+  guint width;
+  guint height;
+  gboolean playing;
+  gboolean win;
+};
+
+enum {
+  GAME_PROP_0,
+  GAME_PROP_HEIGHT,
+  GAME_PROP_PLAYING,
+  GAME_PROP_WIDTH,
+  GAME_PROP_WIN,
+
+  N_GAME_PROPS
+};
+
+#define SWEEPER_TYPE_GAME (sweeper_game_get_type ())
+G_DECLARE_FINAL_TYPE (SweeperGame, sweeper_game, SWEEPER, GAME, GObject);
+
+static GType
+sweeper_game_list_model_get_item_type (GListModel *model)
+{
+  return SWEEPER_TYPE_GAME;
+}
+
+static guint
+sweeper_game_list_model_get_n_items (GListModel *model)
+{
+  SweeperGame *self = SWEEPER_GAME (model);
+
+  return self->width * self->height;
+}
+
+static gpointer
+sweeper_game_list_model_get_item (GListModel *model,
+                                  guint       position)
+{
+  SweeperGame *self = SWEEPER_GAME (model);
+
+  return g_object_ref (g_ptr_array_index (self->cells, position));
+}
+
+static void
+sweeper_game_list_model_init (GListModelInterface *iface)
+{
+  iface->get_item_type = sweeper_game_list_model_get_item_type;
+  iface->get_n_items = sweeper_game_list_model_get_n_items;
+  iface->get_item = sweeper_game_list_model_get_item;
+}
+
+G_DEFINE_TYPE_WITH_CODE (SweeperGame, sweeper_game, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, sweeper_game_list_model_init))
+
+static GParamSpec *game_properties[N_GAME_PROPS] = { NULL, };
+
+static void
+sweeper_game_dispose (GObject *object)
+{
+  SweeperGame *self = SWEEPER_GAME (object);
+
+  g_clear_pointer (&self->cells, g_ptr_array_unref);
+
+  G_OBJECT_CLASS (sweeper_game_parent_class)->dispose (object);
+}
+
+static void
+sweeper_game_get_property (GObject    *object,
+                           guint       property_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+  SweeperGame *self = SWEEPER_GAME (object);
+
+  switch (property_id)
+    {
+    case GAME_PROP_HEIGHT:
+      g_value_set_uint (value, self->height);
+      break;
+
+    case GAME_PROP_PLAYING:
+      g_value_set_boolean (value, self->playing);
+      break;
+
+    case GAME_PROP_WIDTH:
+      g_value_set_uint (value, self->width);
+      break;
+
+    case GAME_PROP_WIN:
+      g_value_set_boolean (value, self->win);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
+    }
+}
+
+static void
+sweeper_game_class_init (SweeperGameClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->dispose = sweeper_game_dispose;
+  gobject_class->get_property = sweeper_game_get_property;
+
+  game_properties[GAME_PROP_HEIGHT] =
+    g_param_spec_uint ("height",
+                       "height",
+                       "height of the game grid",
+                       1, G_MAXUINT, 8,
+                       G_PARAM_READABLE);
+
+  game_properties[GAME_PROP_PLAYING] =
+    g_param_spec_boolean ("playing",
+                          "playing",
+                          "if the game is still going on",
+                          FALSE,
+                          G_PARAM_READABLE);
+
+  game_properties[GAME_PROP_WIDTH] =
+    g_param_spec_uint ("width",
+                       "width",
+                       "width of the game grid",
+                       1, G_MAXUINT, 8,
+                       G_PARAM_READABLE);
+
+  game_properties[GAME_PROP_WIN] =
+    g_param_spec_boolean ("win",
+                          "win",
+                          "if the game was won",
+                          FALSE,
+                          G_PARAM_READABLE);
+
+  g_object_class_install_properties (gobject_class, N_GAME_PROPS, game_properties);
+}
+
+static void
+sweeper_game_reset_board (SweeperGame *self,
+                          guint        width,
+                          guint        height)
+{
+  guint i;
+
+  g_ptr_array_set_size (self->cells, 0);
+
+  for (i = 0; i < width * height; i++)
+    {
+      g_ptr_array_add (self->cells, sweeper_cell_new ());
+    }
+
+  if (self->width != width)
+    {
+      self->width = width;
+      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIDTH]);
+    }
+  if (self->height != height)
+    {
+      self->height = height;
+      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_HEIGHT]);
+    }
+  if (!self->playing)
+    {
+      self->playing = TRUE;
+      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
+    }
+  if (self->win)
+    {
+      self->win = FALSE;
+      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIN]);
+    }
+}
+
+static void
+sweeper_game_place_mines (SweeperGame *self,
+                          guint        n_mines)
+{
+  guint i;
+
+  for (i = 0; i < n_mines; i++)
+    {
+      SweeperCell *cell;
+
+      do {
+        cell = g_ptr_array_index (self->cells, g_random_int_range (0, self->cells->len));
+      } while (cell->is_mine);
+
+      cell->is_mine = TRUE;
+    }
+}
+
+static SweeperCell *
+get_cell (SweeperGame *self,
+          guint        x,
+          guint        y)
+{
+  return g_ptr_array_index (self->cells, y * self->width + x);
+}
+
+static void
+sweeper_game_count_neighbor_mines (SweeperGame *self,
+                                   guint        width,
+                                   guint        height)
+{
+  guint x, y, x2, y2;
+
+  for (y = 0; y < height; y++)
+    {
+      for (x = 0; x < width; x++)
+        {
+          SweeperCell *cell = get_cell (self, x, y);
+
+          for (y2 = MAX (1, y) - 1; y2 < MIN (height, y + 2); y2++)
+            {
+              for (x2 = MAX (1, x) - 1; x2 < MIN (width, x + 2); x2++)
+                {
+                  SweeperCell *other = get_cell (self, x2, y2);
+
+                  if (other->is_mine)
+                    cell->neighbor_mines++;
+                }
+            }
+        }
+    }
+}
+
+static void
+sweeper_game_new_game (SweeperGame *self,
+                       guint        width,
+                       guint        height,
+                       guint        n_mines)
+{
+  guint n_items_before;
+
+  g_return_if_fail (n_mines <= width * height);
+
+  n_items_before = self->width * self->height;
+
+  g_object_freeze_notify (G_OBJECT (self));
+
+  sweeper_game_reset_board (self, width, height);
+  sweeper_game_place_mines (self, n_mines);
+  sweeper_game_count_neighbor_mines (self, width, height);
+
+  g_list_model_items_changed (G_LIST_MODEL (self), 0, n_items_before, width * height);
+
+  g_object_thaw_notify (G_OBJECT (self));
+}
+
+static void
+sweeper_game_init (SweeperGame *self)
+{
+  self->cells = g_ptr_array_new_with_free_func (g_object_unref);
+
+  sweeper_game_new_game (self, 8, 8, 10);
+}
+
+static void
+sweeper_game_end (SweeperGame *self,
+                  gboolean     win)
+{
+  if (self->playing)
+    {
+      self->playing = FALSE;
+      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
+    }
+  if (self->win != win)
+    {
+      self->win = win;
+      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIN]);
+    }
+}
+
+static void
+sweeper_game_check_finished (SweeperGame *self)
+{
+  guint i;
+
+  if (!self->playing)
+    return;
+
+  for (i = 0; i < self->cells->len; i++)
+    {
+      SweeperCell *cell = g_ptr_array_index (self->cells, i);
+
+      /* There's still a non-revealed cell that isn't a mine */
+      if (!cell->is_visible && !cell->is_mine)
+        return;
+    }
+
+  sweeper_game_end (self, TRUE);
+}
+
+static void
+sweeper_game_reveal_cell (SweeperGame *self,
+                          guint        position)
+{
+  SweeperCell *cell;
+
+  if (!self->playing)
+    return;
+
+  cell = g_ptr_array_index (self->cells, position);
+  sweeper_cell_reveal (cell);
+
+  if (cell->is_mine)
+    sweeper_game_end (self, FALSE);
+
+  sweeper_game_check_finished (self);
+}
+
+void
+minesweeper_cell_clicked_cb (GtkGridView *gridview,
+                             guint        pos,
+                             SweeperGame *game)
+{
+  sweeper_game_reveal_cell (game, pos);
+}
+
+void
+minesweeper_new_game_cb (GtkButton   *button,
+                         SweeperGame *game)
+{
+  sweeper_game_new_game (game, 8, 8, 10);
+}
+
+static GtkWidget *window = NULL;
+
+GtkWidget *
+do_listview_minesweeper (GtkWidget *do_widget)
+{
+  if (window == NULL)
+    {
+      GtkBuilder *builder;
+
+      g_type_ensure (SWEEPER_TYPE_GAME);
+
+      builder = gtk_builder_new_from_resource ("/listview_minesweeper/listview_minesweeper.ui");
+      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);
+
+      g_object_unref (builder);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_window_destroy (GTK_WINDOW (window));
+
+  return window;
+}

demos/gtk-demo/listview_minesweeper.ui

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="SweeperGame" id="game">
+  </object>
+  <object class="GtkWindow" id="window">
+    <property name="title" translatable="yes">Minesweeper</property>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="">
+        <property name="show-title-buttons">1</property>
+        <child>
+          <object class="GtkButton">
+            <property name="label">New Game</property>
+            <signal name="clicked" handler="minesweeper_new_game_cb" object="game" swapped="no"/>
+          </object>
+        </child>
+        <child type="title">
+          <object class="GtkImage">
+            <property name="icon-name">trophy-gold</property>
+            <binding name="visible">
+              <lookup name="win">game</lookup>
+            </binding>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkGridView" id="view">
+        <property name="model">
+          <object class="GtkNoSelection">
+            <property name="model">game</property>
+          </object>
+        </property>
+        <property name="single-click-activate">1</property>
+        <binding name="max-columns">
+          <lookup name="width">game</lookup>
+        </binding>
+        <binding name="min-columns">
+          <lookup name="width">game</lookup>
+        </binding>
+        <property name="factory">
+          <object class="GtkBuilderListItemFactory">
+            <property name="resource">/listview_minesweeper/listview_minesweeper_cell.ui</property>
+          </object>
+        </property>
+        <signal name="activate" handler="minesweeper_cell_clicked_cb" object="game" swapped="no"/>
+      </object>
+    </child>
+  </object>
+</interface>

demos/gtk-demo/listview_minesweeper_cell.ui

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="GtkListItem">
+    <property name="child">
+      <object class="GtkLabel">
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <binding name="label">
+          <lookup name="label" type="SweeperCell">
+            <lookup name="item">GtkListItem</lookup>
+          </lookup>
+        </binding>
+      </object>
+    </property>
+  </template>
+</interface>