wip: Fix inspector inspect button

Disable window test

See merge request GNOME/gtk!1540

.clang-format

@@ -0,0 +1,11 @@
+# See https://wiki.apertis.org/Guidelines/Coding_conventions#Code_formatting
+BasedOnStyle: GNU
+AlwaysBreakAfterDefinitionReturnType: All
+BreakBeforeBinaryOperators: None
+BinPackParameters: false
+SpaceAfterCStyleCast: true
+# Our column limit is actually 80, but setting that results in clang-format
+# making a lot of dubious hanging-indent choices; disable it and assume the
+# developer will line wrap appropriately. clang-format will still check
+# existing hanging indents.
+ColumnLimit: 0

.gitlab-ci.yml

@@ -1,7 +1,9 @@
 stages:
   - build
+  - analysis
+  - docs
   - flatpak
-#  - deploy
+  - deploy
 
 .cache-paths: &cache-paths
   paths:
@@ -12,16 +14,45 @@ stages:
     - subprojects/libepoxy/
     - subprojects/pango/
 
-fedora-x86_64: &fedora-x86_64-defaults
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v8
-  stage: build
+# Common variables
+variables:
+  COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
+  MESON_TEST_TIMEOUT_MULTIPLIER: 2
+
+.only-default:
+  only:
+    - branches
+  except:
+    - tags
+
+style-check-diff:
+  extends: .only-default
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
+  stage: .pre
+  allow_failure: true
   script:
-    - bash -x ./.gitlab-ci/test-docker.sh
+    - .gitlab-ci/run-style-check-diff.sh
+
+fedora-x86_64:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
+  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
+            -Dprofiler=true
+            _build
+    - ninja -C _build
+    - .gitlab-ci/run-tests.sh _build
   artifacts:
     when: always
     reports:
       junit:
-        - "${CI_PROJECT_DIR}/_build/report.xml" 
+        - "${CI_PROJECT_DIR}/_build/report.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
@@ -29,14 +60,41 @@ fedora-x86_64: &fedora-x86_64-defaults
       - "${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
 
-fedora-x86_64-staticlibs:
+release-build:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
+  stage: build
   variables:
-    EXTRA_MESON_FLAGS: "-Ddefault_library=both"
-  <<: *fedora-x86_64-defaults
+    EXTRA_MESON_FLAGS: "--buildtype=release"
+  script:
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
+            -Dx11-backend=true
+            -Dwayland-backend=true
+            -Dbroadway-backend=true
+            -Dvulkan=yes
+            _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
 
 .mingw-defaults: &mingw-defaults
   stage: build
@@ -58,6 +116,9 @@ msys2-mingw32:
 .flatpak-defaults: &flatpak-defaults
   image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
   stage: flatpak
+  allow_failure: true
+  tags:
+    - flatpak
   artifacts:
     paths:
       - "${APPID}-dev.flatpak"
@@ -106,19 +167,41 @@ flatpak-master:icon-browser:
     APPID: org.gtk.IconBrowser4
   <<: *flatpak-master
 
-#pages:
-#  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
-#  stage: deploy 
-#  script:
-#    - meson -Dgtk_doc=true _build .
-#    - ninja -C _build
-#    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-#    - mkdir -p public/
-#    - mv _build/docs/reference/gtk/html/ public/gtk/
-#    - mv _build/docs/reference/gdk/html/ public/gdk/
-#    - mv _build/docs/reference/gsk/html/ public/gsk/
-#  artifacts:
-#    paths:
-#      - public
-#  only:
-#    - master
+static-scan:
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
+  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: registry.gitlab.gnome.org/gnome/gtk/fedora:v14
+  stage: docs
+  variables:
+    EXTRA_MESON_FLAGS: "--buildtype=release"
+  script:
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true _build
+    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
+    - 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
+  only:
+    - master

.gitlab-ci/README.md

@@ -0,0 +1,38 @@
+## GTK CI infrastructure
+
+GTK uses different CI images depending on platform and jobs.
+
+The CI images are Docker containers, generated either using `docker` or
+`podman`, and pushed to the GitLab [container registry][registry].
+
+Each Docker image has a tag composed of two parts:
+
+ - `${image}`: the base image for a given platform, like "fedora" or
+   "debian-stable"
+ - `${number}`: an incremental version number, or `latest`
+
+See the [container registry][registry] for the available images for each
+branch, as well as their available versions.
+
+### Checklist for Updating a CI image
+
+ - [ ] Update the `${image}.Dockerfile` file with the dependencies
+ - [ ] Run `./run-docker.sh build --base ${image} --base-version ${number}`
+ - [ ] Run `./run-docker.sh push --base ${image} --base-version ${number}`
+   once the Docker image is built; you may need to log in by using
+   `docker login` or `podman login`
+ - [ ] Update the `image` keys in the `.gitlab-ci.yml` file with the new
+   image tag
+ - [ ] Open a merge request with your changes and let it run
+
+### Checklist for Adding a new CI image
+
+ - [ ] Write a new `${image}.Dockerfile` with the instructions to set up
+   a build environment
+ - [ ] Add the `pip3 install meson` incantation
+ - [ ] Run `./run-docker.sh build --base ${image} --base-version ${number}`
+ - [ ] Run `./run-docker.sh push --base ${image} --base-version ${number}`
+ - [ ] Add the new job to `.gitlab-ci.yml` referencing the image
+ - [ ] Open a merge request with your changes and let it run
+
+[registry]: https://gitlab.gnome.org/GNOME/gtk/container_registry

.gitlab-ci/clang-format-diff.py

@@ -0,0 +1,133 @@
+#!/usr/bin/env python3
+#
+# === clang-format-diff.py - ClangFormat Diff Reformatter ---*- python -*-=== #
+#
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# ===---------------------------------------------------------------------=== #
+
+"""
+This script reads input from a unified diff and reformats all the changed
+lines. This is useful to reformat all the lines touched by a specific patch.
+Example usage for git/svn users:
+
+  git diff -U0 --no-color HEAD^ | clang-format-diff.py -p1 -i
+  svn diff --diff-cmd=diff -x-U0 | clang-format-diff.py -i
+
+"""
+from __future__ import absolute_import, division, print_function
+
+import argparse
+import difflib
+import re
+import subprocess
+import sys
+
+if sys.version_info.major >= 3:
+    from io import StringIO
+else:
+    from io import BytesIO as StringIO
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description=__doc__,
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser.add_argument('-i', action='store_true', default=False,
+                        help='apply edits to files instead of displaying a '
+                             'diff')
+    parser.add_argument('-p', metavar='NUM', default=0,
+                        help='strip the smallest prefix containing P slashes')
+    parser.add_argument('-regex', metavar='PATTERN', default=None,
+                        help='custom pattern selecting file paths to reformat '
+                        '(case sensitive, overrides -iregex)')
+    parser.add_argument('-iregex', metavar='PATTERN',
+                        default=r'.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hh|hpp|m|mm|inc'
+                                r'|js|ts|proto|protodevel|java|cs)',
+                        help='custom pattern selecting file paths to reformat '
+                             '(case insensitive, overridden by -regex)')
+    parser.add_argument('-sort-includes', action='store_true', default=False,
+                        help='let clang-format sort include blocks')
+    parser.add_argument('-v', '--verbose', action='store_true',
+                        help='be more verbose, ineffective without -i')
+    parser.add_argument('-style',
+                        help='formatting style to apply (LLVM, Google, '
+                        'Chromium, Mozilla, WebKit)')
+    parser.add_argument('-binary', default='clang-format',
+                        help='location of binary to use for clang-format')
+    args = parser.parse_args()
+
+    # Extract changed lines for each file.
+    filename = None
+    lines_by_file = {}
+    for line in sys.stdin:
+        match = re.search(r'^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line)
+        if match:
+            filename = match.group(2)
+        if filename is None:
+            continue
+
+        if args.regex is not None:
+            if not re.match('^%s$' % args.regex, filename):
+                continue
+        else:
+            if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
+                continue
+
+        match = re.search(r'^@@.*\+(\d+)(,(\d+))?', line)
+        if match:
+            start_line = int(match.group(1))
+            line_count = 1
+            if match.group(3):
+                line_count = int(match.group(3))
+            if line_count == 0:
+                continue
+            end_line = start_line + line_count - 1
+            lines_by_file.setdefault(filename, []).extend(
+                ['-lines', str(start_line) + ':' + str(end_line)])
+
+    # Reformat files containing changes in place.
+    # We need to count amount of bytes generated in the output of
+    # clang-format-diff. If clang-format-diff doesn't generate any bytes it
+    # means there is nothing to format.
+    format_line_counter = 0
+    for filename, lines in lines_by_file.items():
+        if args.i and args.verbose:
+            print('Formatting {}'.format(filename))
+        command = [args.binary, filename]
+        if args.i:
+            command.append('-i')
+        if args.sort_includes:
+            command.append('-sort-includes')
+        command.extend(lines)
+        if args.style:
+            command.extend(['-style', args.style])
+        p = subprocess.Popen(command,
+                             stdout=subprocess.PIPE,
+                             stderr=None,
+                             stdin=subprocess.PIPE,
+                             universal_newlines=True)
+        stdout, _ = p.communicate()
+        if p.returncode != 0:
+            sys.exit(p.returncode)
+
+        if not args.i:
+            with open(filename) as f:
+                code = f.readlines()
+            formatted_code = StringIO(stdout).readlines()
+            diff = difflib.unified_diff(code, formatted_code,
+                                        filename, filename,
+                                        '(before formatting)',
+                                        '(after formatting)')
+            diff_string = ''.join(diff)
+            if diff_string:
+                format_line_counter += sys.stdout.write(diff_string)
+
+    if format_line_counter > 0:
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()

.gitlab-ci/fedora.Dockerfile

@@ -8,6 +8,8 @@ RUN dnf -y install \
     cairo-devel \
     cairo-gobject-devel \
     ccache \
+    clang \
+    clang-analyzer \
     colord-devel \
     cups-devel \
     dbus-daemon \
@@ -23,6 +25,7 @@ RUN dnf -y install \
     gettext \
     git \
     glib2-devel \
+    glib2-static \
     glibc-devel \
     glibc-headers \
     gobject-introspection-devel \
@@ -61,12 +64,15 @@ RUN dnf -y install \
     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 \
@@ -75,7 +81,7 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
  && dnf clean all
 
-RUN pip3 install meson==0.50.1
+RUN pip3 install meson==0.52.1
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/flatpak-build.sh

@@ -4,20 +4,19 @@ set -e
 
 appid=$1
 
-builddir=app
+builddir=flatpak_app
 repodir=repo
 
 flatpak-builder \
+        --user --disable-rofiles-fuse \
         --stop-at=gtk \
         ${builddir} \
         build-aux/flatpak/${appid}.json
 
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        meson \
-                --prefix /app \
-                --libdir /app/lib \
-                --buildtype debug \
+flatpak build ${builddir} meson \
+                --prefix=/app \
+                --libdir=/app/lib \
+                --buildtype=release \
                 -Dx11-backend=true \
                 -Dwayland-backend=true \
                 -Dprint-backends=file \
@@ -25,13 +24,12 @@ flatpak-builder \
                 -Dbuild-examples=false \
                 -Dintrospection=false \
                 -Ddemos=true \
-                _build .
-
-flatpak-builder \
-        --run ${builddir} build-aux/flatpak/${appid}.json \
-        ninja -C _build install
+                _flatpak_build
+
+flatpak build ${builddir} ninja -C _flatpak_build install
 
 flatpak-builder \
+        --user --disable-rofiles-fuse \
         --finish-only \
         --repo=${repodir} \
         ${builddir} \
@@ -40,5 +38,5 @@ flatpak-builder \
 flatpak build-bundle \
         ${repodir} \
         ${appid}-dev.flatpak \
-        --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \
+        --runtime-repo=https://nightly.gnome.org/gnome-nightly.flatpakrepo \
         ${appid}

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

@@ -138,22 +138,25 @@ ul.images li {
 </head>
 <body>
   <header>
-    <h1>{{ report.project_name }} :: Test Reports</h1>
-    <div class="report-meta">
-      <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 %}
-    </div>
+    <h1>{{ report.project_name }}/{{ report.branch_name }} :: Test Reports</h1>
   </header>
 
   <article>
+    <section>
+      <div class="report-meta">
+        <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 %}
+      </div>
+    </section>
+
     <section>
       <div class="summary">
         <h3><a name="summary">Summary</a></h3>
         <ul>
           <li><strong>Total units:</strong> {{ report.total_units }}</li>
-          <li><strong>Passed:</strong> <a href="#passed">{{ report.total_successes }}</a></li>
-          <li><strong>Failed:</strong> <a href="#failures">{{ report.total_failures }}</a></li>
+          <li><strong>Failed:</strong> {{ report.total_failures }}</li>
+          <li><strong>Passed:</strong> {{ report.total_successes }}</li>
         </ul>
       </div>
     </section>
@@ -164,54 +167,14 @@ ul.images li {
         <h3><a name="results">Suite: {{ suite_result.suite_name }}</a></h3>
         <ul>
           <li><strong>Units:</strong> {{ suite_result.n_units }}</li>
-          <li><strong>Passed:</strong> {{ suite_result.n_successes }}</li>
-          <li><strong>Failed:</strong> {{ suite_result.n_failures }}</li>
+          <li><strong>Failed:</strong> <a href="#{{ suite_result.suite_name }}-failed">{{ suite_result.n_failures }}</a></li>
+          <li><strong>Passed:</strong> <a href="#{{ suite_result.suite_name }}-passed">{{ suite_result.n_successes }}</a></li>
         </ul>
 
-        <div class="successes">
-          <h4><a 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="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="expected-fail">Expected failures</a></h4>
-          <ul>
-          {% for success in suite_result.successes if success.result == 'EXPECTEDFAIL' %}
-            <li><a name="{{ success.name }}">{{ success.name }}</a> - result: <span class="result xfail">{{ success.result }}</span><br/>
-            {% if success.stdout %}
-              Output: <pre>{{ success.stdout }}</pre>
-            {% endif %}
-            {% if success.image_data is defined %}
-              <ul class="images">
-                <li><img alt="ref" src="{{ success.image_data.ref }}" /></li>
-                <li><img alt="out" src="{{ success.image_data.out }}" /></li>
-                <li><img alt="diff" src="{{ success.image_data.diff }}" /></li>
-              </ul>
-            {% endif %}
-            </li>
-          {% else %}
-            <li>None</li>
-          {% endfor %}
-          </ul>
-        </div>
-
         <div class="failures">
-          <h4><a name="failed">Failed</a></h4>
+          <h4><a name="{{ suite_result.suite_name }}-failed">Failures</a></h4>
           <ul class="failed">
-            {% for failure in suite_result.failures if failure.result == 'FAIL' %}
+            {% for failure in suite_result.failures if failure.result in [ '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>
@@ -229,7 +192,7 @@ ul.images li {
             {% endfor %}
           </ul>
 
-          <h4><a name="timed-out">Timed out</a></h4>
+          <h4><a name="{{ suite_result.suite_name }}-timed-out">Timed out</a></h4>
           <ul class="failed">
             {% for failure in suite_result.failures if failure.result == 'TIMEOUT' %}
             <li><a name="{{ failure.name }}">{{ failure.name }}</a> - result: <span class="result fail">{{ failure.result }}</span><br/>
@@ -243,6 +206,46 @@ ul.images li {
           </ul>
         </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' %}
+            <li><a name="{{ success.name }}">{{ success.name }}</a> - result: <span class="result xfail">{{ success.result }}</span><br/>
+            {% if success.stdout %}
+              Output: <pre>{{ success.stdout }}</pre>
+            {% endif %}
+            {% if success.image_data is defined %}
+              <ul class="images">
+                <li><img alt="ref" src="{{ success.image_data.ref }}" /></li>
+                <li><img alt="out" src="{{ success.image_data.out }}" /></li>
+                <li><img alt="diff" src="{{ success.image_data.diff }}" /></li>
+              </ul>
+            {% endif %}
+            </li>
+          {% else %}
+            <li>None</li>
+          {% endfor %}
+          </ul>
+        </div>
+
       </div>
     </section>
     {% endfor %}
@@ -328,7 +331,7 @@ for name, units in suites.items():
     print('Processing {} suite {}:'.format(project_name, suite_name))
 
     def if_failed(unit):
-        if unit['result'] in ['FAIL', 'TIMEOUT']:
+        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
             return True
         return False
 

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

@@ -51,6 +51,7 @@ for line in args.infile:
 
     duration = data['duration']
     return_code = data['returncode']
+    result = data['result']
     log = data['stdout']
 
     unit = {
@@ -58,6 +59,7 @@ for line in args.infile:
         'name': unit_name,
         'duration': duration,
         'returncode': return_code,
+        'result': result,
         'stdout': log,
     }
 
@@ -68,12 +70,12 @@ for name, units in suites.items():
     print('Processing suite {} (units: {})'.format(name, len(units)))
 
     def if_failed(unit):
-        if unit['returncode'] != 0:
+        if unit['result'] in ['FAIL', 'UNEXPECTEDPASS', 'TIMEOUT']:
             return True
         return False
 
     def if_succeded(unit):
-        if unit['returncode'] == 0:
+        if unit['result'] in ['OK', 'EXPECTEDFAIL', 'SKIP']:
             return True
         return False
 

.gitlab-ci/run-docker.sh

@@ -1,11 +1,135 @@
 #!/bin/bash
 
+read_arg() {
+    # $1 = arg name
+    # $2 = arg value
+    # $3 = arg parameter
+    local rematch='^[^=]*=(.*)$'
+    if [[ $2 =~ $rematch ]]; then
+        read "$1" <<< "${BASH_REMATCH[1]}"
+    else
+        read "$1" <<< "$3"
+        # There is no way to shift our callers args, so
+        # return 1 to indicate they should do it instead.
+        return 1
+    fi
+}
+
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v7"
+build=0
+run=0
+push=0
+list=0
+print_help=0
+no_login=0
 
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
-    --file "Dockerfile" .
-sudo docker run --rm --security-opt label=disable \
-    --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "${TAG}" bash
+while (($# > 0)); do
+        case "${1%%=*}" in
+                build) build=1;;
+                run) run=1;;
+                push) push=1;;
+                list) list=1;;
+                help) print_help=1;;
+                --base|-b) read_arg base "$@" || shift;;
+                --base-version) read_arg base_version "$@" || shift;;
+                --no-login) no_login=1;;
+                *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
+        esac
+        shift
+done
+
+if [ $print_help == 1 ]; then
+        echo "$0 - Build and run Docker images"
+        echo ""
+        echo "Usage: $0 <command> [options] [basename]"
+        echo ""
+        echo "Available commands"
+        echo ""
+        echo "  build --base=<BASENAME> - Build Docker image <BASENAME>.Dockerfile"
+        echo "  run --base=<BASENAME>   - Run Docker image <BASENAME>"
+        echo "  push --base=<BASENAME>  - Push Docker image <BASENAME> to the registry"
+        echo "  list                    - List available images"
+        echo "  help                    - This help message"
+        echo ""
+        exit 0
+fi
+
+cd "$(dirname "$0")"
+
+if [ $list == 1 ]; then
+        echo "Available Docker images:"
+        for f in *.Dockerfile; do
+                filename=$( basename -- "$f" )
+                basename="${filename%.*}"
+
+                echo -e "  \e[1;39m$basename\e[0m"
+        done
+        exit 0
+fi
+
+# All commands after this require --base to be set
+if [ -z $base ]; then
+        echo "Usage: $0 <command>"
+        exit 1
+fi
+
+if [ ! -f "$base.Dockerfile" ]; then
+        echo -e "\e[1;31mERROR\e[0m: Dockerfile for '$base' not found"
+        exit 1
+fi
+
+if [ -z $base_version ]; then
+        base_version="latest"
+else
+        base_version="v$base_version"
+fi
+
+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 socker"
+fi
+
+REGISTRY="registry.gitlab.gnome.org"
+TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
+
+if [ $build == 1 ]; then
+        echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
+        ${CMD} build \
+                ${format} \
+                --build-arg HOST_USER_ID="$UID" \
+                --tag "${TAG}" \
+                --file "${base}.Dockerfile" .
+        exit $?
+fi
+
+if [ $push == 1 ]; then
+        echo -e "\e[1;32mPUSHING\e[0m: ${base} as ${TAG}"
+
+        if [ $no_login == 0 ]; then
+                ${CMD} login ${REGISTRY}
+        fi
+
+        ${CMD} push ${TAG}
+        exit $?
+fi
+
+if [ $run == 1 ]; then
+        echo -e "\e[1;32mRUNNING\e[0m: ${base} as ${TAG}"
+        ${CMD} run \
+                --rm \
+                --volume "$(pwd)/..:/home/user/app" \
+                --workdir "/home/user/app" \
+                --tty \
+                --interactive "${TAG}" \
+                bash
+        exit $?
+fi

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

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+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
+
+# 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
+# `upstream/master` or `upstream/gtk-3-24`).
+#
+# `${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)
+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
+# function arguments. The documented coding style for GTK takes priority over
+# clang-format suggestions. Hopefully we can eventually improve clang-format to
+# be configurable enough for our coding style. That’s why this CI check is OK
+# to fail: the idea is that people can look through the output and ignore it if
+# it’s wrong. (That situation can also happen if someone touches pre-existing
+# badly formatted code and it doesn’t make sense to tidy up the wider coding
+# style with the changes they’re making.)
+echo ""
+echo "Note that clang-format output is advisory and cannot always match the"
+echo "GTK coding style, documented at:"
+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

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set +x
+set +e
+
+srcdir=$( pwd )
+builddir=$1
+
+export GDK_BACKEND=x11
+xvfb-run -a -s "-screen 0 1024x768x24" \
+        meson test -C ${builddir} \
+                --print-errorlogs \
+                --suite=gtk \
+                --no-suite=gtk:a11y
+
+# Store the exit code for the CI run, but always
+# generate the reports
+exit_code=$?
+
+cd ${builddir}
+
+$srcdir/.gitlab-ci/meson-junit-report.py \
+        --project-name=gtk \
+        --job-id="${CI_JOB_NAME}" \
+        --output=report.xml \
+        meson-logs/testlog.json
+$srcdir/.gitlab-ci/meson-html-report.py \
+        --project-name=gtk \
+        --job-id="${CI_JOB_NAME}" \
+        --reftest-output-dir="testsuite/reftests/output" \
+        --output=report.html \
+        meson-logs/testlog.json
+
+exit $exit_code

.gitlab-ci/test-docker.sh

@@ -16,6 +16,7 @@ meson \
         -Dwayland-backend=true \
         -Dbroadway-backend=true \
         -Dvulkan=yes \
+        -Dprofiler=true \
         --werror \
         ${EXTRA_MESON_FLAGS:-} \
         _build $srcdir

NEWS

@@ -1,3 +1,141 @@
+Overview of Changes in GTK 3.98.1
+=================================
+
+* revealer: Fix size allocation at small scales
+
+* GL: Share programs between renderers to speed up initialization
+
+* clean up profiler marks
+
+* OS X: Fix OpenGL extension detection
+
+* 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
+
+* GtkSpinner:
+ - Rename active property to spinning
+
+* 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
+
+* 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
+ - Rename gdk_surface_input_shape_combine_region to
+   gdk_surface_set_input_region
+
+* Broadway: implement scaling
+
+* 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
+
+* Split GtkEventControllerFocus from GtkEventControllerKey
+
+* Translation updates:
+ Dutch
+ Japanese
+ Persian
+
+
+Overview of Changes in GTK 3.98.0
+=================================
+
+  While this release gets significantly closer to what we aim for in GTK 4,
+  there are still a few big items outstanding that we are currently working
+  on:
+
+  - Event controllers for keyboard shortcuts
+  - Movable popovers
+  - Row-recycling list and grid views
+  - Revamped accessibility infrastructure
+  - Animation API
+
+  We will do further 3.98.x snapshots as these land.
+
+  *****************
+
+* The DND refactoring has been completed. The GTK API for DND has been turned
+  into event controllers: GtkDragSource and GtkDropTarget. Support for file
+  transfers via file transfer portal has been added for both DND and the clipboard.
+
+* Child surfaces have been removed. GDK only supports toplevel and popup surfaces
+  now. The client-side window implementation has been removed too. On the GTK side,
+  the GtkNative interface has been introduced for widgets that have their own
+  surface. This cleanup is not 100% complete yet.
+
+* Global positions and related apis such as gdk_surface_move are no longer available.
+  
+* A constraint-based layout manager has been added.
+
+* Many classes have been made explicitly non-subclassable, and the widget hierarchy
+  has been simplified, by making widgets derive directly from GtkWidget instead of
+  a container.
+
+* Menu-related changes:
+ - GtkMenu, GtkMenuBar and related classes have been removed. They are being replaced
+   by GMenu and popover-based variants. Popover menus can now do traditional, nested
+   menus, and model buttons show accelerators.
+ - Context menus are no longer created with ::populate-popup signals, but use menu
+   models and actions.
+ - Widget actions can be created in class_init, with gtk_widget_class_install_action.
+ - GtkToolbar has been removed as well.
+
+* Text-related changed:
+ - Text cursor blinking has been made smooth.
+ - GtkTextView is caching rendernodes for the visible text range now, improving the
+   scrolling performance of text.
+ - Add a simple undo stack for text edits has been added.
+
+* The native Win32 filechooser backend supports choices.
+
+* GtkTreeView renders tree and grid lines with textures.
+
+* GtkEmojiChooser has been made public.
+
+* GtkGestureMultiPress has been renamed to GtkGestureClick.
+
+* GtkWidget has api to handle style classes: gtk_widget_add_style_class.
+  This is the first step towards moving away from GtkStyleContext.
+
+* X11-specific changes:
+ - XI2 is now mandatory
+ - The xim input method has been removed
+
+* Wayland-specific changes:
+ - The loading of cursor themes has been improved to load cursors on demand,
+   and no longer relies on libwayland-cursor.
+
+* The GL renderer is now sharing icon and glyph caches for all surfaces,
+  and has better support for blurring and shadow rendering.
+
+* Performance-related changes:
+ - GTK provides profiling information for Sysprof when launched with GTK_TRACE=1.
+ - Css computation has been optimized
+ - Css lookups are using a Bloom filter
+ - Icon loading IO has been moved to a thread
+
+
 Overview of Changes in GTK+ 3.96.0
 ==================================
 
@@ -360,7 +498,7 @@ Overview of Changes in GTK+ 3.92.1, 重庆市
 The bulk of the preparation for this release was done during
 and after the fantastic GNOME.Asia Summit 2017 in Chongqing, China.
 
-* Drop autotools support. Meson 0.42.1 is now required
+ * Drop autotools support. Meson 0.42.1 is now required
 
 * Implement most of CSS3 font-variant
 

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

@@ -54,6 +54,36 @@
                 }
             ]
         },
+        {
+            "name" : "libsass",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts": [
+                "--libdir=/app/lib"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/lazka/libsass.git",
+                    "branch" : "meson"
+                }
+            ]
+        },
+        {
+            "name" : "sassc",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts": [
+                "--libdir=/app/lib"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/lazka/sassc.git",
+                    "branch" : "meson"
+                }
+            ]
+        },
         {
             "name": "gtk",
             "buildsystem": "meson",

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

@@ -54,6 +54,36 @@
                 }
             ]
         },
+        {
+            "name" : "libsass",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts": [
+                "--libdir=/app/lib"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/lazka/libsass.git",
+                    "branch" : "meson"
+                }
+            ]
+        },
+        {
+            "name" : "sassc",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts": [
+                "--libdir=/app/lib"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/lazka/sassc.git",
+                    "branch" : "meson"
+                }
+            ]
+        },
         {
             "name": "gtk",
             "buildsystem": "meson",

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

@@ -54,6 +54,36 @@
                 }
             ]
         },
+        {
+            "name" : "libsass",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts": [
+                "--libdir=/app/lib"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/lazka/libsass.git",
+                    "branch" : "meson"
+                }
+            ]
+        },
+        {
+            "name" : "sassc",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts": [
+                "--libdir=/app/lib"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://github.com/lazka/sassc.git",
+                    "branch" : "meson"
+                }
+            ]
+        },
         {
             "name": "gtk",
             "buildsystem": "meson",

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_widget_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));
 }
@@ -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)
@@ -440,7 +454,7 @@ 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");
@@ -587,7 +601,10 @@ 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);

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);
@@ -258,7 +258,7 @@ constraint_view_add_guide (ConstraintView *view,
 
   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");
+  g_object_set_data (G_OBJECT (frame), "internal", (char *)"yes");
   gtk_container_add (GTK_CONTAINER (frame), label);
   gtk_widget_insert_after (frame, GTK_WIDGET (view), NULL);
 
@@ -276,7 +276,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/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);

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 {
@@ -14,7 +15,7 @@ typedef struct {
   GtkWidget *message;
   GtkWidget *infobar;
   GtkWidget *status;
-  GtkWidget *menutool;
+  GtkWidget *menubutton;
   GMenuModel *toolmenu;
   GtkTextBuffer *buffer;
 
@@ -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);
@@ -428,8 +430,8 @@ demo_application_window_init (DemoApplicationWindow *window)
 
   gtk_widget_init_template (GTK_WIDGET (window));
 
-  popover = gtk_popover_menu_new_from_model (window->menutool, window->toolmenu);
-  gtk_menu_tool_button_set_popover (GTK_MENU_TOOL_BUTTON (window->menutool), popover);
+  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),
                                    win_entries, G_N_ELEMENTS (win_entries),
@@ -477,7 +479,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;
 }
@@ -528,7 +530,7 @@ demo_application_window_class_init (DemoApplicationWindowClass *class)
   gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, infobar);
   gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, status);
   gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, buffer);
-  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, menutool);
+  gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, menubutton);
   gtk_widget_class_bind_template_child (widget_class, DemoApplicationWindow, toolmenu);
   gtk_widget_class_bind_template_callback (widget_class, clicked_cb);
   gtk_widget_class_bind_template_callback (widget_class, update_statusbar);

demos/gtk-demo/application.ui

@@ -8,27 +8,24 @@
     <child>
       <object class="GtkGrid">
         <child>
-          <object class="GtkToolbar">
+          <object class="GtkBox">
             <property name="hexpand">1</property>
-            <style>
-              <class name="primary-toolbar"/>
-            </style>
             <child>
-              <object class="GtkMenuToolButton" id="menutool">
+              <object class="GtkMenuButton" id="menubutton">
                 <property name="icon-name">document-open</property>
               </object>
             </child>
             <child>
-              <object class="GtkToolButton">
+              <object class="GtkButton">
                 <property name="icon-name">application-exit</property>
                 <property name="action-name">app.quit</property>
               </object>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem"/>
+              <object class="GtkSeparator"/>
             </child>
             <child>
-              <object class="GtkToolButton">
+              <object class="GtkButton">
                 <property name="icon-name">applications-other</property>
                 <property name="action-name">win.logo</property>
               </object>

demos/gtk-demo/assistant.c

@@ -7,7 +7,7 @@
 
 #include <gtk/gtk.h>
 
-static GtkWidget *assistant = NULL;
+/*static GtkWidget *assistant = NULL;*/
 static GtkWidget *progress_bar = NULL;
 
 static gboolean
@@ -27,8 +27,7 @@ apply_changes_gradually (gpointer data)
   else
     {
       /* Close automatically once changes are fully applied. */
-      gtk_widget_destroy (assistant);
-      assistant = NULL;
+      gtk_widget_destroy (data);
       return G_SOURCE_REMOVE;
     }
 }
@@ -37,7 +36,7 @@ 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
@@ -94,7 +93,10 @@ 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);
@@ -117,7 +119,10 @@ 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");
@@ -167,6 +172,8 @@ create_page4 (GtkWidget *assistant)
 GtkWidget*
 do_assistant (GtkWidget *do_widget)
 {
+  static GtkWidget *assistant;
+
   if (!assistant)
     {
       assistant = gtk_assistant_new ();

demos/gtk-demo/builder.c

@@ -63,7 +63,6 @@ GtkWidget *
 do_builder (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
-  GtkWidget *toolbar;
   GActionGroup *actions;
 
   if (!window)
@@ -77,9 +76,6 @@ do_builder (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
-      toolbar = GTK_WIDGET (gtk_builder_get_object (builder, "toolbar1"));
-      gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
-                                   "primary-toolbar");
       actions = (GActionGroup*)g_simple_action_group_new ();
       g_action_map_add_action_entries (G_ACTION_MAP (actions),
                                        win_entries, G_N_ELEMENTS (win_entries),

demos/gtk-demo/clipboard.c

@@ -15,7 +15,7 @@
 
 static GtkWidget *window = NULL;
 
-void
+static void
 copy_button_clicked (GtkWidget *button,
                      gpointer   user_data)
 {
@@ -31,7 +31,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)
@@ -75,7 +75,7 @@ paste_received (GObject      *source_object,
     }
 }
 
-void
+static void
 paste_button_clicked (GtkWidget *button,
                       gpointer   user_data)
 {
@@ -98,7 +98,7 @@ get_image_paintable (GtkImage *image)
 {
   const gchar *icon_name;
   GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
+  GtkIconPaintable *icon;
 
   switch (gtk_image_get_storage_type (image))
     {
@@ -107,10 +107,18 @@ get_image_paintable (GtkImage *image)
     case GTK_IMAGE_ICON_NAME:
       icon_name = gtk_image_get_icon_name (image);
       icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (image)));
-      icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, 48, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
-      if (icon_info == NULL)
+      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 gtk_icon_info_load_icon (icon_info, 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));
@@ -133,62 +141,31 @@ drag_begin (GtkDragSource *source,
     }
 }
 
-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);
-}
+  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (image));
 
-static void
-got_texture (GObject *source,
-             GAsyncResult *result,
-             gpointer data)
-{
-  GdkDrop *drop = GDK_DROP (source);
-  GtkWidget *image = data;
-  const GValue *value;
-  GError *error = NULL;
+  if (!GDK_IS_TEXTURE (paintable))
+    return 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);
-    }
+  return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, paintable);
 }
 
 static gboolean
 drag_drop (GtkDropTarget *dest,
-           GdkDrop       *drop,
-           int            x,
-           int            y,
-           GtkWidget     *widget)
+           const GValue  *value,
+           double         x,
+           double         y,
+           GtkImage      *image)
 {
-  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;
-    }
+  GdkTexture *texture = g_value_get_object (value);
+  gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (texture));
 
-  return FALSE;
+  return TRUE;
 }
 
 static void
@@ -248,7 +225,8 @@ pressed_cb (GtkGesture *gesture,
   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));
+  popover = gtk_popover_menu_new_from_model (G_MENU_MODEL (menu));
+  gtk_widget_set_parent (popover, image);
 
   gtk_popover_set_pointing_to (GTK_POPOVER (popover), &(GdkRectangle) { x, y, 1, 1});
   gtk_popover_popup (GTK_POPOVER (popover));
@@ -273,9 +251,8 @@ do_clipboard (GtkWidget *do_widget)
       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");
@@ -284,7 +261,10 @@ do_clipboard (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &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);
 
@@ -293,7 +273,10 @@ do_clipboard (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
+      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_container_add (GTK_CONTAINER (vbox), hbox);
 
       /* Create the first entry */
@@ -310,7 +293,10 @@ do_clipboard (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
+      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_container_add (GTK_CONTAINER (vbox), hbox);
 
       /* Create the second entry */
@@ -327,7 +313,10 @@ do_clipboard (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      g_object_set (hbox, "margin", 8, NULL);
+      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_container_add (GTK_CONTAINER (vbox), hbox);
 
       /* Create the first image */
@@ -342,10 +331,8 @@ do_clipboard (GtkWidget *do_widget)
       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);
+      dest = gtk_drop_target_new (GDK_TYPE_TEXTURE, GDK_ACTION_COPY);
+      g_signal_connect (dest, "drop", G_CALLBACK (drag_drop), image);
       gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
 
       /* context menu on image */
@@ -373,10 +360,8 @@ do_clipboard (GtkWidget *do_widget)
       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);
+      dest = gtk_drop_target_new (GDK_TYPE_TEXTURE, GDK_ACTION_COPY);
+      g_signal_connect (dest, "drop", G_CALLBACK (drag_drop), image);
       gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (dest));
 
       /* context menu on image */

demos/gtk-demo/colorsel.c

@@ -16,7 +16,7 @@ static GtkWidget *frame;
 /* draw callback for the drawing area
  */
 static void
-draw_function (GtkDrawingArea *da,
+draw_function (GtkDrawingArea *drawing_area,
                cairo_t        *cr,
                int             width,
                int             height,
@@ -69,7 +69,7 @@ do_colorsel (GtkWidget *do_widget)
       color.green = 0;
       color.alpha = 1;
 
-      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), "Color Chooser");
@@ -79,7 +79,10 @@ do_colorsel (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox, "margin", 12, NULL);
+      gtk_widget_set_margin_start (vbox, 12);
+      gtk_widget_set_margin_end (vbox, 12);
+      gtk_widget_set_margin_top (vbox, 12);
+      gtk_widget_set_margin_bottom (vbox, 12);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       /*

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,7 +311,7 @@ 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");
@@ -319,7 +320,10 @@ do_combobox (GtkWidget *do_widget)
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-    g_object_set (vbox, "margin", 10, NULL);
+    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_container_add (GTK_CONTAINER (window), vbox);
 
     /* A combobox demonstrating cell renderers, separators and
@@ -329,7 +333,10 @@ do_combobox (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
+    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_container_add (GTK_CONTAINER (frame), box);
 
     model = create_icon_store ();
@@ -370,7 +377,10 @@ do_combobox (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
+    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_container_add (GTK_CONTAINER (frame), box);
 
     model = create_capital_store ();
@@ -398,7 +408,10 @@ do_combobox (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
+    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_container_add (GTK_CONTAINER (frame), box);
 
     combo = gtk_combo_box_text_new_with_entry ();
@@ -416,7 +429,10 @@ do_combobox (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (vbox), frame);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    g_object_set (box, "margin", 5, NULL);
+    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_container_add (GTK_CONTAINER (frame), box);
 
     combo = gtk_combo_box_text_new ();

demos/gtk-demo/constraints.c

@@ -255,7 +255,7 @@ 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));
 
      header = gtk_header_bar_new ();

demos/gtk-demo/constraints2.c

@@ -211,7 +211,7 @@ 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));
 
      header = gtk_header_bar_new ();

demos/gtk-demo/constraints3.c

@@ -131,7 +131,7 @@ 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));
 
      header = gtk_header_bar_new ();

demos/gtk-demo/css_accordion.c

@@ -24,7 +24,7 @@ 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);

demos/gtk-demo/css_basics.c

@@ -72,7 +72,7 @@ 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);

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" },

demos/gtk-demo/css_multiplebgs.c

@@ -86,7 +86,7 @@ do_css_multiplebgs (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), "Multiple Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);

demos/gtk-demo/css_pixbufs.c

@@ -72,7 +72,7 @@ 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);

demos/gtk-demo/css_shadows.c

@@ -58,26 +58,23 @@ apply_css (GtkWidget *widget, GtkStyleProvider *provider)
     gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }
 
-GtkWidget *
+static GtkWidget *
 create_toolbar (void)
 {
   GtkWidget *toolbar;
-  GtkToolItem *item;
+  GtkWidget *item;
 
-  toolbar = gtk_toolbar_new ();
+  toolbar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_widget_set_valign (toolbar, GTK_ALIGN_CENTER);
 
-  item = gtk_tool_button_new (NULL, NULL);
-  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "go-next");
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+  item = gtk_button_new_from_icon_name ("go-next");
+  gtk_container_add (GTK_CONTAINER (toolbar), item);
 
-  item = gtk_tool_button_new (NULL, NULL);
-  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "go-previous");
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+  item = gtk_button_new_from_icon_name ("go-previous");
+  gtk_container_add (GTK_CONTAINER (toolbar), item);
 
-  item = gtk_tool_button_new (NULL, "Hello World");
-  gtk_tool_item_set_is_important (item, TRUE);
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+  item = gtk_button_new_with_label ("Hello World");
+  gtk_container_add (GTK_CONTAINER (toolbar), item);
 
   return toolbar;
 }
@@ -94,7 +91,7 @@ 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);

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

@@ -173,7 +173,6 @@
     <file>fishbowl.c</file>
     <file>fixed.c</file>
     <file>flowbox.c</file>
-    <file>foreigndrawing.c</file>
     <file>font_features.c</file>
     <file>fontplane.c</file>
     <file>fontrendering.c</file>
@@ -200,6 +199,7 @@
     <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>
@@ -210,6 +210,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>

demos/gtk-demo/demo.ui

@@ -111,53 +111,52 @@
           </object>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar1">
+          <object class="GtkBox" id="toolbar1">
             <child internal-child="accessible">
               <object class="AtkObject" id="a11y-toolbar">
                 <property name="AtkObject::accessible-name">The toolbar</property>
               </object>
             </child>
             <child>
-              <object class="GtkToolButton">
+              <object class="GtkButton">
                 <property name="label" translatable="yes">New</property>
                 <property name="tooltip-text" translatable="yes">Create a new file</property>
                 <property name="icon-name">document-new</property>
               </object>
             </child>
             <child>
-              <object class="GtkToolButton">
+              <object class="GtkButton">
                 <property name="label" translatable="yes">Open</property>
                 <property name="tooltip-text" translatable="yes">Open a file</property>
                 <property name="icon-name">document-open</property>
               </object>
             </child>
             <child>
-              <object class="GtkToolButton">
+              <object class="GtkButton">
                 <property name="label" translatable="yes">Save</property>
                 <property name="tooltip-text" translatable="yes">Save a file</property>
                 <property name="icon-name">document-save</property>
-                <property name="is-important">1</property>
               </object>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem"/>
+              <object class="GtkSeparator"/>
             </child>
             <child>
-              <object class="GtkToolButton">
+              <object class="GtkButton">
                 <property name="label" translatable="yes">Copy</property>
                 <property name="tooltip-text" translatable="yes">Copy selected object into the clipboard</property>
                 <property name="icon-name">edit-copy</property>
               </object>
             </child>
             <child>
-              <object class="GtkToolButton">
+              <object class="GtkButton">
                 <property name="label" translatable="yes">Cut</property>
                 <property name="tooltip-text" translatable="yes">Cut selected object into the clipboard</property>
                 <property name="icon-name">edit-cut</property>
               </object>
             </child>
             <child>
-              <object class="GtkToolButton">
+              <object class="GtkButton">
                 <property name="label" translatable="yes">Paste</property>
                 <property name="tooltip-text" translatable="yes">Paste object from the clipboard</property>
                 <property name="icon-name">edit-paste</property>
@@ -168,7 +167,8 @@
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="shadow-type">in</property>
-            <property name="expand">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/dialog.c

@@ -105,7 +105,7 @@ 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");
@@ -114,11 +114,17 @@ do_dialog (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       frame = gtk_frame_new ("Dialogs");
-      g_object_set (frame, "margin", 8, NULL);
+      gtk_widget_set_margin_start (frame, 8);
+      gtk_widget_set_margin_end (frame, 8);
+      gtk_widget_set_margin_top (frame, 8);
+      gtk_widget_set_margin_bottom (frame, 8);
       gtk_container_add (GTK_CONTAINER (window), frame);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      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 (frame), vbox);
 
       /* Standard message dialog */

demos/gtk-demo/dnd.c

@@ -42,7 +42,7 @@ free_demo_widget (gpointer data)
 }
 
 #define GTK_TYPE_DEMO_WIDGET (gtk_demo_widget_get_type ())
-
+static GType gtk_demo_widget_get_type (void);
 G_DEFINE_BOXED_TYPE (GtkDemoWidget, gtk_demo_widget, copy_demo_widget, free_demo_widget)
 
 static GtkDemoWidget *
@@ -59,7 +59,7 @@ serialize_widget (GtkWidget *widget)
     }
   else if (GTK_IS_SPINNER (widget))
     {
-      g_object_get (widget, "active", &demo->active, NULL);
+      g_object_get (widget, "spinning", &demo->active, NULL);
     }
   else
     {
@@ -80,7 +80,7 @@ deserialize_widget (GtkDemoWidget *demo)
     }
   else if (demo->type == GTK_TYPE_SPINNER)
     {
-      widget = g_object_new (demo->type, "active", demo->active, NULL);
+      widget = g_object_new (demo->type, "spinning", demo->active, NULL);
       gtk_style_context_add_class (gtk_widget_get_style_context (widget), "demo");
     }
   else
@@ -240,8 +240,8 @@ edit_cb (GtkWidget *button, GtkWidget *child)
     {
       gboolean active;
 
-      g_object_get (child, "active", &active, NULL);
-      g_object_set (child, "active", !active, NULL);
+      g_object_get (child, "spinning", &active, NULL);
+      g_object_set (child, "spinning", !active, NULL);
     }
 
   if (button)
@@ -271,7 +271,8 @@ pressed_cb (GtkGesture *gesture,
       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);
@@ -356,7 +357,7 @@ do_dnd (GtkWidget *do_widget)
       GtkGesture *multipress;
       GtkCssProvider *provider;
 
-      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), "Drag-and-drop");

demos/gtk-demo/drawingarea.c

@@ -189,7 +189,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,7 +198,10 @@ 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_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_container_add (GTK_CONTAINER (window), vbox);
 
       /*

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,7 +348,7 @@ 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");
@@ -353,7 +356,10 @@ do_editable_cells (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
+      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_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_container_add (GTK_CONTAINER (vbox),

demos/gtk-demo/entry_completion.c

@@ -9,7 +9,7 @@
 #include <gtk/gtk.h>
 
 /* Creates a tree model containing the completions */
-GtkTreeModel *
+static GtkTreeModel *
 create_completion_model (void)
 {
   GtkListStore *store;
@@ -45,7 +45,7 @@ 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");
@@ -55,7 +55,10 @@ do_entry_completion (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
+      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_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);

demos/gtk-demo/entry_undo.c

@@ -20,7 +20,7 @@ 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");
@@ -29,7 +29,10 @@ do_entry_undo (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
+      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_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);

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>

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, NULL);
-  icons = g_ptr_array_new ();
-
-  for (l = icon_list; l; l = l->next)
-    {
-      if (g_str_has_suffix (l->data, "symbolic"))
-        continue;
-
-      g_ptr_array_add (icons, g_strdup (l->data));
-    }
-
-  n_icon_names = icons->len;
-  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
-  icon_names = (char **) g_ptr_array_free (icons, FALSE);
-
-  /* don't free strings, we assigned them to the array */
-  g_list_free_full (icon_list, g_free);
+  icon_names = gtk_icon_theme_get_icon_names (theme);
+  n_icon_names = g_strv_length (icon_names);
 }
 
 static const char *
@@ -55,13 +37,16 @@ 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)
 {
   GtkWidget *image;
 
-  image = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()));
+  image = gtk_image_new ();
   gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
+  gtk_image_set_from_icon_name (GTK_IMAGE (image),
+                                get_random_icon_name (gtk_icon_theme_get_for_display (gtk_widget_get_display (image))));
 
   return image;
 }
@@ -174,7 +159,7 @@ 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_autohide (GTK_POPOVER (popover), FALSE);

demos/gtk-demo/fixed.c

@@ -124,7 +124,7 @@ 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_default_size (GTK_WINDOW (window), 600, 400);

demos/gtk-demo/flowbox.c

@@ -719,7 +719,7 @@ 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");

demos/gtk-demo/font-features.ui

@@ -33,7 +33,10 @@
               <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>
@@ -109,7 +112,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;
@@ -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))
@@ -1129,7 +1129,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 +1156,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 +1217,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",

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);
@@ -218,13 +200,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++)
             {

demos/gtk-demo/foreigndrawing.c

@@ -1,984 +0,0 @@
-/* Foreign drawing
- *
- * Many applications can't use GTK widgets, for a variety of reasons,
- * but still want their user interface to appear integrated with the
- * rest of the desktop, and follow GTK themes. This demo shows how to
- * use GtkStyleContext and the gtk_render_ APIs to achieve this.
- *
- * Note that this is a very simple, non-interactive example.
- */
-
-#include <gtk/gtk.h>
-#include <string.h>
-
-static void
-append_element (GtkWidgetPath *path,
-                const char    *selector)
-{
-  static const struct {
-    const char    *name;
-    GtkStateFlags  state_flag;
-  } pseudo_classes[] = {
-    { "active",        GTK_STATE_FLAG_ACTIVE },
-    { "hover",         GTK_STATE_FLAG_PRELIGHT },
-    { "selected",      GTK_STATE_FLAG_SELECTED },
-    { "disabled",      GTK_STATE_FLAG_INSENSITIVE },
-    { "indeterminate", GTK_STATE_FLAG_INCONSISTENT },
-    { "focus",         GTK_STATE_FLAG_FOCUSED },
-    { "backdrop",      GTK_STATE_FLAG_BACKDROP },
-    { "dir(ltr)",      GTK_STATE_FLAG_DIR_LTR },
-    { "dir(rtl)",      GTK_STATE_FLAG_DIR_RTL },
-    { "link",          GTK_STATE_FLAG_LINK },
-    { "visited",       GTK_STATE_FLAG_VISITED },
-    { "checked",       GTK_STATE_FLAG_CHECKED },
-    { "drop(active)",  GTK_STATE_FLAG_DROP_ACTIVE }
-  };
-  const char *next;
-  char *name;
-  char type;
-  guint i;
-
-  next = strpbrk (selector, "#.:");
-  if (next == NULL)
-    next = selector + strlen (selector);
-
-  name = g_strndup (selector, next - selector);
-  if (g_ascii_isupper (selector[0]))
-    {
-      GType gtype;
-      gtype = g_type_from_name (name);
-      if (gtype == G_TYPE_INVALID)
-        {
-          g_critical ("Unknown type name `%s'", name);
-          g_free (name);
-          return;
-        }
-      gtk_widget_path_append_type (path, gtype);
-    }
-  else
-    {
-      /* Omit type, we're using name */
-      gtk_widget_path_append_type (path, G_TYPE_NONE);
-      gtk_widget_path_iter_set_object_name (path, -1, name);
-    }
-  g_free (name);
-
-  while (*next != '\0')
-    {
-      type = *next;
-      selector = next + 1;
-      next = strpbrk (selector, "#.:");
-      if (next == NULL)
-        next = selector + strlen (selector);
-      name = g_strndup (selector, next - selector);
-
-      switch (type)
-        {
-        case '#':
-          gtk_widget_path_iter_set_name (path, -1, name);
-          break;
-
-        case '.':
-          gtk_widget_path_iter_add_class (path, -1, name);
-          break;
-
-        case ':':
-          for (i = 0; i < G_N_ELEMENTS (pseudo_classes); i++)
-            {
-              if (g_str_equal (pseudo_classes[i].name, name))
-                {
-                  gtk_widget_path_iter_set_state (path,
-                                                  -1,
-                                                  gtk_widget_path_iter_get_state (path, -1)
-                                                  | pseudo_classes[i].state_flag);
-                  break;
-                }
-            }
-          if (i == G_N_ELEMENTS (pseudo_classes))
-            g_critical ("Unknown pseudo-class :%s", name);
-          break;
-
-        default:
-          g_assert_not_reached ();
-          break;
-        }
-
-      g_free (name);
-    }
-}
-
-static GtkStyleContext *
-create_context_for_path (GtkWidgetPath   *path,
-                         GtkStyleContext *parent)
-{
-  GtkStyleContext *context;
-
-  context = gtk_style_context_new ();
-  gtk_style_context_set_path (context, path);
-  gtk_style_context_set_parent (context, parent);
-  /* Unfortunately, we have to explicitly set the state again here
-   * for it to take effect
-   */
-  gtk_style_context_set_state (context, gtk_widget_path_iter_get_state (path, -1));
-  gtk_widget_path_unref (path);
-
-  return context;
-}
-
-static GtkStyleContext *
-get_style (GtkStyleContext *parent,
-           const char      *selector)
-{
-  GtkWidgetPath *path;
-
-  if (parent)
-    path = gtk_widget_path_copy (gtk_style_context_get_path (parent));
-  else
-    path = gtk_widget_path_new ();
-
-  append_element (path, selector);
-
-  return create_context_for_path (path, parent);
-}
-
-static GtkStyleContext *
-get_style_with_siblings (GtkStyleContext *parent,
-                         const char      *selector,
-                         const char     **siblings,
-                         gint             position)
-{
-  GtkWidgetPath *path, *siblings_path;
-  guint i;
-
-  if (parent)
-    path = gtk_widget_path_copy (gtk_style_context_get_path (parent));
-  else
-    path = gtk_widget_path_new ();
-
-  siblings_path = gtk_widget_path_new ();
-  for (i = 0; siblings[i]; i++)
-    append_element (siblings_path, siblings[i]);
-
-  gtk_widget_path_append_with_siblings (path, siblings_path, position);
-  gtk_widget_path_unref (siblings_path);
-
-  return create_context_for_path (path, parent);
-}
-
-static void
-draw_style_common (GtkStyleContext *context,
-                   cairo_t         *cr,
-                   gint             x,
-                   gint             y,
-                   gint             width,
-                   gint             height,
-                   gint            *contents_x,
-                   gint            *contents_y,
-                   gint            *contents_width,
-                   gint            *contents_height)
-{
-  GtkBorder margin, border, padding;
-  int min_width, min_height;
-
-  gtk_style_context_get_margin (context, &margin);
-  gtk_style_context_get_border (context, &border);
-  gtk_style_context_get_padding (context, &padding);
-
-  gtk_style_context_get (context,
-                         "min-width", &min_width,
-                         "min-height", &min_height,
-                         NULL);
-  x += margin.left;
-  y += margin.top;
-  width -= margin.left + margin.right;
-  height -= margin.top + margin.bottom;
-
-  width = MAX (width, min_width);
-  height = MAX (height, min_height);
-
-  gtk_render_background (context, cr, x, y, width, height);
-  gtk_render_frame (context, cr, x, y, width, height);
-
-  if (contents_x)
-    *contents_x = x + border.left + padding.left;
-  if (contents_y)
-    *contents_y = y + border.top + padding.top;
-  if (contents_width)
-    *contents_width = width - border.left - border.right - padding.left - padding.right;
-  if (contents_height)
-    *contents_height = height - border.top - border.bottom - padding.top - padding.bottom;
-}
-
-static void
-query_size (GtkStyleContext *context,
-            gint            *width,
-            gint            *height)
-{
-  GtkBorder margin, border, padding;
-  int min_width, min_height;
-
-  gtk_style_context_get_margin (context, &margin);
-  gtk_style_context_get_border (context, &border);
-  gtk_style_context_get_padding (context, &padding);
-
-  gtk_style_context_get (context,
-                         "min-width", &min_width,
-                         "min-height", &min_height,
-                         NULL);
-
-  min_width += margin.left + margin.right + border.left + border.right + padding.left + padding.right;
-  min_height += margin.top + margin.bottom + border.top + border.bottom + padding.top + padding.bottom;
-
-  if (width)
-    *width = MAX (*width, min_width);
-  if (height)
-    *height = MAX (*height, min_height);
-}
-
-static void
-draw_menu (GtkWidget *widget,
-           cairo_t   *cr,
-           gint       x,
-           gint       y,
-           gint       width,
-           gint      *height)
-{
-  GtkStyleContext *menu_context;
-  GtkStyleContext *menuitem_context;
-  GtkStyleContext *hovermenuitem_context;
-  GtkStyleContext *hoveredarrowmenuitem_context;
-  GtkStyleContext *arrowmenuitem_context;
-  GtkStyleContext *checkmenuitem_context;
-  GtkStyleContext *disabledarrowmenuitem_context;
-  GtkStyleContext *disabledcheckmenuitem_context;
-  GtkStyleContext *radiomenuitem_context;
-  GtkStyleContext *disablemenuitem_context;
-  GtkStyleContext *disabledradiomenuitem_context;
-  GtkStyleContext *separatormenuitem_context;
-  gint menuitem1_height, menuitem2_height, menuitem3_height, menuitem4_height, menuitem5_height;
-  gint contents_x, contents_y, contents_width, contents_height;
-  gint menu_x, menu_y, menu_width, menu_height;
-  gint arrow_width, arrow_height, arrow_size;
-  gint toggle_x, toggle_y, toggle_width, toggle_height;
-
-  /* This information is taken from the GtkMenu docs, see "CSS nodes" */
-  menu_context = get_style (gtk_widget_get_style_context(widget), "menu");
-  hovermenuitem_context = get_style (menu_context, "menuitem:hover");
-  hoveredarrowmenuitem_context = get_style (hovermenuitem_context, "arrow.right:dir(ltr)");
-  menuitem_context = get_style (menu_context, "menuitem");
-  arrowmenuitem_context = get_style (menuitem_context, "arrow:dir(rtl)");
-  disablemenuitem_context = get_style (menu_context, "menuitem:disabled");
-  disabledarrowmenuitem_context = get_style (disablemenuitem_context, "arrow:dir(rtl)");
-  checkmenuitem_context = get_style (menuitem_context, "check:checked");
-  disabledcheckmenuitem_context = get_style (disablemenuitem_context, "check");
-  separatormenuitem_context = get_style (menu_context, "separator:disabled");
-  radiomenuitem_context = get_style (menuitem_context, "radio:checked");
-  disabledradiomenuitem_context = get_style (disablemenuitem_context, "radio");
-
-  *height = 0;
-  query_size (menu_context, NULL, height);
-  menuitem1_height = 0;
-  query_size (hovermenuitem_context, NULL, &menuitem1_height);
-  query_size (hoveredarrowmenuitem_context, NULL, &menuitem1_height);
-  *height += menuitem1_height;
-  menuitem2_height = 0;
-  query_size (menu_context, NULL, &menuitem5_height);
-  query_size (menuitem_context, NULL, &menuitem2_height);
-  query_size (arrowmenuitem_context, NULL, &menuitem2_height);
-  query_size (disabledarrowmenuitem_context, NULL, &menuitem2_height);
-  *height += menuitem2_height;
-  menuitem3_height = 0;
-  query_size (menu_context, NULL, &menuitem5_height);
-  query_size (menuitem_context, NULL, &menuitem3_height);
-  query_size (checkmenuitem_context, NULL, &menuitem3_height);
-  query_size (disabledcheckmenuitem_context, NULL, &menuitem3_height);
-  *height += menuitem3_height;
-  menuitem4_height = 0;
-  query_size (menu_context, NULL, &menuitem5_height);
-  query_size (separatormenuitem_context, NULL, &menuitem4_height);
-  *height += menuitem4_height;
-  menuitem5_height = 0;
-  query_size (menu_context, NULL, &menuitem5_height);
-  query_size (menuitem_context, NULL, &menuitem5_height);
-  query_size (radiomenuitem_context, NULL, &menuitem5_height);
-  query_size (disabledradiomenuitem_context, NULL, &menuitem5_height);
-  *height += menuitem5_height;
-
-  draw_style_common (menu_context, cr, x, y, width, *height,
-                     &menu_x, &menu_y, &menu_width, &menu_height);
-
-  /* Hovered with right arrow */
-  gtk_style_context_get (hoveredarrowmenuitem_context,
-                         "min-width", &arrow_width, "min-height", &arrow_height, NULL);
-  arrow_size = MIN (arrow_width, arrow_height);
-  draw_style_common (hovermenuitem_context, cr, menu_x, menu_y, menu_width, menuitem1_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_arrow (hoveredarrowmenuitem_context, cr, G_PI / 2,
-                    contents_x + contents_width - arrow_size,
-                    contents_y + (contents_height - arrow_size) / 2, arrow_size);
-
-  /* Left arrow sensitive, and right arrow insensitive */
-  draw_style_common (menuitem_context, cr, menu_x, menu_y + menuitem1_height, menu_width, menuitem2_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_style_context_get (arrowmenuitem_context,
-                         "min-width", &arrow_width, "min-height", &arrow_height, NULL);
-  arrow_size = MIN (arrow_width, arrow_height);
-  gtk_render_arrow (arrowmenuitem_context, cr, G_PI / 2,
-                    contents_x,
-                    contents_y + (contents_height - arrow_size) / 2, arrow_size);
-  gtk_style_context_get (disabledarrowmenuitem_context,
-                         "min-width", &arrow_width, "min-height", &arrow_height, NULL);
-  arrow_size = MIN (arrow_width, arrow_height);
-  gtk_render_arrow (disabledarrowmenuitem_context, cr, G_PI / 2,
-                    contents_x + contents_width - arrow_size,
-                    contents_y + (contents_height - arrow_size) / 2, arrow_size);
-
-
-  /* Left check enabled, sensitive, and right check unchecked, insensitive */
-  draw_style_common (menuitem_context, cr, menu_x, menu_y + menuitem1_height + menuitem2_height, menu_width, menuitem3_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_style_context_get (checkmenuitem_context,
-                         "min-width", &toggle_width, "min-height", &toggle_height, NULL);
-  draw_style_common (checkmenuitem_context, cr,
-                     contents_x,
-                     contents_y,
-                     toggle_width, toggle_height,
-                     &toggle_x, &toggle_y, &toggle_width, &toggle_height);
-  gtk_render_check (checkmenuitem_context, cr, toggle_x, toggle_y, toggle_width, toggle_height);
-  gtk_style_context_get (disabledcheckmenuitem_context,
-                         "min-width", &toggle_width, "min-height", &toggle_height, NULL);
-  draw_style_common (disabledcheckmenuitem_context, cr,
-                     contents_x + contents_width - toggle_width,
-                     contents_y,
-                     toggle_width, toggle_height,
-                     &toggle_x, &toggle_y, &toggle_width, &toggle_height);
-  gtk_render_check (disabledcheckmenuitem_context, cr, toggle_x, toggle_y, toggle_width, toggle_height);
-
-  /* Separator */
-  draw_style_common (separatormenuitem_context, cr, menu_x, menu_y + menuitem1_height + menuitem2_height + menuitem3_height,
-                     menu_width, menuitem4_height,
-                     NULL, NULL, NULL, NULL);
-
-  /* Left check enabled, sensitive, and right check unchecked, insensitive */
-  draw_style_common (menuitem_context, cr, menu_x, menu_y + menuitem1_height + menuitem2_height + menuitem3_height + menuitem4_height,
-                     menu_width, menuitem5_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_style_context_get (radiomenuitem_context,
-                         "min-width", &toggle_width, "min-height", &toggle_height, NULL);
-  draw_style_common (radiomenuitem_context, cr,
-                     contents_x,
-                     contents_y,
-                     toggle_width, toggle_height,
-                     &toggle_x, &toggle_y, &toggle_width, &toggle_height);
-  gtk_render_check (radiomenuitem_context, cr, toggle_x, toggle_y, toggle_width, toggle_height);
-  gtk_style_context_get (disabledradiomenuitem_context,
-                         "min-width", &toggle_width, "min-height", &toggle_height, NULL);
-  draw_style_common (disabledradiomenuitem_context, cr,
-                     contents_x + contents_width - toggle_width,
-                     contents_y,
-                     toggle_width, toggle_height,
-                     &toggle_x, &toggle_y, &toggle_width, &toggle_height);
-  gtk_render_check (disabledradiomenuitem_context, cr, toggle_x, toggle_y, toggle_width, toggle_height);
-
-  g_object_unref (menu_context);
-  g_object_unref (menuitem_context);
-  g_object_unref (hovermenuitem_context);
-  g_object_unref (hoveredarrowmenuitem_context);
-  g_object_unref (arrowmenuitem_context);
-  g_object_unref (checkmenuitem_context);
-  g_object_unref (disabledarrowmenuitem_context);
-  g_object_unref (disabledcheckmenuitem_context);
-  g_object_unref (radiomenuitem_context);
-  g_object_unref (disablemenuitem_context);
-  g_object_unref (disabledradiomenuitem_context);
-  g_object_unref (separatormenuitem_context);
-}
-
-static void
-draw_menubar (GtkWidget     *widget,
-              cairo_t       *cr,
-              gint           x,
-              gint           y,
-              gint           width,
-              gint          *height)
-{
-  GtkStyleContext *frame_context;
-  GtkStyleContext *border_context;
-  GtkStyleContext *menubar_context;
-  GtkStyleContext *hovered_menuitem_context;
-  GtkStyleContext *menuitem_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-  gint item_width;
-
-  /* Menubar background is the same color as our base background, so use a frame */
-  frame_context = get_style (NULL, "frame");
-  border_context = get_style (frame_context, "border");
-
-  /* This information is taken from the GtkPopoverMenuBar docs, see "CSS nodes" */
-  menubar_context = get_style (NULL, "menubar");
-  hovered_menuitem_context = get_style (menubar_context, "menuitem:hover");
-  menuitem_context = get_style (menubar_context, "menuitem");
-
-  *height = 0;
-  query_size (frame_context, NULL, height);
-  query_size (border_context, NULL, height);
-  query_size (menubar_context, NULL, height);
-  query_size (hovered_menuitem_context, NULL, height);
-  query_size (menuitem_context, NULL, height);
-
-  draw_style_common (frame_context, cr, x, y, width, *height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (border_context, cr, x, y, width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  draw_style_common (menubar_context, cr, contents_x, contents_y, contents_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-  item_width = contents_width / 3;
-  draw_style_common (hovered_menuitem_context, cr, contents_x, contents_y, item_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (menuitem_context, cr, contents_x + item_width * 2, contents_y, item_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-
-  g_object_unref (menuitem_context);
-  g_object_unref (hovered_menuitem_context);
-  g_object_unref (menubar_context);
-  g_object_unref (border_context);
-  g_object_unref (frame_context);
-}
-
-static void
-draw_notebook (GtkWidget     *widget,
-               cairo_t       *cr,
-               gint           x,
-               gint           y,
-               gint           width,
-               gint           height)
-{
-  GtkStyleContext *notebook_context;
-  GtkStyleContext *header_context;
-  GtkStyleContext *tabs_context;
-  GtkStyleContext *tab1_context, *tab2_context;
-  GtkStyleContext *stack_context;
-  gint header_height;
-  gint contents_x, contents_y, contents_width, contents_height;
-
-  /* This information is taken from the GtkNotebook docs, see "CSS nodes" */
-  notebook_context = get_style (NULL, "notebook.frame");
-  header_context = get_style (notebook_context, "header.top");
-  tabs_context = get_style (header_context, "tabs");
-  tab1_context = get_style (tabs_context, "tab:checked");
-  tab2_context = get_style (tabs_context, "tab:hover");
-  stack_context = get_style (notebook_context, "stack");
-
-  header_height = 0;
-  query_size (notebook_context, NULL, &header_height);
-  query_size (header_context, NULL, &header_height);
-  query_size (tabs_context, NULL, &header_height);
-  query_size (tab1_context, NULL, &header_height);
-  query_size (tab2_context, NULL, &header_height);
-
-  draw_style_common (notebook_context, cr, x, y, width, height, NULL, NULL, NULL, NULL);
-  draw_style_common (header_context, cr, x, y, width, header_height, NULL, NULL, NULL, NULL);
-  draw_style_common (tabs_context, cr, x, y, width, header_height, NULL, NULL, NULL, NULL);
-  draw_style_common (tab1_context, cr, x, y, width / 2, header_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  draw_style_common (tab2_context, cr, x + width / 2, y, width / 2, header_height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (stack_context, cr, x, y + header_height, width,height - header_height,
-                     NULL, NULL, NULL, NULL);
-
-  g_object_unref (stack_context);
-  g_object_unref (tabs_context);
-  g_object_unref (tab1_context);
-  g_object_unref (tab2_context);
-  g_object_unref (header_context);
-  g_object_unref (notebook_context);
-}
-
-static void
-draw_horizontal_scrollbar (GtkWidget     *widget,
-                           cairo_t       *cr,
-                           gint           x,
-                           gint           y,
-                           gint           width,
-                           gint           position,
-                           GtkStateFlags  state,
-                           gint          *height)
-{
-  GtkStyleContext *scrollbar_context;
-  GtkStyleContext *contents_context;
-  GtkStyleContext *trough_context;
-  GtkStyleContext *slider_context;
-  gint slider_width;
-
-  /* This information is taken from the GtkScrollbar docs, see "CSS nodes" */
-  scrollbar_context = get_style (NULL, "scrollbar.horizontal.bottom");
-  contents_context = get_style (scrollbar_context, "contents");
-  trough_context = get_style (contents_context, "trough");
-  slider_context = get_style (trough_context, "slider");
-
-  gtk_style_context_set_state (scrollbar_context, state);
-  gtk_style_context_set_state (contents_context, state);
-  gtk_style_context_set_state (trough_context, state);
-  gtk_style_context_set_state (slider_context, state);
-
-  *height = 0;
-  query_size (scrollbar_context, NULL, height);
-  query_size (contents_context, NULL, height);
-  query_size (trough_context, NULL, height);
-  query_size (slider_context, NULL, height);
-
-  gtk_style_context_get (slider_context,
-                         "min-width", &slider_width, NULL);
-
-  draw_style_common (scrollbar_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (contents_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (trough_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (slider_context, cr, x + position, y, slider_width, *height, NULL, NULL, NULL, NULL);
-
-  g_object_unref (slider_context);
-  g_object_unref (trough_context);
-  g_object_unref (contents_context);
-  g_object_unref (scrollbar_context);
-}
-
-static void
-draw_text (GtkWidget     *widget,
-           cairo_t       *cr,
-           gint           x,
-           gint           y,
-           gint           width,
-           gint           height,
-           const gchar   *text,
-           GtkStateFlags  state)
-{
-  GtkStyleContext *label_context;
-  GtkStyleContext *selection_context;
-  GtkStyleContext *context;
-  PangoLayout *layout;
-
-  /* This information is taken from the GtkLabel docs, see "CSS nodes" */
-  label_context = get_style (NULL, "label.view");
-  selection_context = get_style (label_context, "selection");
-
-  gtk_style_context_set_state (label_context, state);
-
-  if (state & GTK_STATE_FLAG_SELECTED)
-    context = selection_context;
-  else
-    context = label_context;
-
-  layout = gtk_widget_create_pango_layout (widget, text);
-
-  gtk_render_background (context, cr, x, y, width, height);
-  gtk_render_frame (context, cr, x, y, width, height);
-  gtk_render_layout (context, cr, x, y, layout);
-
-  g_object_unref (layout);
-
-  g_object_unref (selection_context);
-  g_object_unref (label_context);
-}
-
-static void
-draw_check (GtkWidget     *widget,
-            cairo_t       *cr,
-            gint           x,
-            gint           y,
-            GtkStateFlags  state,
-            gint          *width,
-            gint          *height)
-{
-  GtkStyleContext *button_context;
-  GtkStyleContext *check_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-
-  /* This information is taken from the GtkCheckButton docs, see "CSS nodes" */
-  button_context = get_style (NULL, "checkbutton");
-  check_context = get_style (button_context, "check");
-
-  gtk_style_context_set_state (check_context, state);
-
-  *width = *height = 0;
-  query_size (button_context, width, height);
-  query_size (check_context, width, height);
-
-  draw_style_common (button_context, cr, x, y, *width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (check_context, cr, x, y, *width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_check (check_context, cr, contents_x, contents_y, contents_width, contents_height);
-
-  g_object_unref (check_context);
-  g_object_unref (button_context);
-
-}
-
-static void
-draw_radio (GtkWidget     *widget,
-            cairo_t       *cr,
-            gint           x,
-            gint           y,
-            GtkStateFlags  state,
-            gint          *width,
-            gint          *height)
-{
-  GtkStyleContext *button_context;
-  GtkStyleContext *check_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-
-  /* This information is taken from the GtkRadioButton docs, see "CSS nodes" */
-  button_context = get_style (NULL, "radiobutton");
-  check_context = get_style (button_context, "radio");
-
-  gtk_style_context_set_state (check_context, state);
-
-  *width = *height = 0;
-  query_size (button_context, width, height);
-  query_size (check_context, width, height);
-
-  draw_style_common (button_context, cr, x, y, *width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (check_context, cr, x, y, *width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_check (check_context, cr, contents_x, contents_y, contents_width, contents_height);
-
-  g_object_unref (check_context);
-  g_object_unref (button_context);
-
-}
-
-static void
-draw_progress (GtkWidget *widget,
-               cairo_t   *cr,
-               gint       x,
-               gint       y,
-               gint       width,
-               gint       position,
-               gint      *height)
-{
-  GtkStyleContext *bar_context;
-  GtkStyleContext *trough_context;
-  GtkStyleContext *progress_context;
-
-  /* This information is taken from the GtkProgressBar docs, see "CSS nodes" */
-  bar_context = get_style (NULL, "progressbar.horizontal");
-  trough_context = get_style (bar_context, "trough");
-  progress_context = get_style (trough_context, "progress.left");
-
-  *height = 0;
-  query_size (bar_context, NULL, height);
-  query_size (trough_context, NULL, height);
-  query_size (progress_context, NULL, height);
-
-  draw_style_common (bar_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (trough_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (progress_context, cr, x, y, position, *height, NULL, NULL, NULL, NULL);
-
-  g_object_unref (progress_context);
-  g_object_unref (trough_context);
-  g_object_unref (bar_context);
-}
-
-static void
-draw_scale (GtkWidget *widget,
-            cairo_t   *cr,
-            gint       x,
-            gint       y,
-            gint       width,
-            gint       position,
-            gint      *height)
-{
-  GtkStyleContext *scale_context;
-  GtkStyleContext *contents_context;
-  GtkStyleContext *trough_context;
-  GtkStyleContext *slider_context;
-  GtkStyleContext *highlight_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-  gint trough_height, slider_height;
-
-  scale_context = get_style (NULL, "scale.horizontal");
-  contents_context = get_style (scale_context, "contents");
-  trough_context = get_style (contents_context, "trough");
-  slider_context = get_style (trough_context, "slider");
-  highlight_context = get_style (trough_context, "highlight.top");
-
-  *height = 0;
-  query_size (scale_context, NULL, height);
-  query_size (contents_context, NULL, height);
-  query_size (trough_context, NULL, height);
-  query_size (slider_context, NULL, height);
-  query_size (highlight_context, NULL, height);
-
-  draw_style_common (scale_context, cr, x, y, width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  draw_style_common (contents_context, cr, contents_x, contents_y, contents_width, contents_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  /* Scale trough defines its size querying slider and highlight */
-  trough_height = 0;
-  query_size (trough_context, NULL, &trough_height);
-  slider_height = 0;
-  query_size (slider_context, NULL, &slider_height);
-  query_size (highlight_context, NULL, &slider_height);
-  trough_height += slider_height;
-  draw_style_common (trough_context, cr, contents_x, contents_y, contents_width, trough_height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  draw_style_common (highlight_context, cr, contents_x, contents_y,
-                     contents_width / 2, contents_height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (slider_context, cr, contents_x + position, contents_y, contents_height, contents_height,
-                     NULL, NULL, NULL, NULL);
-
-  g_object_unref (scale_context);
-  g_object_unref (contents_context);
-  g_object_unref (trough_context);
-  g_object_unref (slider_context);
-  g_object_unref (highlight_context);
-}
-
-static void
-draw_combobox (GtkWidget *widget,
-               cairo_t   *cr,
-               gint       x,
-               gint       y,
-               gint       width,
-               gboolean   has_entry,
-               gint      *height)
-{
-  GtkStyleContext *combo_context;
-  GtkStyleContext *box_context;
-  GtkStyleContext *button_context;
-  GtkStyleContext *button_box_context;
-  GtkStyleContext *entry_context;
-  GtkStyleContext *arrow_context;
-  gint contents_x, contents_y, contents_width, contents_height;
-  gint button_width;
-  gint arrow_width, arrow_height, arrow_size;
-
-  /* This information is taken from the GtkComboBox docs, see "CSS nodes" */
-  combo_context = get_style (NULL, "combobox:focus");
-  box_context = get_style (combo_context, "box.horizontal.linked");
-  if (has_entry)
-    {
-      const char *siblings[3] = { "entry.combo:focus", "button.combo" , NULL };
-
-      entry_context = get_style_with_siblings (box_context, "entry.combo:focus", siblings, 0);
-      button_context = get_style_with_siblings (box_context, "button.combo", siblings, 1);
-    }
-  else
-    {
-      const char *siblings[2] = { "button.combo" , NULL };
-
-      button_context = get_style_with_siblings (box_context, "button.combo", siblings, 0);
-    }
-  button_box_context = get_style (button_context, "box.horizontal");
-  arrow_context = get_style (button_box_context, "arrow");
-
-  *height = 0;
-  query_size (combo_context, NULL, height);
-  query_size (box_context, NULL, height);
-  if (has_entry)
-    query_size (entry_context, NULL, height);
-  query_size (button_context, NULL, height);
-  query_size (button_box_context, NULL, height);
-  query_size (arrow_context, NULL, height);
-
-  gtk_style_context_get (arrow_context,
-                         "min-width", &arrow_width, "min-height", &arrow_height, NULL);
-  arrow_size = MIN (arrow_width, arrow_height);
-
-  draw_style_common (combo_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (box_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  if (has_entry)
-    {
-      button_width = *height;
-      draw_style_common (entry_context, cr, x, y, width - button_width, *height, NULL, NULL, NULL, NULL);
-      draw_style_common (button_context, cr, x + width - button_width, y, button_width, *height,
-                         &contents_x, &contents_y, &contents_width, &contents_height);
-    }
-  else
-    {
-      button_width = width;
-      draw_style_common (button_context, cr, x, y, width, *height,
-                         &contents_x, &contents_y, &contents_width, &contents_height);
-    }
-
-  draw_style_common (button_box_context, cr, contents_x, contents_y, contents_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-  draw_style_common (arrow_context, cr, contents_x, contents_y, contents_width, contents_height,
-                     NULL, NULL, NULL, NULL);
-  gtk_render_arrow (arrow_context, cr, G_PI / 2,
-                    contents_x + contents_width - arrow_size,
-                    contents_y + (contents_height - arrow_size) / 2, arrow_size);
-
-  g_object_unref (arrow_context);
-  if (has_entry)
-    g_object_unref (entry_context);
-  g_object_unref (button_context);
-  g_object_unref (combo_context);
-}
-
-static void
-draw_spinbutton (GtkWidget *widget,
-                 cairo_t   *cr,
-                 gint       x,
-                 gint       y,
-                 gint       width,
-                 gint      *height)
-{
-  GtkStyleContext *spin_context;
-  GtkStyleContext *entry_context;
-  GtkStyleContext *up_context;
-  GtkStyleContext *down_context;
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-  GdkTexture *texture;
-  gint icon_width, icon_height, icon_size;
-  gint button_width;
-  gint contents_x, contents_y, contents_width, contents_height;
-
-  /* This information is taken from the GtkSpinButton docs, see "CSS nodes" */
-  spin_context = get_style (NULL, "spinbutton.horizontal:focus");
-  entry_context = get_style (spin_context, "entry:focus");
-  up_context = get_style (spin_context, "button.up:focus:active");
-  down_context = get_style (spin_context, "button.down:focus");
-
-  *height = 0;
-  query_size (spin_context, NULL, height);
-  query_size (entry_context, NULL, height);
-  query_size (up_context, NULL, height);
-  query_size (down_context, NULL, height);
-  button_width = *height;
-
-  draw_style_common (spin_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-  draw_style_common (entry_context, cr, x, y, width, *height, NULL, NULL, NULL, NULL);
-
-  icon_theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (widget));
-
-  gtk_style_context_get (up_context,
-                         "min-width", &icon_width, "min-height", &icon_height, NULL);
-  icon_size = MIN (icon_width, icon_height);
-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-add-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, up_context, NULL, NULL));
-  g_object_unref (icon_info);
-  draw_style_common (up_context, cr, x + width - button_width, y, button_width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_icon (up_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
-  g_object_unref (texture);
-
-  gtk_style_context_get (down_context,
-                         "min-width", &icon_width, "min-height", &icon_height, NULL);
-  icon_size = MIN (icon_width, icon_height);
-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, "list-remove-symbolic", icon_size, 0);
-  texture = GDK_TEXTURE (gtk_icon_info_load_symbolic_for_context (icon_info, down_context, NULL, NULL));
-  g_object_unref (icon_info);
-  draw_style_common (down_context, cr, x + width - 2 * button_width, y, button_width, *height,
-                     &contents_x, &contents_y, &contents_width, &contents_height);
-  gtk_render_icon (down_context, cr, texture, contents_x, contents_y + (contents_height - icon_size) / 2);
-  g_object_unref (texture);
-
-  g_object_unref (down_context);
-  g_object_unref (up_context);
-  g_object_unref (entry_context);
-  g_object_unref (spin_context);
-}
-
-static void
-draw_func (GtkDrawingArea *da,
-           cairo_t        *cr,
-           int             width,
-           int             height,
-           gpointer        data)
-{
-  GtkWidget *widget = GTK_WIDGET (da);
-  gint panewidth;
-  gint x, y;
-
-  panewidth = width / 2;
-
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_set_source_rgb (cr, 0.9, 0.9, 0.9);
-  cairo_fill (cr);
-
-  x = y = 10;
-  draw_horizontal_scrollbar (widget, cr, x, y, panewidth - 20, 30, GTK_STATE_FLAG_NORMAL, &height);
-  y += height + 8;
-  draw_horizontal_scrollbar (widget, cr, x, y, panewidth - 20, 40, GTK_STATE_FLAG_PRELIGHT, &height);
-  y += height + 8;
-  draw_horizontal_scrollbar (widget, cr, x, y, panewidth - 20, 50, GTK_STATE_FLAG_ACTIVE|GTK_STATE_FLAG_PRELIGHT, &height);
-
-  y += height + 8;
-  draw_text (widget, cr, x,  y, panewidth - 20, 20, "Not selected", GTK_STATE_FLAG_NORMAL);
-  y += 20 + 10;
-  draw_text (widget, cr, x, y, panewidth - 20, 20, "Selected", GTK_STATE_FLAG_SELECTED);
-
-  x = 10;
-  y += 20 + 10;
-  draw_check (widget, cr,  x, y, GTK_STATE_FLAG_NORMAL, &width, &height);
-  x += width + 10;
-  draw_check (widget, cr,  x, y, GTK_STATE_FLAG_CHECKED, &width, &height);
-  x += width + 10;
-  draw_radio (widget, cr,  x, y, GTK_STATE_FLAG_NORMAL, &width, &height);
-  x += width + 10;
-  draw_radio (widget, cr, x, y, GTK_STATE_FLAG_CHECKED, &width, &height);
-  x = 10;
-
-  y += height + 10;
-  draw_progress (widget, cr, x, y, panewidth - 20, 50, &height);
-
-  y += height + 10;
-  draw_scale (widget, cr, x, y, panewidth - 20, 75, &height);
-
-  y += height + 20;
-  draw_notebook (widget, cr, x, y, panewidth - 20, 160);
-
-  /* Second column */
-  x += panewidth;
-  y = 10;
-  draw_menu (widget, cr, x, y, panewidth - 20, &height);
-
-  y += height + 10;
-  draw_menubar (widget, cr, x, y, panewidth - 20, &height);
-
-  y += height + 20;
-  draw_spinbutton (widget, cr, x, y, panewidth - 20, &height);
-
-  y += height + 30;
-  draw_combobox (widget, cr, x, y, panewidth - 20, FALSE, &height);
-
-  y += height + 10;
-  draw_combobox (widget, cr, 10 + panewidth, y, panewidth - 20, TRUE, &height);
-}
-
-GtkWidget *
-do_foreigndrawing (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *da;
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_title (GTK_WINDOW (window), "Foreign drawing");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (window), box);
-      da = gtk_drawing_area_new ();
-      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 400);
-      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 400);
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_func, NULL, NULL);
-      gtk_widget_set_hexpand (da, TRUE);
-      gtk_widget_set_vexpand (da, TRUE);
-      gtk_container_add (GTK_CONTAINER (box), da);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/geninclude.py

@@ -17,9 +17,9 @@ typedef struct _Demo Demo;
 
 struct _Demo
 {
-  gchar *name;
-  gchar *title;
-  gchar *filename;
+  const char *name;
+  const char *title;
+  const char *filename;
   GDoDemoFunc func;
   Demo *children;
 };

demos/gtk-demo/gestures.c

@@ -94,9 +94,12 @@ drawing_area_draw (GtkDrawingArea *area,
       cairo_pattern_t *pat;
       cairo_matrix_t matrix;
       gdouble angle, scale;
+      gdouble x_center, y_center;
+
+      gtk_gesture_get_bounding_box_center (GTK_GESTURE (zoom), &x_center, &y_center);
 
       cairo_get_matrix (cr, &matrix);
-      cairo_matrix_translate (&matrix, width / 2, height / 2);
+      cairo_matrix_translate (&matrix, x_center, y_center);
 
       cairo_save (cr);
 
@@ -143,7 +146,7 @@ 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",

demos/gtk-demo/glarea.c

@@ -383,20 +383,23 @@ 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);
 

demos/gtk-demo/headerbar.c

@@ -23,7 +23,7 @@ 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);

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,7 +232,7 @@ 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));

demos/gtk-demo/iconscroll.c

@@ -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);
 

demos/gtk-demo/iconview.c

@@ -26,7 +26,7 @@ enum
 
 static GdkPixbuf *file_pixbuf, *folder_pixbuf;
 gchar *parent;
-GtkToolItem *up_button;
+GtkWidget *up_button;
 
 /* Loads the images for the demo and returns whether the operation succeeded */
 static void
@@ -188,8 +188,8 @@ item_activated (GtkIconView *icon_view,
 }
 
 static void
-up_clicked (GtkToolItem *item,
-            gpointer     user_data)
+up_clicked (GtkButton *item,
+            gpointer   user_data)
 {
   GtkListStore *store;
   gchar *dir_name;
@@ -209,8 +209,8 @@ up_clicked (GtkToolItem *item,
 }
 
 static void
-home_clicked (GtkToolItem *item,
-              gpointer     user_data)
+home_clicked (GtkButton *item,
+              gpointer   user_data)
 {
   GtkListStore *store;
 
@@ -248,9 +248,9 @@ do_iconview (GtkWidget *do_widget)
       GtkListStore *store;
       GtkWidget *vbox;
       GtkWidget *tool_bar;
-      GtkToolItem *home_button;
+      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),
@@ -265,23 +265,15 @@ do_iconview (GtkWidget *do_widget)
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
-      tool_bar = gtk_toolbar_new ();
+      tool_bar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (vbox), tool_bar);
 
-      up_button = gtk_tool_button_new (NULL, NULL);
-      gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up"));
-      gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (up_button), TRUE);
-      gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (up_button), "go-up");
-      gtk_tool_item_set_is_important (up_button, TRUE);
+      up_button = gtk_button_new_with_mnemonic ("_Up");
       gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-      gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), up_button, -1);
+      gtk_container_add (GTK_CONTAINER (tool_bar), up_button);
 
-      home_button = gtk_tool_button_new (NULL, NULL);
-      gtk_tool_button_set_label (GTK_TOOL_BUTTON (home_button), _("_Home"));
-      gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (home_button), TRUE);
-      gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (home_button), "go-home");
-      gtk_tool_item_set_is_important (home_button, TRUE);
-      gtk_toolbar_insert (GTK_TOOLBAR (tool_bar), home_button, -1);
+      home_button = gtk_button_new_with_mnemonic ("_Home");
+      gtk_container_add (GTK_CONTAINER (tool_bar), home_button);
 
 
       sw = gtk_scrolled_window_new (NULL, NULL);

demos/gtk-demo/iconview_edit.c

@@ -106,7 +106,7 @@ 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));

demos/gtk-demo/images.c

@@ -331,7 +331,7 @@ 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");
@@ -342,7 +342,10 @@ do_images (GtkWidget *do_widget)
                         G_CALLBACK (cleanup_callback), NULL);
 
       base_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (base_vbox, "margin", 16, NULL);
+      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_container_add (GTK_CONTAINER (window), base_vbox);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);

demos/gtk-demo/infobar.c

@@ -53,7 +53,7 @@ do_infobar (GtkWidget *do_widget)
     {
       actions = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
-      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");
@@ -61,7 +61,10 @@ do_infobar (GtkWidget *do_widget)
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &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);
 
       bar = gtk_info_bar_new ();
@@ -70,7 +73,7 @@ do_infobar (GtkWidget *do_widget)
       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_container_add (GTK_CONTAINER (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);
@@ -82,7 +85,7 @@ do_infobar (GtkWidget *do_widget)
       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_container_add (GTK_CONTAINER (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);
@@ -96,7 +99,7 @@ do_infobar (GtkWidget *do_widget)
       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_container_add (GTK_CONTAINER (bar), label);
       gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK);
 
       button = gtk_toggle_button_new_with_label ("Question");
@@ -109,7 +112,7 @@ do_infobar (GtkWidget *do_widget)
       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_container_add (GTK_CONTAINER (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);
@@ -122,7 +125,7 @@ do_infobar (GtkWidget *do_widget)
       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_container_add (GTK_CONTAINER (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);
@@ -134,7 +137,10 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      g_object_set (vbox2, "margin", 8, NULL);
+      gtk_widget_set_margin_start (vbox2, 8);
+      gtk_widget_set_margin_end (vbox2, 8);
+      gtk_widget_set_margin_top (vbox2, 8);
+      gtk_widget_set_margin_bottom (vbox2, 8);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
 
       /* Standard message dialog */

demos/gtk-demo/links.c

@@ -52,7 +52,7 @@ 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");

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,7 +253,7 @@ 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");
@@ -264,7 +262,10 @@ do_list_store (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      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);
 
       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).");

demos/gtk-demo/listbox.c

@@ -347,7 +347,7 @@ 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");

demos/gtk-demo/main.c

@@ -205,14 +205,14 @@ enum {
   STATE_IN_COMMENT
 };
 
-static gchar *tokens[] =
+static const char *tokens[] =
 {
   "/*",
   "\"",
   NULL
 };
 
-static gchar *types[] =
+static const char *types[] =
 {
   "static",
   "const ",
@@ -310,7 +310,6 @@ static gchar *types[] =
   "GtkIconView ",
   "GtkCellRendererText ",
   "GtkContainer ",
-  "GtkAccelGroup ",
   "GtkPaned ",
   "GtkPrintOperation ",
   "GtkPrintContext ",
@@ -337,7 +336,7 @@ static gchar *types[] =
   NULL
 };
 
-static gchar *control[] =
+static const char *control[] =
 {
   " if ",
   " while ",
@@ -351,11 +350,11 @@ static gchar *control[] =
   NULL
 };
 void
-parse_chars (gchar     *text,
-             gchar    **end_ptr,
-             gint      *state,
-             gchar    **tag,
-             gboolean   start)
+parse_chars (gchar       *text,
+             gchar      **end_ptr,
+             gint        *state,
+             const char **tag,
+             gboolean     start)
 {
   gint i;
   gchar *next_token;
@@ -494,7 +493,7 @@ fontify (GtkTextBuffer *source_buffer)
   gint state;
   gchar *text;
   gchar *start_ptr, *end_ptr;
-  gchar *tag;
+  const char *tag;
 
   gtk_text_buffer_create_tag (source_buffer, "source",
                               "font", "monospace",
@@ -868,7 +867,7 @@ load_file (const gchar *demoname,
 
           p = lines[i];
           state++;
-          /* Fall through */
+          G_GNUC_FALLTHROUGH;
 
         case 3:
           /* Reading program body */
@@ -876,6 +875,9 @@ load_file (const gchar *demoname,
           if (lines[i+1] != NULL)
             gtk_text_buffer_insert (source_buffer, &start, "\n", 1);
           break;
+
+        default:
+          g_assert_not_reached ();
         }
     }
 
@@ -975,7 +977,7 @@ startup (GApplication *app)
 {
   GtkBuilder *builder;
   GMenuModel *appmenu;
-  gchar *ids[] = { "appmenu", NULL };
+  const char *ids[] = { "appmenu", NULL };
 
   builder = gtk_builder_new ();
   gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);

demos/gtk-demo/main.ui

@@ -28,7 +28,6 @@
     <property name="default-width">800</property>
     <property name="default-height">600</property>
     <property name="title">GTK Demo</property>
-    <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
         <property name="show-title-buttons">1</property>
@@ -104,7 +103,8 @@
             <property name="scrollable">1</property>
             <property name="enable-popup">1</property>
             <property name="show-border">0</property>
-            <property name="expand">1</property>
+            <property name="hexpand">1</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkNotebookPage">
                 <property name="tab-expand">1</property>

demos/gtk-demo/markup.c

@@ -54,7 +54,7 @@ do_markup (GtkWidget *do_widget)
       GtkWidget *header;
       GtkWidget *show_source;
 
-      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_default_size (GTK_WINDOW (window), 450, 450);

demos/gtk-demo/meson.build

@@ -28,7 +28,6 @@ demos = files([
   'fishbowl.c',
   'fixed.c',
   'fontrendering.c',
-  'foreigndrawing.c',
   'gestures.c',
   'glarea.c',
   'headerbar.c',
@@ -52,6 +51,7 @@ demos = files([
   'paintable_mediastream.c',
   'panes.c',
   'password_entry.c',
+  'peg_solitaire.c',
   'pickers.c',
   'pixbufs.c',
   'popover.c',
@@ -62,6 +62,7 @@ demos = files([
   'search_entry.c',
   'search_entry2.c',
   'shortcuts.c',
+  'shortcut_triggers.c',
   'sidebar.c',
   'sizegroup.c',
   'sliding_puzzle.c',
@@ -112,9 +113,16 @@ gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
                                             'demo.gresource.xml',
                                             source_dir: '.')
 
+demo_cflags = []
+foreach flag: common_cflags
+  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+    demo_cflags += flag
+  endif
+endforeach
+
 executable('gtk4-demo',
            demos, demos_h, extra_demo_sources, gtkdemo_resources,
-           c_args: gtkdemo_args,
+           c_args: gtkdemo_args + demo_cflags,
            dependencies: gtkdemo_deps,
            include_directories: confinc,
            gui_app: true,
@@ -123,7 +131,7 @@ executable('gtk4-demo',
 
 executable('gtk4-demo-application',
            'application.c', gtkdemo_resources,
-           c_args: gtkdemo_args,
+           c_args: gtkdemo_args + common_cflags,
            dependencies: gtkdemo_deps,
            include_directories: confinc,
            gui_app: true,

demos/gtk-demo/modelbutton.ui

@@ -10,7 +10,10 @@
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
-        <property name="margin">80</property>
+        <property name="margin-start">80</property>
+        <property name="margin-end">80</property>
+        <property name="margin-top">80</property>
+        <property name="margin-bottom">80</property>
         <child>
           <object class="GtkMenuButton">
             <property name="popover">thing_a</property>
@@ -35,7 +38,10 @@
   <object class="GtkPopover" id="thing_a">
     <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>
         <child>
           <object class="GtkModelButton">
@@ -64,7 +70,10 @@
   <object class="GtkPopover" id="thing_b">
     <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">10</property>
         <child>
@@ -94,7 +103,10 @@
   <object class="GtkPopover" id="thing_c">
     <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">10</property>
         <child>

demos/gtk-demo/overlay.c

@@ -31,7 +31,7 @@ do_overlay (GtkWidget *do_widget)
       int i, j;
       char *text;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 500, 510);
       gtk_window_set_title (GTK_WINDOW (window), "Interactive Overlay");
 

demos/gtk-demo/overlay2.c

@@ -35,7 +35,7 @@ do_overlay2 (GtkWidget *do_widget)
       GtkTextIter start, end;
       GtkAdjustment *adjustment;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 500, 510);
       gtk_window_set_title (GTK_WINDOW (window), "Decorative Overlay");
 

demos/gtk-demo/paint.c

@@ -47,6 +47,7 @@ static const gchar *pad_colors[] = {
   "orange"
 };
 
+static GType drawing_area_get_type (void);
 G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_WIDGET)
 
 static void drawing_area_set_color (DrawingArea *area,
@@ -340,7 +341,7 @@ drawing_area_init (DrawingArea *area)
   area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
 }
 
-GtkWidget *
+static GtkWidget *
 drawing_area_new (void)
 {
   return g_object_new (drawing_area_get_type (), NULL);
@@ -384,7 +385,7 @@ do_paint (GtkWidget *toplevel)
     {
       GtkWidget *draw_area, *headerbar, *colorbutton;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       draw_area = drawing_area_new ();
       gtk_container_add (GTK_CONTAINER (window), draw_area);

demos/gtk-demo/paintable.c

@@ -156,7 +156,7 @@ do_paintable (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), "Nuclear Icon");

demos/gtk-demo/paintable_animated.c

@@ -188,7 +188,7 @@ do_paintable_animated (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), "Nuclear Animation");

demos/gtk-demo/paintable_mediastream.c

@@ -288,7 +288,7 @@ do_paintable_mediastream (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), "Nuclear MediaStream");

demos/gtk-demo/panes.c

@@ -13,7 +13,7 @@
 
 #include <gtk/gtk.h>
 
-void
+static void
 toggle_resize (GtkWidget *widget,
                GtkWidget *child)
 {
@@ -47,7 +47,7 @@ toggle_resize (GtkWidget *widget,
   g_object_unref (child);
 }
 
-void
+static void
 toggle_shrink (GtkWidget *widget,
                GtkWidget *child)
 {
@@ -81,7 +81,7 @@ toggle_shrink (GtkWidget *widget,
   g_object_unref (child);
 }
 
-GtkWidget *
+static GtkWidget *
 create_pane_options (GtkPaned    *paned,
                      const gchar *frame_label,
                      const gchar *label1,
@@ -97,7 +97,10 @@ create_pane_options (GtkPaned    *paned,
   child2 = gtk_paned_get_child2 (paned);
 
   frame = gtk_frame_new (frame_label);
-  g_object_set (frame, "margin", 4, NULL);
+  gtk_widget_set_margin_start (frame, 4);
+  gtk_widget_set_margin_end (frame, 4);
+  gtk_widget_set_margin_top (frame, 4);
+  gtk_widget_set_margin_bottom (frame, 4);
 
   table = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (frame), table);
@@ -146,7 +149,7 @@ do_panes (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));
 
@@ -159,7 +162,10 @@ do_panes (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      g_object_set (vpaned, "margin", 5, NULL);
+      gtk_widget_set_margin_start (vpaned, 5);
+      gtk_widget_set_margin_end (vpaned, 5);
+      gtk_widget_set_margin_top (vpaned, 5);
+      gtk_widget_set_margin_bottom (vpaned, 5);
       gtk_container_add (GTK_CONTAINER (vbox), vpaned);
 
       hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);

demos/gtk-demo/password_entry.c

@@ -36,7 +36,7 @@ do_password_entry (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));
       header = gtk_header_bar_new ();
@@ -49,7 +49,10 @@ do_password_entry (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-      g_object_set (box, "margin", 18, NULL);
+      gtk_widget_set_margin_start (box, 18);
+      gtk_widget_set_margin_end (box, 18);
+      gtk_widget_set_margin_top (box, 18);
+      gtk_widget_set_margin_bottom (box, 18);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       entry = gtk_password_entry_new ();

demos/gtk-demo/peg_solitaire.c

@@ -0,0 +1,356 @@
+/* Peg Solitaire
+ *
+ * This demo demonstrates how to use drag'n'drop to implement peg solitaire.
+ *
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+
+/* Create an object for the pegs that get moved around in the game.
+ *
+ * We implement the GdkPaintable interface for them, so we can use GtkPicture
+ * objects for the wholes we put the pegs into.
+ */
+#define SOLITAIRE_TYPE_PEG (solitaire_peg_get_type ())
+G_DECLARE_FINAL_TYPE (SolitairePeg, solitaire_peg, SOLITAIRE, PEG, GObject)
+
+/* Declare the struct. */
+struct _SolitairePeg
+{
+  GObject parent_instance;
+
+  int x;
+  int y;
+};
+
+struct _SolitairePegClass
+{
+  GObjectClass parent_class;
+};
+
+/* Here, we implement the functionality required by the GdkPaintable interface */
+static void
+solitaire_peg_snapshot (GdkPaintable *paintable,
+                        GdkSnapshot  *snapshot,
+                        double        width,
+                        double        height)
+{
+  /* The snapshot function is the only function we need to implement.
+   * It does the actual drawing of the paintable.
+   */
+  gtk_snapshot_append_color (snapshot,
+                             &(GdkRGBA) { 0.6, 0.3, 0.0, 1.0 },
+                             &GRAPHENE_RECT_INIT (0, 0, width, height));
+}
+
+static GdkPaintableFlags
+solitaire_peg_get_flags (GdkPaintable *paintable)
+{
+  /* The flags are very useful to let GTK know that this image
+   * is never going to change.
+   * This allows many optimizations and should therefore always
+   * be set.
+   */
+  return GDK_PAINTABLE_STATIC_CONTENTS | GDK_PAINTABLE_STATIC_SIZE;
+}
+
+static void
+solitaire_peg_paintable_init (GdkPaintableInterface *iface)
+{
+  iface->snapshot = solitaire_peg_snapshot;
+  iface->get_flags = solitaire_peg_get_flags;
+}
+
+/* When defining the GType, we need to implement the GdkPaintable interface */
+G_DEFINE_TYPE_WITH_CODE (SolitairePeg, solitaire_peg, G_TYPE_OBJECT,
+                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
+                                                solitaire_peg_paintable_init))
+
+/* Here's the boilerplate for the GObject declaration.
+ * We don't need to do anything special here, because we keep no
+ * data of our own.
+ */
+static void
+solitaire_peg_class_init (SolitairePegClass *klass)
+{
+}
+
+static void
+solitaire_peg_init (SolitairePeg *peg)
+{
+}
+
+/* Add a little setter for the peg's position.
+ * We want to track those so that we can check for legal moves
+ * during drag'n'drop operations.
+ */
+static void
+solitaire_peg_set_position (SolitairePeg *peg,
+                            guint         x,
+                            guint         y)
+{
+  peg->x = x;
+  peg->y = y;
+}
+
+/* And finally, we add a simple constructor.
+ */
+static SolitairePeg *
+solitaire_peg_new (void)
+{
+  return g_object_new (SOLITAIRE_TYPE_PEG, NULL);
+}
+
+/*** DRAG AND DROP ***/
+
+/* The user tries to start a drag operation.
+ * We check if the image contains a peg, and if so, we return the
+ * peg as the content to be dragged.
+ */
+static GdkContentProvider *
+drag_prepare (GtkDragSource *source,
+              double         x,
+              double         y,
+              GtkWidget     *image)
+{
+  GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
+
+  if (!SOLITAIRE_IS_PEG (paintable))
+    return NULL;
+
+  return gdk_content_provider_new_typed (SOLITAIRE_TYPE_PEG, paintable);
+}
+
+/* This notifies us that the drag has begun.
+ * We can now set up the icon and the widget for the ongoing drag.
+ */
+static void
+drag_begin (GtkDragSource *source,
+            GdkDrag       *drag,
+            GtkWidget     *image)
+{
+  GdkPaintable *paintable = gtk_image_get_paintable (GTK_IMAGE (image));
+
+  /* We guaranteed in the drag_prepare function above that we
+   * only start a drag if a peg is available.
+   * So let's make sure we did not screw that up.
+   */
+  g_assert (SOLITAIRE_IS_PEG (paintable));
+
+  /* We use the peg as the drag icon.
+   */
+  gtk_drag_source_set_icon (source, paintable, -2, -2);
+
+  /* We also attach it to the drag operation as custom user data,
+   * so that we can get it back later if the drag fails.
+   */
+  g_object_set_data (G_OBJECT (drag), "the peg", paintable);
+
+  /* Because we are busy dragging the peg, we want to unset it
+   * on the image.
+   */
+  gtk_image_clear (GTK_IMAGE (image));
+}
+
+/* Thie is called once a drag operation has ended (successfully or not).
+ * We want to undo what we did in drag_begin() above and react
+ * to a potential move of the peg.
+ */
+static void
+drag_end (GtkDragSource *source,
+          GdkDrag       *drag,
+          gboolean       delete_data,
+          GtkWidget     *image)
+{
+  SolitairePeg *peg;
+
+  /* If the drag was successful, we should now delete the peg.
+   * We did this in drag_begin() above to prepare for the drag, so
+   * there's no need to do anything anymore.
+   */
+  if (delete_data)
+    return;
+
+  /* However, if the drag did not succeed, we need to undo what
+   * we did in drag_begin() and reinsert the peg here.
+   * Because we used it as the drag data
+   */
+  peg = g_object_get_data (G_OBJECT (drag), "the peg");
+  gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (peg));
+}
+
+/* Whenever a new drop operation starts, we need to check if we can
+ * accept it.
+ * The default check unfortunately is not good enough, because it only
+ * checks the data type. But we also need to check if our image can
+ * even accept data.
+ */
+static gboolean
+drop_accept (GtkDropTarget *target,
+             GdkDrop       *drop,
+             GtkWidget     *image)
+{
+  /* First, check the drop is actually trying to drop a peg */
+  if (!gdk_content_formats_contain_gtype (gdk_drop_get_formats (drop), SOLITAIRE_TYPE_PEG))
+    return FALSE;
+
+  /* If the image already contains a peg, we cannot accept another one */
+  if (SOLITAIRE_IS_PEG (gtk_image_get_paintable (GTK_IMAGE (image))))
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+drop_drop (GtkDropTarget *target,
+           const GValue  *value,
+           double         x,
+           double         y,
+           GtkWidget     *image)
+{
+  GtkGrid *grid;
+  SolitairePeg *peg;
+  int image_x, image_y;
+  GtkWidget *jumped;
+
+  grid = GTK_GRID (gtk_widget_get_parent (image));
+  /* The value contains the data in the type we demanded.
+   * We demanded a SolitairePeg, so that's what we get.
+   */
+  peg = g_value_get_object (value);
+
+  /* Make sure this was a legal move. */
+  /* First, figure out the image's position in the grid. */
+  gtk_grid_query_child (grid,
+                        image,
+                        &image_x, &image_y,
+                        NULL, NULL);
+
+  /* If the peg was not moved 2 spaces horizontally or vertically,
+   * this was not a valid jump. Reject it.
+   */
+  if (!((ABS (image_x - peg->x) == 2 && image_y == peg->y) ||
+        (ABS (image_y - peg->y) == 2 && image_x == peg->x)))
+    return FALSE;
+
+  /* Get the widget that was jumped over
+   */
+  jumped = gtk_grid_get_child_at (grid,
+                                  (image_x + peg->x) / 2,
+                                  (image_y + peg->y) / 2);
+  /* If the jumped widget does not have a peg in it, this move
+   * isn't valid.
+   */
+  if (!SOLITAIRE_IS_PEG (gtk_image_get_paintable (GTK_IMAGE (jumped))))
+    return FALSE;
+
+  /* Finally, we know it's a legal move. */
+
+  /* Clear the peg of the jumped-over image */
+  gtk_image_clear (GTK_IMAGE (jumped));
+
+  /* Add the peg to this image */
+  solitaire_peg_set_position (peg, image_x, image_y);
+  gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (peg));
+
+  /* Success! */
+  return TRUE;
+}
+
+GtkWidget *
+do_peg_solitaire (GtkWidget *do_widget)
+{
+  if (!window)
+    {
+      GtkWidget *header;
+      GtkWidget *restart;
+      GtkWidget *grid;
+      GtkWidget *image;
+      int x, y;
+      GtkDragSource *source;
+      GtkDropTarget *target;
+
+      restart = gtk_button_new_from_icon_name ("view-refresh-symbolic");
+      g_signal_connect (restart, "clicked", G_CALLBACK (restart), NULL);
+
+      header = gtk_header_bar_new ();
+      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Peg Solitaire");
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
+      window = gtk_window_new ();
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Sliding Puzzle");
+      gtk_window_set_titlebar (GTK_WINDOW (window), header);
+      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      grid = gtk_grid_new ();
+      gtk_widget_set_halign (grid, GTK_ALIGN_CENTER);
+      gtk_widget_set_valign (grid, GTK_ALIGN_CENTER);
+      gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+      gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+      gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
+      gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
+      gtk_container_add (GTK_CONTAINER (window), grid);
+
+      for (x = 0; x < 7; x++)
+        {
+          for (y = 0; y < 7; y++)
+            {
+              if ((x < 2 || x >= 5) && (y < 2 || y >= 5))
+                continue;
+
+              image = gtk_image_new ();
+              if (x != 3 || y != 3)
+                {
+                  SolitairePeg *peg = solitaire_peg_new ();
+                  solitaire_peg_set_position (peg, x, y);
+                  gtk_image_set_from_paintable (GTK_IMAGE (image), GDK_PAINTABLE (peg));
+                }
+
+              gtk_grid_attach (GTK_GRID (grid), image, x, y, 1, 1);
+
+              /* Set up the drag source.
+               * This is rather straightforward: Set the supported actions
+               * (in our case, pegs can only be moved) and connect all the
+               * relevant signals.
+               * And because all drag'n'drop handling is done via event controllers,
+               * we need to add the controller to the widget.
+               */
+              source = gtk_drag_source_new ();
+              gtk_drag_source_set_actions (source, GDK_ACTION_MOVE);
+              g_signal_connect (source, "prepare", G_CALLBACK (drag_prepare), image);
+              g_signal_connect (source, "drag-begin", G_CALLBACK (drag_begin), image);
+              g_signal_connect (source, "drag-end", G_CALLBACK (drag_end), image);
+              gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (source));
+
+              /* Set up the drop target.
+               * This is more involved, because the game logic goes here.
+               */
+
+              /* First we specify the data we accept: pegs.
+               * And we only want moves.
+               */
+              target = gtk_drop_target_new (SOLITAIRE_TYPE_PEG, GDK_ACTION_MOVE);
+              /* Then we connect our signals.
+               */
+              g_signal_connect (target, "accept", G_CALLBACK (drop_accept), image);
+              g_signal_connect (target, "drop", G_CALLBACK (drop_drop), image);
+              /* Finally, like above, we add it to the widget.
+               */
+              gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (target));
+            }
+        }
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}

demos/gtk-demo/pickers.c

@@ -14,7 +14,7 @@ do_pickers (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), "Pickers");
@@ -23,7 +23,10 @@ do_pickers (GtkWidget *do_widget)
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
     table = gtk_grid_new ();
-    g_object_set (table, "margin", 20, NULL);
+    gtk_widget_set_margin_start (table, 20);
+    gtk_widget_set_margin_end (table, 20);
+    gtk_widget_set_margin_top (table, 20);
+    gtk_widget_set_margin_bottom (table, 20);
     gtk_grid_set_row_spacing (GTK_GRID (table), 3);
     gtk_grid_set_column_spacing (GTK_GRID (table), 10);
     gtk_container_add (GTK_CONTAINER (window), table);
@@ -50,7 +53,6 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_hexpand (label, TRUE);
     picker = gtk_file_chooser_button_new ("Pick a File",
                                           GTK_FILE_CHOOSER_ACTION_OPEN);
-    gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (picker), FALSE);
     gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 

demos/gtk-demo/pixbufs.c

@@ -174,7 +174,7 @@ do_pixbufs (GtkWidget *do_widget)
     {
       GError *error;
 
-      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), "Pixbufs");

demos/gtk-demo/popover.c

@@ -22,10 +22,14 @@ create_popover (GtkWidget       *parent,
 {
   GtkWidget *popover;
 
-  popover = gtk_popover_new (parent);
+  popover = gtk_popover_new ();
+  gtk_widget_set_parent (popover, parent);
   gtk_popover_set_position (GTK_POPOVER (popover), pos);
   gtk_container_add (GTK_CONTAINER (popover), child);
-  g_object_set (child, "margin", 6, NULL);
+  gtk_widget_set_margin_start (child, 6);
+  gtk_widget_set_margin_end (child, 6);
+  gtk_widget_set_margin_top (child, 6);
+  gtk_widget_set_margin_bottom (child, 6);
   gtk_widget_show (child);
 
   return popover;
@@ -99,14 +103,16 @@ day_selected_cb (GtkCalendar *calendar,
   GtkWidget *popover;
   GdkEvent *event;
   gdouble x, y;
+  GtkWidget *widget;
 
   event = gtk_get_current_event ();
 
   if (gdk_event_get_event_type (event) != GDK_BUTTON_PRESS)
     return;
 
-  gdk_event_get_coords (event, &x, &y);
-  gtk_widget_translate_coordinates (gtk_get_event_widget (event),
+  gdk_event_get_position (event, &x, &y);
+  widget = gtk_native_get_for_surface (gdk_event_get_surface (event));
+  gtk_widget_translate_coordinates (widget,
                                     GTK_WIDGET (calendar),
                                     x, y,
                                     &rect.x, &rect.y);
@@ -119,7 +125,7 @@ day_selected_cb (GtkCalendar *calendar,
 
   gtk_widget_show (popover);
 
-  g_object_unref (event);
+  gdk_event_unref (event);
 }
 
 GtkWidget *
@@ -130,10 +136,13 @@ do_popover (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Popovers");
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
-      g_object_set (box, "margin", 24, NULL);
+      gtk_widget_set_margin_start (box, 24);
+      gtk_widget_set_margin_end (box, 24);
+      gtk_widget_set_margin_top (box, 24);
+      gtk_widget_set_margin_bottom (box, 24);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       g_signal_connect (window, "destroy",

demos/gtk-demo/rotated_text.c

@@ -28,26 +28,23 @@ fancy_shape_renderer (cairo_t        *cr,
                (double) attr->ink_rect.width  / PANGO_SCALE,
                (double) attr->ink_rect.height / PANGO_SCALE);
 
-  switch (GPOINTER_TO_UINT (attr->data))
+  if (GPOINTER_TO_UINT (attr->data) == 0x2664) /* U+2665 BLACK HEART SUIT */
     {
-    case 0x2665: /* U+2665 BLACK HEART SUIT */
-      {
-        cairo_move_to (cr, .5, .0);
-        cairo_line_to (cr, .9, -.4);
-        cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
-        cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
-        cairo_close_path (cr);
-      }
-      break;
+      cairo_move_to (cr, .5, .0);
+      cairo_line_to (cr, .9, -.4);
+      cairo_curve_to (cr, 1.1, -.8, .5, -.9, .5, -.5);
+      cairo_curve_to (cr, .5, -.9, -.1, -.8, .1, -.4);
+      cairo_close_path (cr);
     }
 
-  if (!do_path) {
-    cairo_set_source_rgb (cr, 1., 0., 0.);
-    cairo_fill (cr);
-  }
+  if (!do_path)
+    {
+      cairo_set_source_rgb (cr, 1., 0., 0.);
+      cairo_fill (cr);
+    }
 }
 
-PangoAttrList *
+static PangoAttrList *
 create_fancy_attr_list_for_layout (PangoLayout *layout)
 {
   PangoAttrList *attrs;
@@ -145,13 +142,13 @@ rotated_text_draw (GtkDrawingArea *da,
   /* Draw the layout N_WORDS times in a circle */
   for (i = 0; i < N_WORDS; i++)
     {
-      int width, height;
+      int layout_width, layout_height;
 
       /* Inform Pango to re-layout the text with the new transformation matrix */
       pango_cairo_update_layout (cr, layout);
 
-      pango_layout_get_pixel_size (layout, &width, &height);
-      cairo_move_to (cr, - width / 2, - RADIUS * .9);
+      pango_layout_get_pixel_size (layout, &layout_width, &layout_height);
+      cairo_move_to (cr, - layout_width / 2, - RADIUS * .9);
       pango_cairo_show_layout (cr, layout);
 
       /* Rotate for the next turn */
@@ -178,7 +175,7 @@ do_rotated_text (GtkWidget *do_widget)
       PangoLayout *layout;
       PangoAttrList *attrs;
 
-      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), "Rotated Text");

demos/gtk-demo/scale.ui

@@ -24,7 +24,10 @@
       <object class="GtkGrid" id="grid1">
         <property name="row-spacing">10</property>
         <property name="column-spacing">10</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>
         <child>
           <object class="GtkLabel" id="label_plain">
             <property name="label">Plain</property>

demos/gtk-demo/search_entry.c

@@ -185,13 +185,13 @@ text_changed (GObject *object,
               gpointer data)
 {
   GtkEntry *entry = GTK_ENTRY (object);
-  GActionMap *actions = data;
+  GActionMap *action_map = data;
   GAction *action;
   gboolean has_text;
 
   has_text = gtk_entry_get_text_length (entry) > 0;
 
-  action = g_action_map_lookup_action (actions, "clear");
+  action = g_action_map_lookup_action (action_map, "clear");
   g_simple_action_set_enabled (G_SIMPLE_ACTION (action), has_text);
 }
 
@@ -250,7 +250,7 @@ do_search_entry (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), "Search Entry");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
@@ -258,7 +258,10 @@ do_search_entry (GtkWidget *do_widget)
                         G_CALLBACK (search_entry_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
+      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_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new (NULL);

demos/gtk-demo/search_entry2.c

@@ -68,7 +68,7 @@ do_search_entry2 (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Delayed Search Entry");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);

demos/gtk-demo/shortcut_triggers.c

@@ -0,0 +1,91 @@
+/* Shortcuts
+ *
+ * GtkShortcut is the abstraction used by GTK to handle shortcuts from
+ * keyboard or other input devices.
+ *
+ * Shortcut triggers can be used to weave complex sequences of key
+ * presses into sophisticated mechanisms to activate shortcuts.
+ *
+ * This demo code shows creative ways to do that.
+ */
+
+#include <gtk/gtk.h>
+
+static GtkWidget *window = NULL;
+
+static gboolean
+shortcut_activated (GtkWidget *widget,
+                    GVariant  *unused,
+                    gpointer   row)
+{
+  g_print ("activated %s\n", gtk_label_get_label (row));
+  return TRUE;
+}
+
+static GtkShortcutTrigger *
+create_ctrl_g (void)
+{
+  return gtk_keyval_trigger_new (GDK_KEY_g, GDK_CONTROL_MASK);
+}
+
+static GtkShortcutTrigger *
+create_x (void)
+{
+  return gtk_keyval_trigger_new (GDK_KEY_x, 0);
+}
+
+struct {
+  const char *description;
+  GtkShortcutTrigger * (* create_trigger_func) (void);
+} shortcuts[] = {
+  { "Press Ctrl-G", create_ctrl_g },
+  { "Press X", create_x },
+};
+
+GtkWidget *
+do_shortcut_triggers (GtkWidget *do_widget)
+{
+  guint i;
+
+  if (!window)
+    {
+      GtkWidget *list;
+      GtkEventController *controller;
+
+      window = gtk_window_new ();
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      gtk_window_set_title (GTK_WINDOW (window), "Shortcuts");
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      list = gtk_list_box_new ();
+      g_object_set (list, "margin", 6, NULL);
+      gtk_container_add (GTK_CONTAINER (window), list);
+
+      for (i = 0; i < G_N_ELEMENTS (shortcuts); i++)
+        {
+          GtkShortcut *shortcut;
+          GtkWidget *row;
+
+          row = gtk_label_new (shortcuts[i].description);
+          gtk_container_add (GTK_CONTAINER (list), row);
+
+          controller = gtk_shortcut_controller_new ();
+          gtk_shortcut_controller_set_scope (GTK_SHORTCUT_CONTROLLER (controller), GTK_SHORTCUT_SCOPE_GLOBAL);
+          gtk_widget_add_controller (row, controller);
+
+          shortcut = gtk_shortcut_new (shortcuts[i].create_trigger_func(),
+                                       gtk_callback_action_new (shortcut_activated, row, NULL));
+          gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), shortcut);
+        }
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}

demos/gtk-demo/shortcuts.c

@@ -76,7 +76,7 @@ do_shortcuts (GtkWidget *do_widget)
   if (!icons_added)
     {
       icons_added = TRUE;
-      gtk_icon_theme_add_resource_path (gtk_icon_theme_get_default (), "/icons");
+      gtk_icon_theme_add_resource_path (gtk_icon_theme_get_for_display (gtk_widget_get_display (do_widget)), "/icons");
     }
 
   g_type_ensure (G_TYPE_FILE_ICON);

demos/gtk-demo/shortcuts.ui

@@ -5,7 +5,10 @@
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
-        <property name="margin">50</property>
+        <property name="margin-start">50</property>
+        <property name="margin-end">50</property>
+        <property name="margin-top">50</property>
+        <property name="margin-end">50</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkButton">

demos/gtk-demo/sidebar.c

@@ -35,7 +35,7 @@ do_sidebar (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_widget_set_size_request (window, 500, 350);
 

demos/gtk-demo/sizegroup.c

@@ -100,7 +100,7 @@ do_sizegroup (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), "Size Groups");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
@@ -108,7 +108,10 @@ do_sizegroup (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      g_object_set (vbox, "margin", 5, NULL);
+      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_container_add (GTK_CONTAINER (window), vbox);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -119,7 +122,10 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       table = gtk_grid_new ();
-      g_object_set (table, "margin", 5, NULL);
+      gtk_widget_set_margin_start (table, 5);
+      gtk_widget_set_margin_end (table, 5);
+      gtk_widget_set_margin_top (table, 5);
+      gtk_widget_set_margin_bottom (table, 5);
       gtk_grid_set_row_spacing (GTK_GRID (table), 5);
       gtk_grid_set_column_spacing (GTK_GRID (table), 10);
       gtk_container_add (GTK_CONTAINER (frame), table);
@@ -132,7 +138,10 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (vbox), frame);
 
       table = gtk_grid_new ();
-      g_object_set (table, "margin", 5, NULL);
+      gtk_widget_set_margin_start (table, 5);
+      gtk_widget_set_margin_end (table, 5);
+      gtk_widget_set_margin_top (table, 5);
+      gtk_widget_set_margin_bottom (table, 5);
       gtk_grid_set_row_spacing (GTK_GRID (table), 5);
       gtk_grid_set_column_spacing (GTK_GRID (table), 10);
       gtk_container_add (GTK_CONTAINER (frame), table);

demos/gtk-demo/sliding_puzzle.c

@@ -160,47 +160,13 @@ check_solved (GtkWidget *grid)
 }
 
 static gboolean
-puzzle_key_pressed (GtkEventControllerKey *controller,
-                    guint                  keyval,
-                    guint                  keycode,
-                    GdkModifierType        state,
-                    GtkWidget             *grid)
+puzzle_key_pressed (GtkWidget *grid,
+                    GVariant  *args,
+                    gpointer   unused)
 {
   int dx, dy;
 
-  dx = 0;
-  dy = 0;
-
-  switch (keyval)
-    {
-    case GDK_KEY_KP_Left:
-    case GDK_KEY_Left:
-      /* left */
-      dx = -1;
-      break;
-
-    case GDK_KEY_KP_Up:
-    case GDK_KEY_Up:
-      /* up */
-      dy = -1;
-      break;
-
-    case GDK_KEY_KP_Right:
-    case GDK_KEY_Right:
-      /* right */
-      dx = 1;
-      break;
-
-    case GDK_KEY_KP_Down:
-    case GDK_KEY_Down:
-      /* down */
-      dy = 1;
-      break;
-
-    default:
-      /* We return FALSE here because we didn't handle the key that was pressed */
-      return FALSE;
-    }
+  g_variant_get (args, "(ii)", &dx, &dy);
 
   if (!move_puzzle (grid, dx, dy))
     {
@@ -277,7 +243,25 @@ puzzle_button_pressed (GtkGestureClick *gesture,
 }
 
 static void
-start_puzzle (GdkPaintable *puzzle)
+add_move_binding (GtkShortcutController *controller,
+                  guint                  keyval,
+                  guint                  kp_keyval,
+                  int                    dx,
+                  int                    dy)
+{
+  GtkShortcut *shortcut;
+
+  shortcut = gtk_shortcut_new_with_arguments (
+                 gtk_alternative_trigger_new (gtk_keyval_trigger_new (keyval, 0),
+                                              gtk_keyval_trigger_new (kp_keyval, 0)),
+                 gtk_callback_action_new (puzzle_key_pressed, NULL, NULL),
+                 "(ii)", dx, dy);
+  gtk_shortcut_controller_add_shortcut (controller, shortcut);
+  g_object_unref (shortcut);
+}
+
+static void
+start_puzzle (GdkPaintable *paintable)
 {
   GtkWidget *picture, *grid;
   GtkEventController *controller;
@@ -293,17 +277,26 @@ start_puzzle (GdkPaintable *puzzle)
   grid = gtk_grid_new ();
   gtk_widget_set_can_focus (grid, TRUE);
   gtk_container_add (GTK_CONTAINER (frame), grid);
-  aspect_ratio = gdk_paintable_get_intrinsic_aspect_ratio (puzzle);
+  aspect_ratio = gdk_paintable_get_intrinsic_aspect_ratio (paintable);
   if (aspect_ratio == 0.0)
     aspect_ratio = 1.0;
   gtk_aspect_frame_set (GTK_ASPECT_FRAME (frame), 0.5, 0.5, aspect_ratio, FALSE);
 
-  /* Add a key event controller so people can use the arrow
+  /* Add shortcuts so people can use the arrow
    * keys to move the puzzle */
-  controller = gtk_event_controller_key_new ();
-  g_signal_connect (controller, "key-pressed",
-                    G_CALLBACK (puzzle_key_pressed),
-                    grid);
+  controller = gtk_shortcut_controller_new ();
+  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
+                    GDK_KEY_Left, GDK_KEY_KP_Left,
+                    -1, 0);
+  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
+                    GDK_KEY_Right, GDK_KEY_KP_Right,
+                    1, 0);
+  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
+                    GDK_KEY_Up, GDK_KEY_KP_Up,
+                    0, -1);
+  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
+                    GDK_KEY_Down, GDK_KEY_KP_Down,
+                    0, 1);
   gtk_widget_add_controller (GTK_WIDGET (grid), controller);
 
   controller = GTK_EVENT_CONTROLLER (gtk_gesture_click_new ());
@@ -332,7 +325,7 @@ start_puzzle (GdkPaintable *puzzle)
           if (x == pos_x && y == pos_y)
             piece = NULL;
           else
-            piece = gtk_puzzle_piece_new (puzzle,
+            piece = gtk_puzzle_piece_new (paintable,
                                           x, y,
                                           width, height);
           picture = gtk_picture_new_for_paintable (piece);
@@ -390,7 +383,7 @@ reconfigure (void)
 }
 
 static void
-add_choice (GtkWidget    *choices,
+add_choice (GtkWidget    *container,
             GdkPaintable *paintable)
 {
   GtkWidget *icon;
@@ -398,7 +391,7 @@ add_choice (GtkWidget    *choices,
   icon = gtk_image_new_from_paintable (paintable);
   gtk_image_set_icon_size (GTK_IMAGE (icon), GTK_ICON_SIZE_LARGE);
 
-  gtk_container_add (GTK_CONTAINER (choices), icon);
+  gtk_container_add (GTK_CONTAINER (container), icon);
 }
 
 GtkWidget *
@@ -421,7 +414,10 @@ do_sliding_puzzle (GtkWidget *do_widget)
       tweaks = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (tweaks), 10);
       gtk_grid_set_column_spacing (GTK_GRID (tweaks), 10);
-      g_object_set (tweaks, "margin", 10, NULL);
+      gtk_widget_set_margin_start (tweaks, 10);
+      gtk_widget_set_margin_end (tweaks, 10);
+      gtk_widget_set_margin_top (tweaks, 10);
+      gtk_widget_set_margin_bottom (tweaks, 10);
 
       choices = gtk_flow_box_new ();
       gtk_style_context_add_class (gtk_widget_get_style_context (choices), GTK_STYLE_CLASS_VIEW);
@@ -448,7 +444,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
       gtk_grid_attach (GTK_GRID (tweaks), apply, 1, 2, 1, 1);
       g_signal_connect (apply, "clicked", G_CALLBACK (reconfigure), NULL);
 
-      popover = gtk_popover_new (NULL);
+      popover = gtk_popover_new ();
       gtk_container_add (GTK_CONTAINER (popover), tweaks);
 
       tweak = gtk_menu_button_new ();
@@ -462,7 +458,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
       gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), tweak);
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Sliding Puzzle");

demos/gtk-demo/spinbutton.c

@@ -106,7 +106,7 @@ spinbutton_time_spin_output (GtkSpinButton *spin_button)
   return TRUE;
 }
 
-static gchar *month[12] = {
+static const char *month[12] = {
   "January",
   "February",
   "March",

demos/gtk-demo/spinbutton.ui

@@ -27,7 +27,10 @@
     <property name="title" translatable="yes">Spin Button</property>
     <child>
       <object class="GtkGrid">
-        <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/gtk-demo/spinner.c

@@ -52,7 +52,10 @@ do_spinner (GtkWidget *do_widget)
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-    g_object_set (vbox, "margin", 5, NULL);
+    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_container_add (GTK_CONTAINER (content_area), vbox);
 
     /* Sensitive */

demos/gtk-demo/tabs.c

@@ -18,7 +18,7 @@ do_tabs (GtkWidget *do_widget)
       GtkTextBuffer *buffer;
       PangoTabArray *tabs;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Tabs");
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));