Redo the sorting in testlistview

Sort the entire treelistmodel, not individual directories. This lets us change sort order and (almost) get working persistence for selection.
typo fix
2019-01-06 21:25:13 -05:00 · 2019-01-06 20:29:37 -05:00 · 2019-01-06 20:27:27 -05:00 · 2019-01-06 20:27:27 -05:00 · 2019-01-06 20:27:27 -05:00 · 2019-01-06 20:27:27 -05:00
2559 changed files with 183708 additions and 182316 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,22 +13,15 @@ stages:
    - subprojects/pango/

 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
  stage: build
  script:
    - bash -x ./.gitlab-ci/test-docker.sh
  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report.xml" 
+    when: on_failure
    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"
  cache:
    key: "$CI_JOB_NAME"
    <<: *cache-paths
@@ -60,49 +53,18 @@ msys2-mingw32:
  script:
    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"

-# Manual jobs, for branches and MRs
-.flatpak-manual: &flatpak-manual
+flatpak:demo:
+  variables:
+    APPID: org.gtk.Demo
  <<: *flatpak-defaults
-  when: manual

-# Only build Flatpak bundles automatically on master
-.flatpak-master: &flatpak-master
+flatpak:widget-factory:
+  variables:
+    APPID: org.gtk.WidgetFactory
  <<: *flatpak-defaults
-  only:
-    - master
-
-flatpak-manual:demo:
-  variables:
-    APPID: org.gtk.Demo4
-  <<: *flatpak-manual
-
-flatpak-master:demo:
-  variables:
-    APPID: org.gtk.Demo4
-  <<: *flatpak-master
-
-flatpak-manual:widget-factory:
-  variables:
-    APPID: org.gtk.WidgetFactory4
-  <<: *flatpak-manual
-
-flatpak-master:widget-factory:
-  variables:
-    APPID: org.gtk.WidgetFactory4
-  <<: *flatpak-master
-
-flatpak-manual:icon-browser:
-  variables:
-    APPID: org.gtk.IconBrowser4
-  <<: *flatpak-manual
-
-flatpak-master:icon-browser:
-  variables:
-    APPID: org.gtk.IconBrowser4
-  <<: *flatpak-master

 pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
  stage: deploy 
  script:
    - meson -Ddocumentation=true _build .
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:30
+FROM fedora:29

 RUN dnf -y install \
    hicolor-icon-theme \
@@ -11,8 +11,6 @@ RUN dnf -y install \
    ccache \
    colord-devel \
    cups-devel \
-    dbus-daemon \
-    dejavu-sans-mono-fonts \
    desktop-file-utils \
    elfutils-libelf-devel \
    fribidi-devel \
@@ -60,7 +58,6 @@ RUN dnf -y install \
    pango-devel \
    pcre-devel \
    python3 \
-    python3-jinja2 \
    python3-pip \
    python3-wheel \
    redhat-rpm-config \
@@ -73,7 +70,7 @@ RUN dnf -y install \
    xorg-x11-server-Xvfb \
 && dnf clean all

-RUN pip3 install meson==0.50.1
+RUN pip3 install meson==0.49.0

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
--- a/.gitlab-ci/meson-html-report.py
+++ b/.gitlab-ci/meson-html-report.py
@@ -1,363 +0,0 @@
-#!/usr/bin/env python3
-
-# Turns a Mason testlog.json file into an HTML report
-#
-# Copyright 2019  GNOME Foundation
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# Original author: Emmanuele Bassi
-
-import argparse
-import datetime
-import json
-import os
-import sys
-from jinja2 import Template
-
-REPORT_TEMPLATE = '''
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>{{ report.project_name }} Test Report</title>
-  <meta charset="utf-8" />
-  <style type="text/css">
-body {
-  background: white;
-  color: #333;
-  font-family: 'Cantarell', sans-serif;
-}
-
-h1 {
-  color: #333333;
-  font-size: 1.9em;
-  font-weight: normal;
-  margin-bottom: 1em;
-  border-bottom: 1px solid #333333;
-}
-
-header {
-  position: fixed;
-  padding-bottom: 12px;
-  margin-bottom: 24px;
-  background: rgba(255, 255, 255, 0.85);
-  box-shadow: 0 0 1px rgba(0, 0, 0, 0.15);
-  z-index: 500;
-  left: 0;
-  top: 0;
-  width: 100%;
-  color: rgba(0, 0, 0, 0.3);
-  transform: translateY(0px);
-  transition: .2s background-color, color;
-  box-sizing: border-box;
-  display: block;
-  visibility: visible;
-  text-align: center;
-}
-
-article {
-  padding-top: 200px;
-  margin: 2em;
-}
-
-div.report-meta {
-  width: auto;
-  border: 1px solid #ccc;
-  padding: .5em 2em;
-  color: #3c3c3c;
-}
-
-span.result {
-  font-weight: bold;
-}
-
-span.pass {
-  color: rgb(51, 209, 122);
-}
-
-span.skip {
-  color: rgb(255, 163, 72);
-}
-
-span.fail {
-  color: rgb(224, 27, 36);
-}
-
-span.xfail {
-  color: rgb(163, 71, 186);
-}
-
-div.result {
-  border-top: 1px solid #c0c0c0;
-  padding-top: 1em;
-  padding-bottom: 1em;
-  width: 100%;
-}
-
-div.result h4 {
-  border-bottom: 1px solid #c0c0c0;
-  margin-bottom: 0.7em;
-}
-
-pre {
-  color: #fafafa;
-  background-color: black;
-  border-radius: 6px;
-  box-shadow: 0px 5px 8px 0px rgba(0, 0, 0, 0.25);
-  font-family: monospace;
-  line-height: 1.2em;
-  border: none;
-  padding: 10px 1em;
-  font-size: 0.9em;
-  overflow: auto;
-  white-space: pre;
-  word-break: normal;
-  word-wrap: normal;
-}
-
-ul.passed li {
-  display: inline;
-}
-
-ul.passed li:after {
-  content: ",";
-}
-
-ul.passed li:last-child:after {
-  content: "";
-}
-
-ul.images {
-  padding-bottom: 1em;
-}
-
-ul.images li {
-  display: inline;
-}
-  </style>
-</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>
-  </header>
-
-  <article>
-    <section>
-      <div class="summary">
-        <h3>Summary</h3>
-        <ul>
-          <li><strong>Total units:</strong> {{ report.total_units }}</li>
-          <li><strong>Passed:</strong> {{ report.total_successes }}</li>
-          <li><strong>Failed:</strong> {{ report.total_failures }}</li>
-        </ul>
-      </div>
-    </section>
-
-    {% for suite_result in report.results_list %}
-    <section>
-      <div class="result">
-        <h3>Suite: {{ suite_result.suite_name }}</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>
-        </ul>
-
-        <div class="successes">
-          <h4>Passed</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>Skipped</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>Expected failures</h4>
-          <ul>
-          {% for success in suite_result.successes if success.result == 'EXPECTEDFAIL' %}
-            <li>{{ success.name }} - 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>Failed</h4>
-          <ul class="failed">
-            {% for failure in suite_result.failures if failure.result == 'FAIL' %}
-            <li>{{ failure.name }} - result: <span class="result fail">{{ failure.result }}</span><br/>
-              {% if failure.stdout %}
-              Output: <pre>{{ failure.stdout }}</pre>
-              {% endif %}
-              {% if failure.image_data is defined %}
-              <ul class="images">
-                <li><img alt="ref" src="{{ failure.image_data.ref }}" /></li>
-                <li><img alt="out" src="{{ failure.image_data.out }}" /></li>
-                <li><img alt="diff" src="{{ failure.image_data.diff }}" /></li>
-              </ul>
-              {% endif %}
-            </li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-
-          <h4>Timed out</h4>
-          <ul class="failed">
-            {% for failure in suite_result.failures if failure.result == 'TIMEOUT' %}
-            <li>{{ failure.name }} - result: <span class="result fail">{{ failure.result }}</span><br/>
-              {% if failure.stdout %}
-              Output: <pre>{{ failure.stdout }}</pre>
-              {% endif %}
-            </li>
-            {% else %}
-            <li>None</li>
-            {% endfor %}
-          </ul>
-        </div>
-
-      </div>
-    </section>
-    {% endfor %}
-
-  </article>
-</body>
-</html>
-'''
-
-aparser = argparse.ArgumentParser(description='Turns a Meson test log into an HTML report')
-aparser.add_argument('--project-name', metavar='NAME',
-                     help='The project name',
-                     default='Unknown')
-aparser.add_argument('--job-id', metavar='ID',
-                     help='The job ID for the report',
-                     default=None)
-aparser.add_argument('--branch', metavar='NAME',
-                     help='Branch of the project being tested',
-                     default='master')
-aparser.add_argument('--output', metavar='FILE',
-                     help='The output HTML file, stdout by default',
-                     type=argparse.FileType('w', encoding='UTF-8'),
-                     default=sys.stdout)
-aparser.add_argument('--reftest-suite', metavar='NAME',
-                     help='The name of the reftests suite',
-                     default='reftest')
-aparser.add_argument('--reftest-output-dir', metavar='DIR',
-                     help='The output directory for reftests data',
-                     default=None)
-aparser.add_argument('infile', metavar='FILE',
-                     help='The input testlog.json, stdin by default',
-                     type=argparse.FileType('r', encoding='UTF-8'),
-                     default=sys.stdin)
-
-args = aparser.parse_args()
-
-outfile = args.output
-
-suites = {}
-for line in args.infile:
-    data = json.loads(line)
-    (full_suite, unit_name) = data['name'].split(' / ')
-    (project_name, suite_name) = full_suite.split(':')
-
-    unit = {
-        'project-name': project_name,
-        'suite': suite_name,
-        'name': unit_name,
-        'duration': data['duration'],
-        'returncode': data['returncode'],
-        'result': data['result'],
-        'stdout': data['stdout'],
-    }
-
-    if args.reftest_output_dir is not None and suite_name == args.reftest_suite:
-        filename = unit_name.split(' ')[1]
-        basename = os.path.splitext(filename)[0]
-
-        image_data = {
-            'ref': os.path.join(args.reftest_output_dir, '{}.ref.png'.format(basename)),
-            'out': os.path.join(args.reftest_output_dir, '{}.out.png'.format(basename)),
-            'diff': os.path.join(args.reftest_output_dir, '{}.diff.png'.format(basename)),
-        }
-
-        unit['image_data'] = image_data
-
-    units = suites.setdefault(full_suite, [])
-    units.append(unit)
-
-report = {}
-report['date'] = datetime.datetime.utcnow()
-report['locale_date'] = report['date'].strftime("%c")
-report['project_name'] = args.project_name
-report['job_id'] = args.job_id
-report['branch_name'] = args.branch
-report['total_successes'] = 0
-report['total_failures'] = 0
-report['total_units'] = 0
-report['results_list'] = []
-
-for name, units in suites.items():
-    (project_name, suite_name) = name.split(':')
-    print('Processing {} suite {}:'.format(project_name, suite_name))
-
-    def if_failed(unit):
-        if unit['result'] in ['FAIL', 'TIMEOUT']:
-            return True
-        return False
-
-    def if_succeded(unit):
-        if unit['result'] in ['OK', 'EXPECTEDFAIL', 'SKIP']:
-            return True
-        return False
-
-    successes = list(filter(if_succeded, units))
-    failures = list(filter(if_failed, units))
-
-    n_units = len(units)
-    n_successes = len(successes)
-    n_failures = len(failures)
-
-    report['total_units'] += n_units
-    report['total_successes'] += n_successes
-    report['total_failures'] += n_failures
-    print(' - {}: {} total, {} pass, {} fail'.format(suite_name, n_units, n_successes, n_failures))
-
-    suite_report = {
-        'suite_name': suite_name,
-        'n_units': n_units,
-        'successes': successes,
-        'n_successes': n_successes,
-        'failures': failures,
-        'n_failures': n_failures,
-    }
-    report['results_list'].append(suite_report)
-
-template = Template(REPORT_TEMPLATE)
-outfile.write(template.render({'report': report}))
--- a/.gitlab-ci/meson-junit-report.py
+++ b/.gitlab-ci/meson-junit-report.py
@@ -1,109 +0,0 @@
-#!/usr/bin/env python3
-
-# Turns a Meson testlog.json file into a JUnit XML report
-#
-# Copyright 2019  GNOME Foundation
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# Original author: Emmanuele Bassi
-
-import argparse
-import datetime
-import json
-import os
-import sys
-import xml.etree.ElementTree as ET
-
-aparser = argparse.ArgumentParser(description='Turns a Meson test log into a JUnit report')
-aparser.add_argument('--project-name', metavar='NAME',
-                     help='The project name',
-                     default='unknown')
-aparser.add_argument('--job-id', metavar='ID',
-                     help='The job ID for the report',
-                     default='Unknown')
-aparser.add_argument('--branch', metavar='NAME',
-                     help='Branch of the project being tested',
-                     default='master')
-aparser.add_argument('--output', metavar='FILE',
-                     help='The output file, stdout by default',
-                     type=argparse.FileType('w', encoding='UTF-8'),
-                     default=sys.stdout)
-aparser.add_argument('infile', metavar='FILE',
-                     help='The input testlog.json, stdin by default',
-                     type=argparse.FileType('r', encoding='UTF-8'),
-                     default=sys.stdin)
-
-args = aparser.parse_args()
-
-outfile = args.output
-
-testsuites = ET.Element('testsuites')
-testsuites.set('id', '{}/{}'.format(args.job_id, args.branch))
-testsuites.set('package', args.project_name)
-testsuites.set('timestamp', datetime.datetime.utcnow().isoformat(timespec='minutes'))
-
-suites = {}
-for line in args.infile:
-    data = json.loads(line)
-    (full_suite, unit_name) = data['name'].split(' / ')
-    (project_name, suite_name) = full_suite.split(':')
-
-    duration = data['duration']
-    return_code = data['returncode']
-    log = data['stdout']
-
-    unit = {
-        'suite': suite_name,
-        'name': unit_name,
-        'duration': duration,
-        'returncode': return_code,
-        'stdout': log,
-    }
-
-    units = suites.setdefault(suite_name, [])
-    units.append(unit)
-
-for name, units in suites.items():
-    print('Processing suite {} (units: {})'.format(name, len(units)))
-
-    def if_failed(unit):
-        if unit['returncode'] != 0:
-            return True
-        return False
-
-    def if_succeded(unit):
-        if unit['returncode'] == 0:
-            return True
-        return False
-
-    successes = list(filter(if_succeded, units))
-    failures = list(filter(if_failed, units))
-    print(' - {}: {} pass, {} fail'.format(name, len(successes), len(failures)))
-
-    testsuite = ET.SubElement(testsuites, 'testsuite')
-    testsuite.set('name', '{}/{}'.format(args.project_name, name))
-    testsuite.set('tests', str(len(units)))
-    testsuite.set('errors', str(len(failures)))
-    testsuite.set('failures', str(len(failures)))
-
-    for unit in successes:
-        testcase = ET.SubElement(testsuite, 'testcase')
-        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', unit['name'])
-        testcase.set('time', str(unit['duration']))
-
-    for unit in failures:
-        testcase = ET.SubElement(testsuite, 'testcase')
-        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', unit['name'])
-        testcase.set('time', str(unit['duration']))
-
-        failure = ET.SubElement(testcase, 'failure')
-        failure.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        failure.set('name', unit['name'])
-        failure.set('type', 'error')
-        failure.text = unit['stdout']
-
-output = ET.tostring(testsuites, encoding='unicode')
-outfile.write(output)
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@

 set -e

-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v6"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v2"

 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
    --file "Dockerfile" .
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -16,7 +16,6 @@ meson \
        -Dwayland-backend=true \
        -Dbroadway-backend=true \
        -Dvulkan=yes \
-        --werror \
        _build $srcdir
 unset CCACHE_DISABLE

@@ -25,30 +24,9 @@ cd _build
 ninja
 ccache --show-stats

-set +e
-
 xvfb-run -a -s "-screen 0 1024x768x24" \
    meson test \
-        --timeout-multiplier 2 \
        --print-errorlogs \
-        --suite=gtk \
-        --no-suite=gtk:a11y
-
-# Save the exit code
-exit_code=$?
-
-# We always want to run the report generators
-$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
+        --suite=gtk+ \
+        --no-suite=gtk+:gsk \
+        --no-suite=gtk+:a11y
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -42,11 +42,10 @@ ccache --zero-stats
 ccache --show-stats
 export CCACHE_DISABLE=true
 meson \
-    -Dx11-backend=false \
-    -Dwayland-backend=false \
-    -Dwin32-backend=true \
+    -Denable-x11-backend=false \
+    -Denable-wayland-backend=false \
+    -Denable-win32-backend=true \
    -Dvulkan=no \
-    --werror \
    _build
 unset CCACHE_DISABLE

--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -7,8 +7,8 @@
 <!--
  You should try and reproduce with the demos applications available
  under the `demos` directory, or the test programs in the `tests` directory.
-  Alternatively, please attach a *small and self-contained* example
-  *written in C* that exhibits the issue.
+  Alternatively, please attach a *small and self-contained* example that
+  exhibits the issue.
 -->

 ## Current behavior
@@ -23,10 +23,10 @@

 ## Version information
 <!--
- - Which version of GTK you are using
+ - Which version of GTK+ you are using
 - What operating system and version
  - For Linux, which distribution
- - If you built GTK yourself, the list of options used to configure the build
+ - If you built GTK+ yourself, the list of options used to configure the build
 -->

 ## Additional information
--- a/.gitlab/issue_templates/Crash.md
+++ b/.gitlab/issue_templates/Crash.md
@@ -13,10 +13,10 @@

 ## Version information
 <!--
- - Which version of GTK you are using
+ - Which version of GTK+ you are using
 - What operating system and version
  - for Linux, which distribution
- - If you built GTK yourself, the list of options used to configure the build
+ - If you built GTK+ yourself, the list of options used to configure the build
 -->

 ## Warnings
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,144 +1,31 @@
-# Contribution guidelines
-
-Thank you for considering contributing to the GTK project!
-
-These guidelines are meant for new contributors, regardless of their level
-of proficiency; following them allows the maintainers of the GTK project to
-more effectively evaluate your contribution, and provide prompt feedback to
-you. Additionally, by following these guidelines you clearly communicate
-that you respect the time and effort that the people developing GTK put into
-managing the project.
-
-GTK is a complex free software GUI toolkit, and it would not exist without
-contributions from the free and open source software community. There are
-many things that we value:
-
- - bug reporting and fixing
- - documentation and examples
- - tests
- - new features
-
-Please, do not use the issue tracker for support questions. If you have
-questions on how to use GTK effectively, you can use:
-
- - the `#gtk` IRC channel on irc.gnome.org
- - the [gtk](https://mail.gnome.org/mailman/listinfo/gtk-list) mailing list,
-   for general questions on GTK
- - the [gtk-app-devel](https://mail.gnome.org/mailman/listinfo/gtk-app-devel-list)
-   mailing list, for questions on application development with GTK
- - the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
-   mailing list, for questions on developing GTK itself
-
-You can also look at the GTK tag on [Stack
-Overflow](https://stackoverflow.com/questions/tagged/gtk).
-
-The issue tracker is meant to be used for actionable issues only.
-
-## How to report bugs
-
-### Security issues
-
-You should not open a new issue for security related questions.
-
-When in doubt, send an email to the [security](mailto:security@gnome.org)
-mailing list.
-
-### Bug reports
-
-If you're reporting a bug make sure to list:
-
- 0. which version of GTK are you using?
- 0. which operating system are you using?
- 0. the necessary steps to reproduce the issue
- 0. the expected outcome
- 0. a description of the behavior; screenshots are also welcome
- 0. a small, self-contained example exhibiting the behavior; if this
-    is not available, try reproducing the issue using the GTK examples
-    or interactive tests
-
-If the issue includes a crash, you should also include:
-
- 0. the eventual warnings printed on the terminal
- 0. a backtrace, obtained with tools such as GDB or LLDB
-
-For small issues, such as:
-
- - spelling/grammar fixes in the documentation
- - typo correction
- - comment clean ups
- - changes to metadata files (CI, `.gitignore`)
- - build system changes
- - source tree clean ups and reorganizations
-
-You should directly open a merge request instead of filing a new issue.
-
-### Features and enhancements
-
-Feature discussion can be open ended and require high bandwidth channels; if
-you are proposing a new feature on the issue tracker, make sure to make
-an actionable proposal, and list:
-
- 0. what you're trying to achieve
- 0. prior art, in other toolkits or applications
- 0. design and theming changes
-
-If you're proposing the integration of new features it helps to have
-multiple applications using shared or similar code, especially if they have
-iterated over it various times.
-
-Each feature should also come fully documented, and with tests.
-
-## Your first contribution
-
-### Prerequisites
-
-If you want to contribute to the GTK project, you will need to have the
-development tools appropriate for your operating system, including:
+If you want to hack on the GTK+ project, you'll need to have the development
+tools appropriate for your operating system, including:

 - Python 3.x
 - Meson
 - Ninja
 - Gettext (19.7 or newer)
- - a [C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
+ - a C99 compatible compiler

 Up-to-date instructions about developing GNOME applications and libraries
-can be found on [the GNOME Developer Center](https://developer.gnome.org).
+can be found here:

-The GTK project uses GitLab for code hosting and for tracking issues. More
-information about using GitLab can be found [on the GNOME
-wiki](https://wiki.gnome.org/GitLab).
+ * https://developer.gnome.org

-### Dependencies
+Information about using GitLab with GNOME can be found here:

-In order to get GTK from Git installed on your system, you need to have the
-required versions of all the software dependencies required by GTK; typically,
-this means a recent version of GLib, Cairo, Pango, and ATK, as well as the
-platform-specific dependencies for the windowing system you are using (Wayland,
-X11, Windows, or macOS).
+ * https://wiki.gnome.org/GitLab

-The core dependencies for GTK are:
-
- - [GLib, GObject, and GIO](https://gitlab.gnome.org/GNOME/glib)
- - [Cairo](http://cairographics.org)
- - [Pango](https://gitlab.gnome.org/GNOME/pango)
- - [GdkPixbuf](https://gitlab.gnome.org/GNOME/gdk-pixbuf)
- - [Epoxy](https://github.com/anholt/libepoxy)
- - [ATK](https://gitlab.gnome.org/GNOME/atk)
- - [Graphene](https://github.com/ebassi/graphene)
-
-GTK will attempt to download and build some of these dependencies if it
-cannot find them on your system.
-
-Additionally, you may want to look at projects that create a development
-environment for you, like [jhbuild](https://wiki.gnome.org/HowDoI/Jhbuild)
-and [gvsbuild](https://github.com/wingtk/gvsbuild).
-
-### Getting started
+In order to get Git GTK+ installed on your system, you need to have the
+required versions of all the GTK+ dependencies; typically, this means a
+recent version of GLib, Cairo, Pango, and ATK, as well as the platform
+specific dependencies for the windowing system you are using (Wayland, X11,
+Windows, or macOS).

 You should start by forking the GTK repository from the GitLab web UI, and
 cloning from your fork:

-```sh
+```ssh
 $ git clone https://gitlab.gnome.org/yourusername/gtk.git
 $ cd gtk
 ```
@@ -151,7 +38,7 @@ $ git clone git@gitlab.gnome.org:GNOME/gtk.git
 $ cd gtk
 ```

-To compile the Git version of GTK on your system, you will need to
+To compile the Git version of GTK+ on your system, you will need to
 configure your build using Meson:

 ```sh
@@ -160,6 +47,11 @@ $ cd _builddir
 $ ninja
 ```

+**Note**: For information about submitting patches and pushing changes
+to Git, see the [README.md](./README.md) and [README.commits.md](./README.commits.md) files. In particular,
+don't, under any circumstances, push anything to Git before reading and
+understanding [README.commits.md](./README.commits.md).
+
 Typically, you should work on your own branch:

 ```sh
@@ -168,99 +60,6 @@ $ git checkout -b your-branch

 Once you've finished working on the bug fix or feature, push the branch
 to the Git repository and open a new merge request, to let the GTK
-maintainers review your contribution.
-
-### Code reviews
-
-Each contribution is reviewed by the core developers of the GTK project.
-
-The [CODE-OWNERS](./docs/CODE-OWNERS) document contains the list of core
-contributors to GTK and the areas for which they are responsible; you
-should ensure to receive their review and signoff on your changes.
-
-### Commit messages
-
-The expected format for git commit messages is as follows:
-
-```plain
-Short explanation of the commit
-
-Longer explanation explaining exactly what's changed, whether any
-external or private interfaces changed, what bugs were fixed (with bug
-tracker reference if applicable) and so forth. Be concise but not too
-brief.
-
-Closes #1234
-```
-
- - Always add a brief description of the commit to the _first_ line of
- the commit and terminate by two newlines (it will work without the
- second newline, but that is not nice for the interfaces).
-
- - First line (the brief description) must only be one sentence and
- should start with a capital letter unless it starts with a lowercase
- symbol or identifier. Don't use a trailing period either. Don't exceed
- 72 characters.
-
- - The main description (the body) is normal prose and should use normal
- punctuation and capital letters where appropriate. Consider the commit
- message as an email sent to the developers (or yourself, six months
- down the line) detailing **why** you changed something. There's no need
- to specify the **how**: the changes can be inlined.
-
- - When committing code on behalf of others use the `--author` option, e.g.
- `git commit -a --author "Joe Coder <joe@coder.org>"` and `--signoff`.
-
- - If your commit is addressing an issue, use the
- [GitLab syntax](https://docs.gitlab.com/ce/user/project/issues/automatic_issue_closing.html)
- to automatically close the issue when merging the commit with the upstream
- repository:
-
-```plain
-Closes #1234
-Fixes #1234
-Closes: https://gitlab.gnome.org/GNOME/gtk/issues/1234
-```
-
- - If you have a merge request with multiple commits and none of them
- completely fixes an issue, you should add a reference to the issue in
- the commit message, e.g. `Bug: #1234`, and use the automatic issue
- closing syntax in the description of the merge request.
-
-### Commit access to the GTK repository
-
-GTK is part of the GNOME infrastructure. At the current time, any
-person with write access to the GNOME repository can merge changes to
-GTK. This is a good thing, in that it encourages many people to work
-on GTK, and progress can be made quickly. However, GTK is a fairly
-large and complicated project on which many other things depend, so to
-avoid unnecessary breakage, and to take advantage of the knowledge
-about GTK that has been built up over the years, we'd like to ask
-people committing to GTK to follow a few rules:
-
-0. Ask first. If your changes are major, or could possibly break existing
-   code, you should always ask. If your change is minor and you've been
-   working on GTK for a while it probably isn't necessary to ask. But when
-   in doubt, ask. Even if your change is correct, somebody may know a
-   better way to do things. If you are making changes to GTK, you should
-   be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
-   mailing list; this is a good place to ask about intended changes.
-   The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK
-   developers to discuss changes, but if you live outside of the EU/US time
-   zones, an email to the gtk-devel mailing list is the most certain and
-   preferred method.
-
-0. Ask _first_.
-
-0. Always write a meaningful commit message. Changes without a sufficient
-   commit message will be reverted.
-
-0. Never push to the `master` branch, or any stable branches, directly; you
-   should always go through a merge request, to ensure that the code is
-   tested on the CI infrastructure at the very least. A merge request is
-   also the proper place to get a comprehensive code review from the core
-   developers of GTK.
-
-If you have been contributing to GTK for a while and you don't have commit
-access to the repository, you may ask to obtain it following the [GNOME account
-process](https://wiki.gnome.org/AccountsTeam/NewAccounts).
+maintainers review your contribution. The [CODE-OWNERS](./docs/CODE-OWNERS)
+document contains the list of core contributors to GTK and the areas for
+which they are responsible.
--- a/102
+++ b/102
@@ -1,105 +1,3 @@
-Overview of Changes in GTK+ 3.96.0
-==================================
-
-* DND has been refactored. There are now separate GdkDrag and GdkDrop
-  objects. This work is still incomplete
-
-* The GDK_SURFACE_SUBSURFACE surface type has been removed.
-
-* Use of child surfaces has been greatly reduced. This work is still
-  incomplete
-
-* The use of global coordinates in GDK apis has been reduced. This
-  work is still incomplete
-
-* Events have been simplified and are used just for input
-  - expose events have been replaced by a GdkSurface::render signal
-  - configure events have been replaced by a GdkSurface::size-changed signal
-  - map events have been replaced by a GdkSurface::mapped property
-  - gdk_event_handler_set has been replaced by a GdkSurface::event signal
-  - key events no longer contain a string
-  - events on unmapped widgets are ignored
-
-* Warping the pointer is no longer supported
-
-* The Wayland backend now uses the Settings portal for GtkSettings
-
-* The Wayland input module uses the text-input-unstable-v3 protocol
-
-* The Broadway backend has been rewritten to work well with GSK
-
-* The color chooser has a color picker
-
-* GtkApplication tracks screensaver state and has a ::query-end signal
-
-* The file chooser portal backend supports file filters
-
-* A number of list models have been introduced, for internal use
-  and as public api:
-  - GtkMapListModel
-  - GtkSliceListModel
-  - GtkSortListModel
-  - GtkSelectionModel
-  - GtkSingleSelection
-
-* Support for tabular menus and combo boxes has been dropped
-
-* Key themes are no longer supported
-
-* GtkInvisible has been dropped
-
-* A GtkRoot interface has been added that is currently implemented
-  just by GtkWindow. This work is incomplete
-
-* GtkWidgets can transform their children using projective linear
-  transformations. This functionality is available in CSS and
-  as GskTransform argument to gtk_widget_allocate. GtkFixed is
-  a container that exposes this functionality. For examples of this,
-  see the swing transition of GtkRevealer, the rotate transitions
-  of GtkStack or the Fixed Layout example in gtk-demo.
-
-* GtkEntry functionality has been moved into a new GtkText widget,
-  the GtkEditable interface has been expanded, and new a new
-  GtkPasswordEntry widget has been introduced.
-
-* Focus handling has been rewritten, and focus-change event
-  generation has been unified with crossing events.
-
-* All demos and settings schemas have been renamed to avoid collisions
-  with GTK3.
-
-* GtkWidget can now use a GtkLayoutManager for size allocation.
-  Layout managers can optionally use layout children holding layout
-  properties. A number of layout managers are available:
-  - GtkBinLayout
-  - GtkBoxLayout
-  - GtkGridLayout
-  - GtkFixedLayout
-  - GtkCustomLayout
-  More layout manager implementations will appear in the future.
-
-* GtkAssistant, GtkStack and GtkNotebook now have publicly
-  accessible page objects for their children. The page objects
-  are also exposed via a list model.
-
-* GtkContainer no longer supports child properties. All existing
-  child properties have been removed, converted to regular properties,
-  moved to layout properties or moved to child meta objects.
-
-* GtkListBox has gained a ::show-separators property that gets
-  translated into a CSS style class.
-
-* A number of X11-specific GtkWindow and GdkSurface apis have been
-  removed or changed to backend APIs.
-
-* GtkBuilder can specify object-valued properties inline.
-
-* The gtk4-builder-tool simplify command has gained a --3to4 option
-  to convert GTK3 ui files to GTK4.
-
-* The inspector can show child meta objects and layout properties.
-
-
 Overview of Changes in GTK+ 3.94.0
 ==================================

--- a/README.commits.md
+++ b/README.commits.md
@@ -0,0 +1,71 @@
+GTK+ is part of the GNOME git repository. At the current time, any
+person with write access to the GNOME repository, can make changes to
+GTK+. This is a good thing, in that it encourages many people to work
+on GTK+, and progress can be made quickly. However, GTK+ is a fairly
+large and complicated package that many other things depend on, so to
+avoid unnecessary breakage, and to take advantage of the knowledge
+about GTK+ that has been built up over the years, we'd like to ask
+people committing to GTK+ to follow a few rules:
+
+0. Ask first. If your changes are major, or could possibly break existing
+   code, you should always ask. If your change is minor and you've
+   been working on GTK+ for a while it probably isn't necessary
+   to ask. But when in doubt, ask. Even if your change is correct,
+   somebody may know a better way to do things.
+   If you are making changes to GTK+, you should be subscribed
+   to gtk-devel-list@gnome.org. (Subscription address:
+   gtk-devel-list-request@gnome.org.) This is a good place to ask
+   about intended changes.
+   #gtk+ on GIMPNet (irc.gimp.org, irc.us.gimp.org, irc.eu.gimp.org, ...)
+   is also a good place to find GTK+ developers to discuss changes with,
+   however, email to gtk-devel-list is the most certain and preferred
+   method.
+
+0. Ask _first_.
+
+0. With git, we no longer maintain a ChangeLog file, but you are expected
+   to produce a meaningful commit message. Changes without a sufficient
+   commit message will be reverted. See below for the expected format
+   of commit messages.
+
+Notes:
+
+* When developing larger features or complicated bug fixes, it is
+  advisable to work in a branch in your own cloned GTK+ repository.
+  You may even consider making your repository publically available
+  so that others can easily test and review your changes.
+
+* The expected format for git commit messages is as follows:
+
+```
+Short explanation of the commit
+
+Longer explanation explaining exactly what's changed, whether any
+external or private interfaces changed, what bugs were fixed (with bug
+tracker reference if applicable) and so forth. Be concise but not too brief.
+```
+
+  - Always add a brief description of the commit to the _first_ line of
+    the commit and terminate by two newlines (it will work without the
+    second newline, but that is not nice for the interfaces).
+
+  - First line (the brief description) must only be one sentence and
+    should start with a capital letter unless it starts with a lowercase
+    symbol or identifier. Don't use a trailing period either. Don't exceed
+    72 characters.
+
+  - The main description (the body) is normal prose and should use normal
+    punctuation and capital letters where appropriate. Normally, for patches
+    sent to a mailing list it's copied from there.
+
+  - When committing code on behalf of others use the `--author` option, e.g.
+    `git commit -a --author "Joe Coder <joe@coder.org>"` and `--signoff`.
+
+
+Owen Taylor
+13 Aug 1998
+17 Apr 2001
+
+Matthias Clasen
+31 Mar 2009
+
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
-GTK — The GTK toolkit
-=====================
+GTK+ — The GTK toolkit
+======================

 [![Build Status](https://gitlab.gnome.org/GNOME/gtk/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/gtk/pipelines)

 General information
 -------------------

-GTK is a multi-platform toolkit for creating graphical user interfaces.
-Offering a complete set of widgets, GTK is suitable for projects ranging
+GTK+ is a multi-platform toolkit for creating graphical user interfaces.
+Offering a complete set of widgets, GTK+ is suitable for projects ranging
 from small one-off projects to complete application suites.

-GTK is free software and part of the GNU Project. However, the
-licensing terms for GTK, the GNU LGPL, allow it to be used by all
+GTK+ is free software and part of the GNU Project. However, the
+licensing terms for GTK+, the GNU LGPL, allow it to be used by all
 developers, including those developing proprietary software, without any
 license fees or royalties.

@@ -39,7 +39,7 @@ Nightly documentation can be found at
 Building and installing
 -----------------------

-In order to build GTK you will need:
+In order to build GTK+ you will need:

  - [a C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
  - [Python 3](https://www.python.org/)
@@ -79,7 +79,7 @@ If you are building the Wayland backend, you will also need:
  - Wayland-cursor
  - Wayland-EGL

-Once you have all the necessary dependencies, you can build GTK by using
+Once you have all the necessary dependencies, you can build GTK+ by using
 Meson:

 ```sh
@@ -94,7 +94,7 @@ You can run the test suite using:
 $ meson test
 ```

-And, finally, you can install GTK using:
+And, finally, you can install GTK+ using:

 ```
 $ sudo ninja install
@@ -118,10 +118,10 @@ In the bug report please include:

 * Information about your system. For instance:

-   - which version of GTK you are using
+   - which version of GTK+ you are using
   - what operating system and version
   - for Linux, which distribution
-   - if you built GTK, the list of options used to configure the build
+   - if you built GTK+, the list of options used to configure the build

  And anything else you think is relevant.

@@ -143,7 +143,7 @@ In the bug report please include:
 Release notes
 -------------

-The release notes for GTK are part of the migration guide in the API
+The release notes for GTK+ are part of the migration guide in the API
 reference. See:

 - [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
@@ -152,7 +152,7 @@ reference. See:
 Licensing terms
 ---------------

-GTK is released under the terms of the GNU Lesser General Public License,
+GTK+ is released under the terms of the GNU Lesser General Public License,
 version 2.1 or, at your option, any later version, as published by the Free
 Software Foundation.

--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -1,17 +1,19 @@
 {
-    "app-id": "org.gtk.Demo4",
+    "app-id": "org.gtk.Demo",
    "runtime": "org.gnome.Platform",
    "runtime-version": "master",
    "sdk": "org.gnome.Sdk",
    "command": "gtk4-demo",
    "tags": ["devel", "development", "nightly"],
+    "rename-icon": "gtk4-demo",
    "desktop-file-name-prefix": "(Development) ",
    "finish-args": [
        "--device=dri",
        "--share=ipc",
-        "--socket=fallback-x11",
+        "--socket=x11",
        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
+        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
    ],
    "cleanup": [
        "/include",
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -1,72 +0,0 @@
-{
-    "app-id": "org.gtk.IconBrowser4",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk4-icon-browser",
-    "tags": ["devel", "development", "nightly"],
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name" : "wayland",
-            "buildsystem" : "autotools",
-            "builddir" : true,
-            "config-opts" : [
-                "--disable-documentation"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
-                }
-            ]
-        },
-        {
-            "name": "graphene",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/ebassi/graphene.git"
-                }
-            ]
-        },
-        {
-            "name": "gtk",
-            "buildsystem": "meson",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -1,17 +1,19 @@
 {
-    "app-id": "org.gtk.WidgetFactory4",
+    "app-id": "org.gtk.WidgetFactory",
    "runtime": "org.gnome.Platform",
    "runtime-version": "master",
    "sdk": "org.gnome.Sdk",
    "command": "gtk4-widget-factory",
    "tags": ["devel", "development", "nightly"],
+    "rename-icon": "gtk4-widget-factory",
    "desktop-file-name-prefix": "(Development) ",
    "finish-args": [
        "--device=dri",
        "--share=ipc",
-        "--socket=fallback-x11",
+        "--socket=x11",
        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
+        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
+        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
    ],
    "cleanup": [
        "/include",
--- a/build-aux/meson/post-install.py
+++ b/build-aux/meson/post-install.py
@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-import subprocess
-
-if 'DESTDIR' not in os.environ:
-    gtk_api_version = sys.argv[1]
-    gtk_abi_version = sys.argv[2]
-    gtk_libdir = sys.argv[3]
-    gtk_datadir = sys.argv[4]
-
-    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
-    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
-    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
-
-    print('Compiling GSettings schemas...')
-    subprocess.call(['glib-compile-schemas',
-                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
-
-    print('Updating icon cache...')
-    subprocess.call(['gtk4-update-icon-cache', '-q', '-t' ,'-f',
-                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
-
-    print('Updating module cache for print backends...')
-    os.makedirs(gtk_printmodule_dir, exist_ok=True)
-    subprocess.call(['gio-querymodules', gtk_printmodule_dir])
-
-    print('Updating module cache for input methods...')
-    os.makedirs(gtk_immodule_dir, exist_ok=True)
-    subprocess.call(['gio-querymodules', gtk_immodule_dir])
--- a/build-aux/meson/post-install.sh
+++ b/build-aux/meson/post-install.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+gtk_api_version=$1
+gtk_abi_version=$2
+gtk_libdir=$3
+gtk_datadir=$4
+
+# Package managers set this so we don't need to run
+if [ -z "$DESTDIR" ]; then
+  echo Compiling GSettings schemas...
+  glib-compile-schemas ${gtk_datadir}/glib-2.0/schemas
+
+  echo Updating desktop database...
+  update-desktop-database -q ${gtk_datadir}/applications
+
+  echo Updating icon cache...
+  gtk-update-icon-cache -q -t -f ${gtk_datadir}/icons/hicolor
+
+  echo Updating module cache for print backends...
+  mkdir -p ${gtk_libdir}/gtk-4.0/4.0.0/printbackends
+  gio-querymodules ${gtk_libdir}/gtk-4.0/4.0.0/printbackends
+
+  echo Updating module cache for input methods...
+  mkdir -p ${gtk_libdir}/gtk-4.0/4.0.0/immodules
+  gio-querymodules ${gtk_libdir}/gtk-4.0/4.0.0/immodules
+fi
--- a/config.h.meson
+++ b/config.h.meson
@@ -24,6 +24,9 @@
 /* Define to 1 if you have the <crt_externs.h> header file. */
 #mesondefine HAVE_CRT_EXTERNS_H

+/* Define to 1 if CUPS 1.6 API is available */
+#mesondefine HAVE_CUPS_API_1_6
+
 /* Define to 1 if you have the `dcgettext' function. */
 #mesondefine HAVE_DCGETTEXT

@@ -131,9 +134,6 @@
 /* Define to 1 if you have the <sys/param.h> header file. */
 #mesondefine HAVE_SYS_PARAM_H

-/* Have the sysprof-capture library */
-#mesondefine HAVE_SYSPROF_CAPTURE
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #mesondefine HAVE_SYS_STAT_H

@@ -244,6 +244,9 @@
 #endif


+/* Define to 1 if XInput 2.0 is available */
+#mesondefine XINPUT_2
+
 /* Define to 1 if XInput 2.2 is available */
 #mesondefine XINPUT_2_2

@@ -297,10 +300,18 @@

 #mesondefine GTK_PRINT_BACKENDS

-#mesondefine HAVE_CAIRO_SCRIPT_INTERPRETER
-
 #mesondefine HAVE_HARFBUZZ

 #mesondefine HAVE_PANGOFT

 #mesondefine ISO_CODES_PREFIX
+
+#mesondefine MALLOC_IS_ALIGNED16
+
+#mesondefine HAVE_POSIX_MEMALIGN
+
+#mesondefine HAVE_MEMALIGN
+
+#mesondefine HAVE_ALIGNED_ALLOC
+
+#mesondefine HAVE__ALIGNED_MALLOC
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -200,20 +200,20 @@ activate_about (GSimpleAction *action,
  };

  gtk_show_about_dialog (GTK_WINDOW (window),
-                         "program-name", "GTK Code Demos",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK %d.%d.%d",
+                         "program-name", "GTK+ Code Demos",
+                         "version", g_strdup_printf ("%s,\nRunning against GTK+ %d.%d.%d",
                                                     PACKAGE_VERSION,
                                                     gtk_get_major_version (),
                                                     gtk_get_minor_version (),
                                                     gtk_get_micro_version ()),
-                         "copyright", "(C) 1997-2013 The GTK Team",
+                         "copyright", "(C) 1997-2013 The GTK+ Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK functions.",
+                         "comments", "Program to demonstrate GTK+ functions.",
                         "authors", authors,
                         "documenters", documentors,
-                         "logo-icon-name", "org.gtk.Demo4",
-                         "title", "About GTK Code Demos",
+                         "logo-icon-name", "gtk4-demo",
+                         "title", "About GTK+ Code Demos",
                         NULL);
 }

@@ -370,7 +370,7 @@ demo_application_init (DemoApplication *app)
  GSettings *settings;
  GAction *action;

-  settings = g_settings_new ("org.gtk.Demo4");
+  settings = g_settings_new ("org.gtk.Demo");

  g_action_map_add_action_entries (G_ACTION_MAP (app),
                                   app_entries, G_N_ELEMENTS (app_entries),
@@ -397,7 +397,7 @@ demo_application_window_store_state (DemoApplicationWindow *win)
 {
  GSettings *settings;

-  settings = g_settings_new ("org.gtk.Demo4");
+  settings = g_settings_new ("org.gtk.Demo");
  g_settings_set (settings, "window-size", "(ii)", win->width, win->height);
  g_settings_set_boolean (settings, "maximized", win->maximized);
  g_settings_set_boolean (settings, "fullscreen", win->fullscreen);
@@ -409,7 +409,7 @@ demo_application_window_load_state (DemoApplicationWindow *win)
 {
  GSettings *settings;

-  settings = g_settings_new ("org.gtk.Demo4");
+  settings = g_settings_new ("org.gtk.Demo");
  g_settings_get (settings, "window-size", "(ii)", &win->width, &win->height);
  win->maximized = g_settings_get_boolean (settings, "maximized");
  win->fullscreen = g_settings_get_boolean (settings, "fullscreen");
@@ -477,7 +477,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_surface_get_state (gtk_widget_get_surface (widget));
  window->maximized = (new_state & GDK_SURFACE_STATE_MAXIMIZED) != 0;
  window->fullscreen = (new_state & GDK_SURFACE_STATE_FULLSCREEN) != 0;
 }
@@ -487,14 +487,14 @@ demo_application_window_realize (GtkWidget *widget)
 {
  GTK_WIDGET_CLASS (demo_application_window_parent_class)->realize (widget);

-  g_signal_connect_swapped (gtk_native_get_surface (GTK_NATIVE (widget)), "notify::state",
+  g_signal_connect_swapped (gtk_widget_get_surface (widget), "notify::state",
                            G_CALLBACK (surface_state_changed), widget);
 }

 static void
 demo_application_window_unrealize (GtkWidget *widget)
 {
-  g_signal_handlers_disconnect_by_func (gtk_native_get_surface (GTK_NATIVE (widget)),
+  g_signal_handlers_disconnect_by_func (gtk_widget_get_surface (widget),
                                        surface_state_changed, widget);

  GTK_WIDGET_CLASS (demo_application_window_parent_class)->unrealize (widget);
@@ -541,7 +541,7 @@ main (int argc, char *argv[])
  GtkApplication *app;

  app = GTK_APPLICATION (g_object_new (demo_application_get_type (),
-                                       "application-id", "org.gtk.Demo4.App",
+                                       "application-id", "org.gtk.Demo2",
                                       "flags", G_APPLICATION_HANDLES_OPEN,
                                       NULL));

--- a/demos/gtk-demo/application.ui
+++ b/demos/gtk-demo/application.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <interface>
  <template class="DemoApplicationWindow" parent="GtkApplicationWindow">
    <property name="title" translatable="yes">Application Class</property>
@@ -25,7 +25,8 @@
              </object>
            </child>
            <child>
-              <object class="GtkSeparatorToolItem"/>
+              <object class="GtkSeparatorToolItem">
+              </object>
            </child>
            <child>
              <object class="GtkToolButton">
@@ -33,11 +34,11 @@
                <property name="action-name">win.logo</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkInfoBar" id="infobar">
@@ -64,11 +65,11 @@
                </child>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScrolledWindow">
@@ -80,20 +81,20 @@
                <property name="buffer">buffer</property>
              </object>
            </child>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkStatusbar" id="status">
            <property name="hexpand">1</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
      </object>
    </child>
--- a/demos/gtk-demo/application_demo.c
+++ b/demos/gtk-demo/application_demo.c
@@ -52,7 +52,7 @@ do_application_demo (GtkWidget *toplevel)

  if (watch == 0)
    watch = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                              "org.gtk.Demo4.App",
+                              "org.gtk.Demo2",
                              0,
                              on_name_appeared,
                              on_name_vanished,
@@ -80,8 +80,8 @@ do_application_demo (GtkWidget *toplevel)
  else
    {
      g_dbus_connection_call_sync (g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL),
-                                   "org.gtk.Demo4.App",
-                                   "/org/gtk/Demo4/App",
+                                   "org.gtk.Demo2",
+                                   "/org/gtk/Demo2",
                                   "org.gtk.Actions",
                                   "Activate",
                                   g_variant_new ("(sava{sv})", "quit", NULL, NULL),
--- a/demos/gtk-demo/appmenu.ui
+++ b/demos/gtk-demo/appmenu.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires gtk+ 3.10 -->
  <menu id="appmenu">
    <section>
      <item>
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -80,7 +80,7 @@ on_entry_changed (GtkWidget *widget, gpointer data)

  page_number = gtk_assistant_get_current_page (assistant);
  current_page = gtk_assistant_get_nth_page (assistant, page_number);
-  text = gtk_editable_get_text (GTK_EDITABLE (widget));
+  text = gtk_entry_get_text (GTK_ENTRY (widget));

  if (text && *text)
    gtk_assistant_set_page_complete (assistant, current_page, TRUE);
@@ -96,12 +96,12 @@ create_page1 (GtkWidget *assistant)
  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);

  label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_container_add (GTK_CONTAINER (box), label);
+  gtk_box_pack_start (GTK_BOX (box), label);

  entry = gtk_entry_new ();
  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_container_add (GTK_CONTAINER (box), entry);
+  gtk_box_pack_start (GTK_BOX (box), entry);
  g_signal_connect (G_OBJECT (entry), "changed",
                    G_CALLBACK (on_entry_changed), assistant);

@@ -119,7 +119,7 @@ create_page2 (GtkWidget *assistant)

  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                 "even if you do not check this");
-  gtk_container_add (GTK_CONTAINER (box), checkbutton);
+  gtk_box_pack_start (GTK_BOX (box), checkbutton);

  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -17,11 +17,11 @@
            <style>
              <class name="dim-label"/>
            </style>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow">
@@ -29,22 +29,22 @@
            <property name="vexpand">1</property>
            <property name="shadow-type">in</property>
            <property name="min-content-width">150</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkStackSwitcher">
            <property name="halign">center</property>
            <property name="hexpand">1</property>
            <property name="stack">stack</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkStack" id="stack">
@@ -54,284 +54,279 @@
            <property name="vhomogeneous">0</property>
            <property name="transition-type">crossfade</property>
            <child>
-              <object class="GtkStackPage">
+              <object class="GtkGrid">
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="vexpand">1</property>
+                <property name="row-spacing">12</property>
+                <property name="column-spacing">12</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Duck</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Background</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <style>
+                      <class name="duck"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <style>
+                      <class name="gradient"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">
+Blended picture</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <property name="halign">center</property>
+                    <style>
+                      <class name="blend0"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
                <property name="name">page0</property>
                <property name="title" translatable="yes">Ducky</property>
-                <property name="child">
-                  <object class="GtkGrid">
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">1</property>
-                    <property name="row-spacing">12</property>
-                    <property name="column-spacing">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Duck</property>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Background</property>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <style>
-                          <class name="duck"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <style>
-                          <class name="gradient"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">
-Blended picture</property>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
-                          <property name="column-span">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="blend0"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
-                          <property name="column-span">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                  </object>
-                </property>
-              </object>
+              </packing>
            </child>
            <child>
-              <object class="GtkStackPage">
+              <object class="GtkGrid">
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="vexpand">1</property>
+                <property name="row-spacing">12</property>
+                <property name="column-spacing">12</property>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Red</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Blue</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <style>
+                      <class name="red"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <style>
+                      <class name="blue"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">
+Blended picture</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <property name="halign">center</property>
+                    <style>
+                      <class name="blend1"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
                <property name="name">page1</property>
                <property name="title" translatable="yes">Blends</property>
-                <property name="child">
-                  <object class="GtkGrid">
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="vexpand">1</property>
-                    <property name="row-spacing">12</property>
-                    <property name="column-spacing">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Red</property>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Blue</property>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <style>
-                          <class name="red"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <style>
-                          <class name="blue"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">
-Blended picture</property>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
-                          <property name="column-span">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="blend1"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
-                          <property name="column-span">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                  </object>
-                </property>
-              </object>
+              </packing>
            </child>
            <child>
-              <object class="GtkStackPage">
+              <object class="GtkGrid">
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="hexpand">1</property>
+                <property name="vexpand">1</property>
+                <property name="row-spacing">6</property>
+                <property name="column-spacing">12</property>
+                <child>
+                  <object class="GtkImage">
+                    <style>
+                      <class name="cyan"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <style>
+                      <class name="magenta"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <style>
+                      <class name="yellow"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage">
+                    <property name="halign">center</property>
+                    <style>
+                      <class name="blend2"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Cyan</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Magenta</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Yellow</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="label" translatable="yes">Blended picture</property>
+                    <property name="xalign">0</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
                <property name="name">page2</property>
                <property name="title" translatable="yes">CMYK</property>
-                <property name="child">
-                  <object class="GtkGrid">
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="hexpand">1</property>
-                    <property name="vexpand">1</property>
-                    <property name="row-spacing">6</property>
-                    <property name="column-spacing">12</property>
-                    <child>
-                      <object class="GtkImage">
-                        <style>
-                          <class name="cyan"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <style>
-                          <class name="magenta"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <style>
-                          <class name="yellow"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="halign">center</property>
-                        <style>
-                          <class name="blend2"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Cyan</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Magenta</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Yellow</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Blended picture</property>
-                        <property name="xalign">0</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"></attribute>
-                        </attributes>
-                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                  </object>
-                </property>
-              </object>
+              </packing>
            </child>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
      </object>
    </child>
-    <child type="titlebar"/>
+    <child type="titlebar">
+    </child>
  </object>
 </interface>
--- a/demos/gtk-demo/bluroverlay.c
+++ b/demos/gtk-demo/bluroverlay.c
@@ -1,481 +0,0 @@
-/*
- * bluroverlay.c
- * This file is part of gtk
- *
- * Copyright (C) 2011 - Ignacio Casal Quinteiro, Mike Krüger
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "bluroverlay.h"
-
-/*
- * This is a cut-down copy of gtkoverlay.c with a custom snapshot
- * function that support a limited form of blur-under.
- */
-typedef struct _BlurOverlayChild BlurOverlayChild;
-
-struct _BlurOverlayChild
-{
-  double blur;
-};
-
-enum {
-  GET_CHILD_POSITION,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-static GQuark child_data_quark = 0;
-
-G_DEFINE_TYPE (BlurOverlay, blur_overlay, GTK_TYPE_BIN)
-
-static void
-blur_overlay_set_overlay_child (GtkWidget       *widget,
-                               BlurOverlayChild *child_data)
-{
-  g_object_set_qdata_full (G_OBJECT (widget), child_data_quark, child_data, g_free);
-}
-
-static BlurOverlayChild *
-blur_overlay_get_overlay_child (GtkWidget *widget)
-{
-  return (BlurOverlayChild *) g_object_get_qdata (G_OBJECT (widget), child_data_quark);
-}
-
-static void
-blur_overlay_measure (GtkWidget      *widget,
-                     GtkOrientation  orientation,
-                     int             for_size,
-                     int            *minimum,
-                     int            *natural,
-                     int            *minimum_baseline,
-                     int            *natural_baseline)
-{
-  GtkWidget *child;
-
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      int child_min, child_nat, child_min_baseline, child_nat_baseline;
-
-      gtk_widget_measure (child,
-                          orientation,
-                          for_size,
-                          &child_min, &child_nat,
-                          &child_min_baseline, &child_nat_baseline);
-
-      *minimum = MAX (*minimum, child_min);
-      *natural = MAX (*natural, child_nat);
-      if (child_min_baseline > -1)
-        *minimum_baseline = MAX (*minimum_baseline, child_min_baseline);
-      if (child_nat_baseline > -1)
-        *natural_baseline = MAX (*natural_baseline, child_nat_baseline);
-    }
-}
-
-static void
-blur_overlay_compute_child_allocation (BlurOverlay      *overlay,
-                                      GtkWidget       *widget,
-                                      BlurOverlayChild *child,
-                                      GtkAllocation   *widget_allocation)
-{
-  GtkAllocation allocation;
-  gboolean result;
-
-  g_signal_emit (overlay, signals[GET_CHILD_POSITION],
-                 0, widget, &allocation, &result);
-
-  widget_allocation->x = allocation.x;
-  widget_allocation->y = allocation.y;
-  widget_allocation->width = allocation.width;
-  widget_allocation->height = allocation.height;
-}
-
-static GtkAlign
-effective_align (GtkAlign         align,
-                 GtkTextDirection direction)
-{
-  switch (align)
-    {
-    case GTK_ALIGN_START:
-      return direction == GTK_TEXT_DIR_RTL ? GTK_ALIGN_END : GTK_ALIGN_START;
-    case GTK_ALIGN_END:
-      return direction == GTK_TEXT_DIR_RTL ? GTK_ALIGN_START : GTK_ALIGN_END;
-    case GTK_ALIGN_FILL:
-    case GTK_ALIGN_CENTER:
-    case GTK_ALIGN_BASELINE:
-    default:
-      return align;
-    }
-}
-
-static void
-blur_overlay_child_update_style_classes (BlurOverlay *overlay,
-                                         GtkWidget *child,
-                                         GtkAllocation *child_allocation)
-{
-  int width, height;
-  GtkAlign valign, halign;
-  gboolean is_left, is_right, is_top, is_bottom;
-  gboolean has_left, has_right, has_top, has_bottom;
-  GtkStyleContext *context;
-
-  context = gtk_widget_get_style_context (child);
-  has_left = gtk_style_context_has_class (context, GTK_STYLE_CLASS_LEFT);
-  has_right = gtk_style_context_has_class (context, GTK_STYLE_CLASS_RIGHT);
-  has_top = gtk_style_context_has_class (context, GTK_STYLE_CLASS_TOP);
-  has_bottom = gtk_style_context_has_class (context, GTK_STYLE_CLASS_BOTTOM);
-
-  is_left = is_right = is_top = is_bottom = FALSE;
-
-  width = gtk_widget_get_width (GTK_WIDGET (overlay));
-  height = gtk_widget_get_height (GTK_WIDGET (overlay));
-
-  halign = effective_align (gtk_widget_get_halign (child),
-                            gtk_widget_get_direction (child));
-
-  if (halign == GTK_ALIGN_START)
-    is_left = (child_allocation->x == 0);
-  else if (halign == GTK_ALIGN_END)
-    is_right = (child_allocation->x + child_allocation->width == width);
-
-  valign = gtk_widget_get_valign (child);
-
-  if (valign == GTK_ALIGN_START)
-    is_top = (child_allocation->y == 0);
-  else if (valign == GTK_ALIGN_END)
-    is_bottom = (child_allocation->y + child_allocation->height == height);
-
-  if (has_left && !is_left)
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_LEFT);
-  else if (!has_left && is_left)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_LEFT);
-
-  if (has_right && !is_right)
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_RIGHT);
-  else if (!has_right && is_right)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_RIGHT);
-
-  if (has_top && !is_top)
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_TOP);
-  else if (!has_top && is_top)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOP);
-
-  if (has_bottom && !is_bottom)
-    gtk_style_context_remove_class (context, GTK_STYLE_CLASS_BOTTOM);
-  else if (!has_bottom && is_bottom)
-    gtk_style_context_add_class (context, GTK_STYLE_CLASS_BOTTOM);
-}
-
-static void
-blur_overlay_child_allocate (BlurOverlay      *overlay,
-                            GtkWidget       *widget,
-                            BlurOverlayChild *child)
-{
-  GtkAllocation child_allocation;
-
-  if (!gtk_widget_get_visible (widget))
-    return;
-
-  blur_overlay_compute_child_allocation (overlay, widget, child, &child_allocation);
-
-  blur_overlay_child_update_style_classes (overlay, widget, &child_allocation);
-  gtk_widget_size_allocate (widget, &child_allocation, -1);
-}
-
-static void
-blur_overlay_size_allocate (GtkWidget *widget,
-                           int        width,
-                           int        height,
-                           int        baseline)
-{
-  BlurOverlay *overlay = BLUR_OVERLAY (widget);
-  GtkWidget *child;
-  GtkWidget *main_widget;
-
-  main_widget = gtk_bin_get_child (GTK_BIN (overlay));
-  if (main_widget && gtk_widget_get_visible (main_widget))
-    gtk_widget_size_allocate (main_widget,
-                              &(GtkAllocation) {
-                                0, 0,
-                                width, height
-                              }, -1);
-
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      if (child != main_widget)
-        {
-          BlurOverlayChild *child_data = blur_overlay_get_overlay_child (child);
-          blur_overlay_child_allocate (overlay, child, child_data);
-        }
-    }
-}
-
-static gboolean
-blur_overlay_get_child_position (BlurOverlay    *overlay,
-                                 GtkWidget      *widget,
-                                 GtkAllocation  *alloc)
-{
-  GtkRequisition min, req;
-  GtkAlign halign;
-  GtkTextDirection direction;
-  int width, height;
-
-  gtk_widget_get_preferred_size (widget, &min, &req);
-  width = gtk_widget_get_width (GTK_WIDGET (overlay));
-  height = gtk_widget_get_height (GTK_WIDGET (overlay));
-
-  alloc->x = 0;
-  alloc->width = MAX (min.width, MIN (width, req.width));
-
-  direction = gtk_widget_get_direction (widget);
-
-  halign = gtk_widget_get_halign (widget);
-  switch (effective_align (halign, direction))
-    {
-    case GTK_ALIGN_START:
-      /* nothing to do */
-      break;
-    case GTK_ALIGN_FILL:
-      alloc->width = MAX (alloc->width, width);
-      break;
-    case GTK_ALIGN_CENTER:
-      alloc->x += width / 2 - alloc->width / 2;
-      break;
-    case GTK_ALIGN_END:
-      alloc->x += width - alloc->width;
-      break;
-    case GTK_ALIGN_BASELINE:
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-
-  alloc->y = 0;
-  alloc->height = MAX  (min.height, MIN (height, req.height));
-
-  switch (gtk_widget_get_valign (widget))
-    {
-    case GTK_ALIGN_START:
-      /* nothing to do */
-      break;
-    case GTK_ALIGN_FILL:
-      alloc->height = MAX (alloc->height, height);
-      break;
-    case GTK_ALIGN_CENTER:
-      alloc->y += height / 2 - alloc->height / 2;
-      break;
-    case GTK_ALIGN_END:
-      alloc->y += height - alloc->height;
-      break;
-    case GTK_ALIGN_BASELINE:
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-
-  return TRUE;
-}
-
-static void
-blur_overlay_add (GtkContainer *container,
-                  GtkWidget    *widget)
-{
-  BlurOverlay *overlay = BLUR_OVERLAY (container);
-  gtk_widget_insert_after (widget, GTK_WIDGET (container), NULL);
-  overlay->main_widget = widget;  
-}
-
-static void
-blur_overlay_remove (GtkContainer *container,
-                     GtkWidget    *widget)
-{
-  BlurOverlay *overlay = BLUR_OVERLAY (container);
-  gtk_widget_unparent (widget);
-  if (overlay->main_widget == widget)
-    overlay->main_widget = NULL;
-}
-
-static void
-blur_overlay_forall (GtkContainer *overlay,
-                    GtkCallback   callback,
-                    gpointer      callback_data)
-{
-  GtkWidget *child;
-
-  child = gtk_widget_get_first_child (GTK_WIDGET (overlay));
-  while (child != NULL)
-    {
-      GtkWidget *next = gtk_widget_get_next_sibling (child);
-
-      (* callback) (child, callback_data);
-
-      child = next;
-    }
-}
-
-static void
-blur_overlay_snapshot (GtkWidget   *widget,
-                      GtkSnapshot *snapshot)
-{
-  GtkWidget *main_widget;
-  GskRenderNode *main_widget_node = NULL;
-  GtkWidget *child;
-  GtkAllocation main_alloc;
-  cairo_region_t *clip = NULL;
-  int i;
-
-  main_widget = BLUR_OVERLAY (widget)->main_widget;
-  gtk_widget_get_allocation (widget, &main_alloc);
-
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      BlurOverlayChild *child_info = blur_overlay_get_overlay_child (child);
-      double blur = 0;
-      if (child_info)
-        blur = child_info->blur;
-
-      if (blur > 0)
-        {
-          GtkAllocation alloc;
-          graphene_rect_t bounds;
-
-          if (main_widget_node == NULL)
-            {
-              GtkSnapshot *child_snapshot;
-
-              child_snapshot = gtk_snapshot_new ();
-              gtk_widget_snapshot_child (widget, main_widget, child_snapshot);
-              main_widget_node = gtk_snapshot_free_to_node (child_snapshot);
-            }
-
-          gtk_widget_get_allocation (child, &alloc);
-          graphene_rect_init (&bounds, alloc.x, alloc.y, alloc.width, alloc.height);
-          gtk_snapshot_push_blur (snapshot, blur);
-          gtk_snapshot_push_clip (snapshot, &bounds);
-          gtk_snapshot_append_node (snapshot, main_widget_node);
-          gtk_snapshot_pop (snapshot);
-          gtk_snapshot_pop (snapshot);
-
-          if (clip == NULL)
-            {
-              cairo_rectangle_int_t rect;
-              rect.x = rect.y = 0;
-              rect.width = main_alloc.width;
-              rect.height = main_alloc.height;
-              clip = cairo_region_create_rectangle (&rect);
-            }
-          cairo_region_subtract_rectangle (clip, (cairo_rectangle_int_t *)&alloc);
-        }
-    }
-
-  if (clip == NULL)
-    {
-      for (child = gtk_widget_get_first_child (widget);
-           child != NULL;
-           child = gtk_widget_get_next_sibling (child))
-        {
-          gtk_widget_snapshot_child (widget, child, snapshot);
-        }
-      return;
-    }
-
-  for (i = 0; i < cairo_region_num_rectangles (clip); i++)
-    {
-      cairo_rectangle_int_t rect;
-      graphene_rect_t bounds;
-
-      cairo_region_get_rectangle (clip, i, &rect);
-      graphene_rect_init (&bounds, rect.x, rect.y, rect.width, rect.height);
-      gtk_snapshot_push_clip (snapshot, &bounds);
-      gtk_snapshot_append_node (snapshot, main_widget_node);
-      gtk_snapshot_pop (snapshot);
-    }
-
-  cairo_region_destroy (clip);
-
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      if (child != main_widget)
-        gtk_widget_snapshot_child (widget, child, snapshot);
-    }
-
-  gsk_render_node_unref (main_widget_node);
-}
-
-static void
-blur_overlay_class_init (BlurOverlayClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
-
-  widget_class->measure = blur_overlay_measure;
-  widget_class->size_allocate = blur_overlay_size_allocate;
-  widget_class->snapshot = blur_overlay_snapshot;
-
-  container_class->add = blur_overlay_add;
-  container_class->remove = blur_overlay_remove;
-  container_class->forall = blur_overlay_forall;
-
-  klass->get_child_position = blur_overlay_get_child_position;
-
-  signals[GET_CHILD_POSITION] =
-    g_signal_new ("get-child-position",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (BlurOverlayClass, get_child_position),
-                  g_signal_accumulator_true_handled, NULL,
-                  NULL,
-                  G_TYPE_BOOLEAN, 2,
-                  GTK_TYPE_WIDGET,
-                  GDK_TYPE_RECTANGLE | G_SIGNAL_TYPE_STATIC_SCOPE);
-
-  child_data_quark = g_quark_from_static_string ("gtk-overlay-child-data");
-
-  gtk_widget_class_set_css_name (widget_class, "overlay");
-}
-
-static void
-blur_overlay_init (BlurOverlay *overlay)
-{
-}
-
-GtkWidget *
-blur_overlay_new (void)
-{
-  return g_object_new (BLUR_TYPE_OVERLAY, NULL);
-}
-
-void
-blur_overlay_add_overlay (BlurOverlay *overlay,
-                          GtkWidget   *widget,
-                          double       blur)
-{
-  BlurOverlayChild *child = g_new0 (BlurOverlayChild, 1);
-
-  gtk_widget_insert_before (widget, GTK_WIDGET (overlay), NULL);
-
-  child->blur = blur;
-
-  blur_overlay_set_overlay_child (widget, child);
-}
--- a/demos/gtk-demo/bluroverlay.h
+++ b/demos/gtk-demo/bluroverlay.h
@@ -1,65 +0,0 @@
-/*
- * bluroverlay.h
- * This file is part of gtk
- *
- * Copyright (C) 2011 - Ignacio Casal Quinteiro, Mike Krüger
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __BLUR_OVERLAY_H__
-#define __BLUR_OVERLAY_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define BLUR_TYPE_OVERLAY             (blur_overlay_get_type ())
-#define BLUR_OVERLAY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), BLUR_TYPE_OVERLAY, BlurOverlay))
-#define BLUR_OVERLAY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), BLUR_TYPE_OVERLAY, BlurOverlayClass))
-#define BLUR_IS_OVERLAY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), BLUR_TYPE_OVERLAY))
-#define BLUR_IS_OVERLAY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), BLUR_TYPE_OVERLAY))
-#define BLUR_OVERLAY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), BLUR_TYPE_OVERLAY, BlurOverlayClass))
-
-typedef struct _BlurOverlay         BlurOverlay;
-typedef struct _BlurOverlayClass    BlurOverlayClass;
-
-struct _BlurOverlay
-{
-  GtkBin parent_instance;
-
-  GtkWidget *main_widget;
-};
-
-struct _BlurOverlayClass
-{
-  GtkBinClass parent_class;
-
-  gboolean (*get_child_position) (BlurOverlay   *overlay,
-                                  GtkWidget     *widget,
-                                  GtkAllocation *allocation);
-};
-
-GDK_AVAILABLE_IN_ALL
-GType      blur_overlay_get_type    (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
-GtkWidget *blur_overlay_new         (void);
-GDK_AVAILABLE_IN_ALL
-void       blur_overlay_add_overlay (BlurOverlay *overlay,
-                                     GtkWidget   *widget,
-                                     double       blur);
-
-G_END_DECLS
-
-#endif /* __BLUR_OVERLAY_H__ */
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -0,0 +1,127 @@
+/* Button Boxes
+ *
+ * The Button Box widgets are used to arrange buttons with padding.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+static GtkWidget *
+create_bbox (gint  horizontal,
+             char *title,
+             gint  spacing,
+             gint  layout)
+{
+  GtkWidget *frame;
+  GtkWidget *bbox;
+  GtkWidget *button;
+
+  frame = gtk_frame_new (title);
+
+  if (horizontal)
+    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+  else
+    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
+
+  g_object_set (bbox, "margin", 5, NULL);
+
+  gtk_container_add (GTK_CONTAINER (frame), bbox);
+
+  gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
+  gtk_box_set_spacing (GTK_BOX (bbox), spacing);
+
+  button = gtk_button_new_with_label (_("OK"));
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+
+  button = gtk_button_new_with_label (_("Cancel"));
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+
+  button = gtk_button_new_with_label (_("Help"));
+  gtk_container_add (GTK_CONTAINER (bbox), button);
+
+  return frame;
+}
+
+GtkWidget *
+do_button_box (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  GtkWidget *main_vbox;
+  GtkWidget *vbox;
+  GtkWidget *hbox;
+  GtkWidget *frame_horz;
+  GtkWidget *frame_vert;
+
+  if (!window)
+  {
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_display (GTK_WINDOW (window),
+                            gtk_widget_get_display (do_widget));
+    gtk_window_set_title (GTK_WINDOW (window), "Button Boxes");
+
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed),
+                      &window);
+
+    main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+    g_object_set (main_vbox, "margin", 10, NULL);
+    gtk_container_add (GTK_CONTAINER (window), main_vbox);
+
+    frame_horz = gtk_frame_new ("Horizontal Button Boxes");
+    gtk_widget_set_margin_top (frame_horz, 10);
+    gtk_widget_set_margin_bottom (frame_horz, 10);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz);
+
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+    g_object_set (vbox, "margin", 10, NULL);
+    gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD));
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE));
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START));
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END));
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER));
+
+    gtk_box_pack_start (GTK_BOX (vbox),
+                        create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
+
+    frame_vert = gtk_frame_new ("Vertical Button Boxes");
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert);
+
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+    g_object_set (hbox, "margin", 10, NULL);
+    gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
+
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD));
+
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE));
+
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START));
+
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END));
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER));
+    gtk_box_pack_start (GTK_BOX (hbox),
+                        create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND));
+  }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -7,7 +7,7 @@
 * computers, as long as there is a network connection to the
 * computer where the application is running.
 *
- * Only some of the windowing systems where GTK runs have the
+ * Only some of the windowing systems where GTK+ runs have the
 * concept of multiple displays. (The X Window System is the
 * main example.) Other windowing systems can only handle one
 * keyboard and mouse, and combine all monitors into
@@ -71,20 +71,28 @@ find_toplevel_at_pointer (GdkDisplay *display)
  GdkSurface *pointer_window;
  GtkWidget *widget = NULL;

-  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (), NULL, NULL);
+  pointer_window = gdk_device_get_surface_at_position (gtk_get_current_event_device (),
+                                                      NULL, NULL);

+  /* The user data field of a GdkSurface is used to store a pointer
+   * to the widget that created it.
+   */
  if (pointer_window)
-    widget = GTK_WIDGET (gtk_native_get_for_surface (pointer_window));
+    {
+      gpointer widget_ptr;
+      gdk_surface_get_user_data (pointer_window, &widget_ptr);
+      widget = widget_ptr;
+    }

-  return widget;
+  return widget ? gtk_widget_get_toplevel (widget) : NULL;
 }

 static void
-released_cb (GtkGestureClick *gesture,
-             guint            n_press,
-             gdouble          x,
-             gdouble          y,
-             gboolean        *clicked)
+released_cb (GtkGestureMultiPress *gesture,
+             guint                 n_press,
+             gdouble               x,
+             gdouble               y,
+             gboolean             *clicked)
 {
  *clicked = TRUE;
 }
@@ -105,6 +113,7 @@ query_for_toplevel (GdkDisplay *display,
  popup = gtk_window_new (GTK_WINDOW_POPUP);
  gtk_window_set_display (GTK_WINDOW (popup), display);
  gtk_window_set_modal (GTK_WINDOW (popup), TRUE);
+  gtk_window_set_position (GTK_WINDOW (popup), GTK_WIN_POS_CENTER);

  frame = gtk_frame_new (NULL);
  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
@@ -119,11 +128,11 @@ query_for_toplevel (GdkDisplay *display,
  device = gtk_get_current_event_device ();

  if (gdk_seat_grab (gdk_device_get_seat (device),
-                     gtk_native_get_surface (GTK_NATIVE (popup)),
+                     gtk_widget_get_surface (popup),
                     GDK_SEAT_CAPABILITY_ALL_POINTING,
                     FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
    {
-      GtkGesture *gesture = gtk_gesture_click_new ();
+      GtkGesture *gesture = gtk_gesture_multi_press_new ();
      gboolean clicked = FALSE;

      g_signal_connect (gesture, "released",
@@ -306,7 +315,7 @@ create_frame (ChangeDisplayInfo *info,
                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
                                       GTK_SHADOW_IN);
-  gtk_container_add (GTK_CONTAINER (hbox), scrollwin);
+  gtk_box_pack_start (GTK_BOX (hbox), scrollwin);

  *tree_view = gtk_tree_view_new ();
  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
@@ -316,7 +325,7 @@ create_frame (ChangeDisplayInfo *info,
  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);

  *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_container_add (GTK_CONTAINER (hbox), *button_vbox);
+  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox);

  if (!info->size_group)
    info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -356,11 +365,11 @@ create_display_frame (ChangeDisplayInfo *info)

  button = left_align_button_new ("_Open...");
  g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
-  gtk_container_add (GTK_CONTAINER (button_vbox), button);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button);

  button = left_align_button_new ("_Close");
  g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
-  gtk_container_add (GTK_CONTAINER (button_vbox), button);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button);

  info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
                                                            G_TYPE_STRING,
@@ -533,10 +542,10 @@ do_changedisplay (GtkWidget *do_widget)

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      g_object_set (vbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (content_area), vbox);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox);

      frame = create_display_frame (info);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      initialize_displays (info);

--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -28,7 +28,7 @@ copy_button_clicked (GtkWidget *button,
  clipboard = gtk_widget_get_clipboard (entry);

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

 void
@@ -50,7 +50,7 @@ paste_received (GObject      *source_object,
  if (text)
    {
      /* Set the entry text */
-      gtk_editable_set_text (GTK_EDITABLE (entry), text);
+      gtk_entry_set_text (GTK_ENTRY (entry), text);
      g_free (text);
    }
  else
@@ -259,45 +259,45 @@ do_clipboard (GtkWidget *do_widget)

      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");

-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      /* Create the first entry */
      entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (hbox), entry);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (copy_button_clicked), entry);

      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      /* Create the second entry */
      entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (hbox), entry);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_pack_start (GTK_BOX (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (paste_button_clicked), entry);

      label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      g_object_set (hbox, "margin", 8, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      /* Create the first image */
      image = gtk_image_new_from_icon_name ("dialog-warning");
@@ -319,7 +319,7 @@ do_clipboard (GtkWidget *do_widget)
                        G_CALLBACK (drag_data_received), image);

      /* context menu on image */
-      gesture = gtk_gesture_click_new ();
+      gesture = gtk_gesture_multi_press_new ();
      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
@@ -344,7 +344,7 @@ do_clipboard (GtkWidget *do_widget)
                        G_CALLBACK (drag_data_received), image);

      /* context menu on image */
-      gesture = gtk_gesture_click_new ();
+      gesture = gtk_gesture_multi_press_new ();
      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
      g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -1,7 +1,7 @@
 /* Color Chooser
 *
 * A GtkColorChooser lets the user choose a color. There are several
- * implementations of the GtkColorChooser interface in GTK. The
+ * implementations of the GtkColorChooser interface in GTK+. The
 * GtkColorChooserDialog is a prebuilt dialog containing a
 * GtkColorChooserWidget.
 */
@@ -88,7 +88,7 @@ do_colorsel (GtkWidget *do_widget)

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200);
@@ -101,7 +101,7 @@ do_colorsel (GtkWidget *do_widget)
      gtk_widget_set_halign (button, GTK_ALIGN_END);
      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);

-      gtk_container_add (GTK_CONTAINER (vbox), button);
+      gtk_box_pack_start (GTK_BOX (vbox), button);

      g_signal_connect (button, "clicked",
                        G_CALLBACK (change_color_callback), NULL);
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -256,7 +256,7 @@ mask_entry_set_background (MaskEntry *entry)
 {
  if (entry->mask)
    {
-      if (!g_regex_match_simple (entry->mask, gtk_editable_get_text (GTK_EDITABLE (entry)), 0, 0))
+      if (!g_regex_match_simple (entry->mask, gtk_entry_get_text (GTK_ENTRY (entry)), 0, 0))
        {
          PangoAttrList *attrs;

@@ -326,7 +326,7 @@ do_combobox (GtkWidget *do_widget)
     *  insensitive rows
     */
    frame = gtk_frame_new ("Items with icons");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -367,7 +367,7 @@ do_combobox (GtkWidget *do_widget)
    /* A combobox demonstrating trees.
     */
    frame = gtk_frame_new ("Where are we ?");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget)

    /* A GtkComboBoxEntry with validation */
    frame = gtk_frame_new ("Editable");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
@@ -413,7 +413,7 @@ do_combobox (GtkWidget *do_widget)

    /* A combobox with string IDs */
    frame = gtk_frame_new ("String IDs");
-    gtk_container_add (GTK_CONTAINER (vbox), frame);
+    gtk_box_pack_start (GTK_BOX (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 5, NULL);
--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -13,22 +13,19 @@ show_parsing_error (GtkCssProvider *provider,
                    const GError   *error,
                    GtkTextBuffer  *buffer)
 {
-  const GtkCssLocation *start_location, *end_location;
  GtkTextIter start, end;
  const char *tag_name;

-  start_location = gtk_css_section_get_start_location (section);
  gtk_text_buffer_get_iter_at_line_index (buffer,
                                          &start,
-                                          start_location->lines,
-                                          start_location->line_bytes);
-  end_location = gtk_css_section_get_end_location (section);
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
  gtk_text_buffer_get_iter_at_line_index (buffer,
                                          &end,
-                                          end_location->lines,
-                                          end_location->line_bytes);
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));

-  if (error->domain == GTK_CSS_PARSER_WARNING)
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
    tag_name = "warning";
  else
    tag_name = "error";
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -13,23 +13,19 @@ show_parsing_error (GtkCssProvider *provider,
                    const GError   *error,
                    GtkTextBuffer  *buffer)
 {
-  const GtkCssLocation *start_location, *end_location;
  GtkTextIter start, end;
  const char *tag_name;

-  start_location = gtk_css_section_get_start_location (section);
  gtk_text_buffer_get_iter_at_line_index (buffer,
                                          &start,
-                                          start_location->lines,
-                                          start_location->line_bytes);
-  end_location = gtk_css_section_get_end_location (section);
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
  gtk_text_buffer_get_iter_at_line_index (buffer,
                                          &end,
-                                          end_location->lines,
-                                          end_location->line_bytes);
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));

-
-  if (error->domain == GTK_CSS_PARSER_WARNING)
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
    tag_name = "warning";
  else
    tag_name = "error";
--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -12,23 +12,19 @@ show_parsing_error (GtkCssProvider *provider,
                    const GError   *error,
                    GtkTextBuffer  *buffer)
 {
-  const GtkCssLocation *start_location, *end_location;
  GtkTextIter start, end;
  const char *tag_name;

-  start_location = gtk_css_section_get_start_location (section);
  gtk_text_buffer_get_iter_at_line_index (buffer,
                                          &start,
-                                          start_location->lines,
-                                          start_location->line_bytes);
-  end_location = gtk_css_section_get_end_location (section);
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
  gtk_text_buffer_get_iter_at_line_index (buffer,
                                          &end,
-                                          end_location->lines,
-                                          end_location->line_bytes);
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));

-
-  if (error->domain == GTK_CSS_PARSER_WARNING)
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
    tag_name = "warning";
  else
    tag_name = "error";
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -11,22 +11,19 @@ show_parsing_error (GtkCssProvider *provider,
                    const GError   *error,
                    GtkTextBuffer  *buffer)
 {
-  const GtkCssLocation *start_location, *end_location;
  GtkTextIter start, end;
  const char *tag_name;

-  start_location = gtk_css_section_get_start_location (section);
  gtk_text_buffer_get_iter_at_line_index (buffer,
                                          &start,
-                                          start_location->lines,
-                                          start_location->line_bytes);
-  end_location = gtk_css_section_get_end_location (section);
+                                          gtk_css_section_get_start_line (section),
+                                          gtk_css_section_get_start_position (section));
  gtk_text_buffer_get_iter_at_line_index (buffer,
                                          &end,
-                                          end_location->lines,
-                                          end_location->line_bytes);
+                                          gtk_css_section_get_end_line (section),
+                                          gtk_css_section_get_end_position (section));

-  if (error->domain == GTK_CSS_PARSER_WARNING)
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
    tag_name = "warning";
  else
    tag_name = "error";
--- a/demos/gtk-demo/cursors.ui
+++ b/demos/gtk-demo/cursors.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires gtk+ 3.94 -->
  <object class="GdkCursor" id="default_cursor">
    <property name="name">default</property>
  </object>
--- a/demos/gtk-demo/data/16x16/gtk4-demo-symbolic.symbolic.png
+++ b/demos/gtk-demo/data/16x16/gtk4-demo-symbolic.symbolic.png
--- a/demos/gtk-demo/data/16x16/gtk4-demo.png
+++ b/demos/gtk-demo/data/16x16/gtk4-demo.png
--- a/demos/gtk-demo/data/22x22/gtk4-demo-symbolic.symbolic.png
+++ b/demos/gtk-demo/data/22x22/gtk4-demo-symbolic.symbolic.png
--- a/demos/gtk-demo/data/22x22/gtk4-demo.png
+++ b/demos/gtk-demo/data/22x22/gtk4-demo.png
--- a/demos/gtk-demo/data/24x24/gtk4-demo-symbolic.symbolic.png
+++ b/demos/gtk-demo/data/24x24/gtk4-demo-symbolic.symbolic.png
--- a/demos/gtk-demo/data/24x24/gtk4-demo.png
+++ b/demos/gtk-demo/data/24x24/gtk4-demo.png
--- a/demos/gtk-demo/data/256x256/gtk4-demo-symbolic.symbolic.png
+++ b/demos/gtk-demo/data/256x256/gtk4-demo-symbolic.symbolic.png
--- a/demos/gtk-demo/data/256x256/gtk4-demo.png
+++ b/demos/gtk-demo/data/256x256/gtk4-demo.png
--- a/demos/gtk-demo/data/32x32/gtk4-demo-symbolic.symbolic.png
+++ b/demos/gtk-demo/data/32x32/gtk4-demo-symbolic.symbolic.png
--- a/demos/gtk-demo/data/32x32/gtk4-demo.png
+++ b/demos/gtk-demo/data/32x32/gtk4-demo.png
--- a/demos/gtk-demo/data/48x48/gtk4-demo-symbolic.symbolic.png
+++ b/demos/gtk-demo/data/48x48/gtk4-demo-symbolic.symbolic.png
--- a/demos/gtk-demo/data/48x48/gtk4-demo.png
+++ b/demos/gtk-demo/data/48x48/gtk4-demo.png
--- a/demos/gtk-demo/data/512x512/gtk4-demo-symbolic.symbolic.png
+++ b/demos/gtk-demo/data/512x512/gtk4-demo-symbolic.symbolic.png
--- a/demos/gtk-demo/data/512x512/gtk4-demo.png
+++ b/demos/gtk-demo/data/512x512/gtk4-demo.png
--- a/demos/gtk-demo/data/scalable/apps/org.gtk.Demo4.svg
+++ b/demos/gtk-demo/data/scalable/apps/org.gtk.Demo4.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.0"><defs><linearGradient id="f"><stop offset="0" stop-color="#ff7800"/><stop offset="1" stop-color="#ed333b"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#f5c211"/><stop offset="1" stop-color="#33d17a" stop-opacity=".899"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#c0bfbc"/><stop offset=".036" stop-color="#fafaf9"/><stop offset=".088" stop-color="#c0bfbc"/><stop offset=".399" stop-color="#d5d5d3"/><stop offset=".491" stop-color="#eaeae9"/><stop offset=".569" stop-color="#a7a5a1"/><stop offset=".966" stop-color="#a9a7a3"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#949390"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#9a9996"/><stop offset="1" stop-color="#77767b"/></linearGradient><linearGradient xlink:href="#d" id="g" x1="-142.049" y1="236.001" x2="-9.951" y2="236.001" gradientUnits="userSpaceOnUse"/><radialGradient xlink:href="#e" id="h" cx="90.974" cy="263.479" fx="90.974" fy="263.479" r="22.703" gradientTransform="matrix(1.90297 -.05506 .0501 1.73133 -89.25 -176.863)" gradientUnits="userSpaceOnUse"/><radialGradient xlink:href="#f" id="i" cx="61.718" cy="270.719" fx="61.718" fy="270.719" r="22.703" gradientTransform="matrix(2.49049 0 0 2.92132 -91.99 -503.52)" gradientUnits="userSpaceOnUse"/></defs><path transform="translate(123.265 -118.118) scale(.7798)" d="M-75.74 161.438a10.997 10.997 0 0 0-5.758 1.468l-55.053 31.785a10.997 10.997 0 0 0-5.498 9.524v63.57a10.997 10.997 0 0 0 5.498 9.524l55.053 31.785a10.997 10.997 0 0 0 10.996 0l55.053-31.785a10.997 10.997 0 0 0 5.498-9.524v-63.57a10.997 10.997 0 0 0-5.498-9.524l-55.053-31.785a10.997 10.997 0 0 0-5.238-1.469z" style="marker:none" fill="url(#g)"/><path style="marker:none" d="M64.203 3.77a8.575 8.575 0 0 0-4.49 1.146l-42.93 24.786a8.575 8.575 0 0 0-4.288 7.427V86.7a8.575 8.575 0 0 0 4.287 7.426l42.93 24.786a8.575 8.575 0 0 0 8.575 0l42.93-24.786a8.575 8.575 0 0 0 4.288-7.426V37.129a8.575 8.575 0 0 0-4.287-7.427L68.288 4.916a8.575 8.575 0 0 0-4.085-1.145z" fill="#fff"/><path style="marker:none" d="M109.869 33.297L64 59.779 18.131 33.297 64 6.814z" fill="#98c1f1"/><path style="marker:none" d="M66.263 287.505l45.35-25.884.056-52.762-45.406 26.215z" fill="url(#h)" transform="translate(0 -172)"/><path d="M61.718 287.34l-45.35-25.885-.056-52.761 45.406 26.215z" style="marker:none" fill="url(#i)" transform="translate(0 -172)"/></svg>
--- a/demos/gtk-demo/data/source.svg
+++ b/demos/gtk-demo/data/source.svg
--- a/demos/gtk-demo/data/symbolic-source.svg
+++ b/demos/gtk-demo/data/symbolic-source.svg
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='gtk3-demo-symbolic.svg' height='16.000015' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.5 r10040' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='-12.5126' inkscape:cy='-0.73412416' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1375' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='5.6568542'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-182.99998px' originy='-251.99998px' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient7212' osb:paint='solid'>
+      <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+    </linearGradient>
+  </defs>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-424.00018,35)'>
+    
+    <rect height='8.0000048' id='rect7866' style='opacity:0.3;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' transform='matrix(0.83205029,0.5547002,0,1,0,0)' width='7.2111053' x='510.78668' y='-314.33347'/>
+    <rect height='8.0000086' id='rect7868' style='opacity:0.5;color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new' transform='matrix(-0.86824295,0.49613928,0,1,0,0)' width='8.0622425' x='-505.61908' y='219.8575'/>
+    <path inkscape:connector-curvature='0' d='m 431.53145,-28 -5.875,-3.65625 6.8125,-3.34375 6.03125,3 z' id='path7870' sodipodi:nodetypes='ccccc' style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.39999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
+  </g>
+</svg>
--- a/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo4-symbolic.svg
+++ b/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo4-symbolic.svg
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="org.gtk.Demo4-symbolic.svg"
-   height="16.03125"
-   id="svg7384"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   version="1.1"
-   width="16">
-  <metadata
-     id="metadata90">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Gnome Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:bbox-paths="true"
-     bordercolor="#666666"
-     borderopacity="1"
-     inkscape:current-layer="layer9"
-     inkscape:cx="0.53203442"
-     inkscape:cy="9.1822592"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="false"
-     inkscape:object-paths="false"
-     objecttolerance="10"
-     pagecolor="#555753"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="true"
-     showgrid="false"
-     showguides="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="1375"
-     inkscape:window-maximized="1"
-     inkscape:window-width="2560"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="1">
-    <inkscape:grid
-       empspacing="2"
-       enabled="true"
-       id="grid4866"
-       originx="-203"
-       originy="-251.96875"
-       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
-       type="xygrid"
-       visible="true" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs7386">
-    <linearGradient
-       id="linearGradient7212"
-       osb:paint="solid">
-      <stop
-         id="stop7214"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-    </linearGradient>
-  </defs>
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="apps"
-     style="display:inline"
-     transform="translate(-444.0002,35)">
-    <path
-       style="display:inline;opacity:0.3;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
-       d="m 457.97232,-31.569556 -5.96212,3.44224 -5.96215,-3.44224 v 0 l 5.96215,-3.44226 z"
-       id="path870-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       sodipodi:nodetypes="cccccc"
-       inkscape:connector-curvature="0"
-       id="path886-9"
-       d="m 450.98519,-19.648086 -5.99273,-3.42041 -0.007,-6.97219 v 0 l 6.00018,3.4642 z"
-       style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new" />
-    <path
-       style="display:inline;opacity:0.60100002;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal;enable-background:new"
-       d="m 452.98577,-19.648086 5.99273,-3.42041 0.007,-6.97219 v 0 l -6.00018,3.4642 z"
-       id="path931"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
-  </g>
-</svg>
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -37,9 +37,6 @@
  <gresource prefix="/theming_style_classes">
    <file>theming.ui</file>
  </gresource>
-  <gresource prefix="/themes">
-    <file>themes.ui</file>
-  </gresource>
  <gresource prefix="/css_pixbufs">
    <file alias="gtk.css">css_pixbufs.css</file>
    <file>cssview.css</file>
@@ -146,6 +143,7 @@
    <file>application_demo.c</file>
    <file>assistant.c</file>
    <file>builder.c</file>
+    <file>button_box.c</file>
    <file>changedisplay.c</file>
    <file>clipboard.c</file>
    <file>colorsel.c</file>
@@ -166,7 +164,6 @@
    <file>expander.c</file>
    <file>filtermodel.c</file>
    <file>fishbowl.c</file>
-    <file>fixed.c</file>
    <file>flowbox.c</file>
    <file>foreigndrawing.c</file>
    <file>font_features.c</file>
@@ -182,6 +179,7 @@
    <file>links.c</file>
    <file>listbox.c</file>
    <file>list_store.c</file>
+    <file>listview.c</file>
    <file>markup.c</file>
    <file>menus.c</file>
    <file>modelbutton.c</file>
@@ -193,7 +191,6 @@
    <file>paintable_animated.c</file>
    <file>paintable_mediastream.c</file>
    <file>panes.c</file>
-    <file>password_entry.c</file>
    <file>pickers.c</file>
    <file>pixbufs.c</file>
    <file>popover.c</file>
@@ -211,11 +208,9 @@
    <file>spinbutton.c</file>
    <file>spinner.c</file>
    <file>tabs.c</file>
-    <file>tagged_entry.c</file>
    <file>textview.c</file>
    <file>textscroll.c</file>
    <file>theming_style_classes.c</file>
-    <file>themes.c</file>
    <file>transparent.c</file>
    <file>tree_store.c</file>
    <file>textmask.c</file>
@@ -224,14 +219,16 @@
  <gresource prefix="/textview">
    <file>floppybuddy.gif</file>
  </gresource>
-  <gresource prefix="/tagged_entry">
-    <file>tagstyle.css</file>
-  </gresource>
  <gresource prefix="/listbox">
    <file>listbox.ui</file>
    <file>messages.txt</file>
    <file>apple-red.png</file>
  </gresource>
+  <gresource prefix="/listview">
+    <file>listview.ui</file>
+    <file>messages.txt</file>
+    <file>apple-red.png</file>
+  </gresource>
  <gresource prefix="/popover">
    <file>popover.ui</file>
  </gresource>
@@ -257,7 +254,6 @@
  </gresource>
  <gresource prefix="/transparent">
    <file>portland-rose.jpg</file>
-    <file>bluroverlay.c</file>
  </gresource>
  <gresource prefix="/markup">
    <file>markup.txt</file>
@@ -271,30 +267,4 @@
  <gresource prefix="/dnd">
    <file>dnd.css</file>
  </gresource>
-  <gresource prefix="/tagged_entry">
-    <file>demotaggedentry.c</file>
-    <file>demotaggedentry.h</file>
-  </gresource>
-  <gresource prefix="/fixed">
-    <file>fixed.css</file>
-  </gresource>
-  <gresource prefix="/org/gtk/Demo4">
-    <file>icons/16x16/actions/application-exit.png</file>
-    <file>icons/16x16/actions/document-new.png</file>
-    <file>icons/16x16/actions/document-open.png</file>
-    <file>icons/16x16/actions/document-save.png</file>
-    <file>icons/16x16/actions/edit-copy.png</file>
-    <file>icons/16x16/actions/edit-cut.png</file>
-    <file>icons/16x16/actions/edit-paste.png</file>
-    <file>icons/16x16/actions/process-stop.png</file>
-    <file>icons/16x16/actions/go-home.png</file>
-    <file>icons/16x16/actions/go-up.png</file>
-    <file>icons/16x16/actions/mail-send-receive-symbolic.symbolic.png</file>
-    <file>icons/16x16/actions/view-fullscreen-symbolic.symbolic.png</file>
-    <file>icons/16x16/actions/document-edit-symbolic.symbolic.png</file>
-    <file>icons/16x16/emotes/face-cool.png</file>
-    <file>icons/16x16/emotes/face-laugh-symbolic.symbolic.png</file>
-    <file>icons/16x16/status/battery-caution-charging-symbolic.symbolic.png</file>
-    <file>icons/16x16/categories/applications-other.png</file>
-  </gresource>
 </gresources>
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" standalone="no"?>
+<!--*- mode: xml -*-->
 <interface>
  <object class="GtkListStore" id="liststore1">
    <columns>
@@ -75,7 +76,8 @@
                      </object>
                    </child>
                    <child>
-                      <object class="GtkSeparatorMenuItem"/>
+                      <object class="GtkSeparatorMenuItem">
+                      </object>
                    </child>
                    <child>
                      <object class="GtkMenuItem" id="quit_item">
@@ -172,7 +174,8 @@
              </object>
            </child>
            <child>
-              <object class="GtkSeparatorToolItem"/>
+              <object class="GtkSeparatorToolItem">
+              </object>
            </child>
            <child>
              <object class="GtkToolButton">
@@ -196,6 +199,9 @@
              </object>
            </child>
          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -249,9 +255,16 @@
              </object>
            </child>
          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
        </child>
        <child>
-          <object class="GtkStatusbar" id="statusbar1"/>
+          <object class="GtkStatusbar" id="statusbar1">
+          </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
        </child>
      </object>
    </child>
--- a/demos/gtk-demo/demotaggedentry.c
+++ b/demos/gtk-demo/demotaggedentry.c
@@ -1,489 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2019 Red Hat, Inc.
- *
- * Authors:
- * - Matthias Clasen <mclasen@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "demotaggedentry.h"
-
-#include <gtk/gtk.h>
-#include <gtk/gtk-a11y.h>
-
-typedef struct {
-  GtkWidget *box;
-  GtkWidget *entry;
-} DemoTaggedEntryPrivate;
-
-static void demo_tagged_entry_editable_init (GtkEditableInterface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
-                         G_ADD_PRIVATE (DemoTaggedEntry)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, demo_tagged_entry_editable_init))
-
-static void
-demo_tagged_entry_init (DemoTaggedEntry *entry)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (priv->box, GTK_WIDGET (entry));
-
-  priv->entry = gtk_text_new ();
-  gtk_widget_set_hexpand (priv->entry, TRUE);
-  gtk_widget_set_vexpand (priv->entry, TRUE);
-  gtk_widget_set_hexpand (priv->box, FALSE);
-  gtk_widget_set_vexpand (priv->box, FALSE);
-  gtk_container_add (GTK_CONTAINER (priv->box), priv->entry);
-  gtk_editable_init_delegate (GTK_EDITABLE (entry));
-}
-
-static void
-demo_tagged_entry_dispose (GObject *object)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (object);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  if (priv->entry)
-    gtk_editable_finish_delegate (GTK_EDITABLE (entry));
-
-  g_clear_pointer (&priv->entry, gtk_widget_unparent);
-  g_clear_pointer (&priv->box, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object);
-}
-
-static void
-demo_tagged_entry_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->finalize (object);
-}
-
-static void
-demo_tagged_entry_set_property (GObject      *object,
-                                guint         prop_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  if (gtk_editable_delegate_set_property (object, prop_id, value, pspec))
-    return;
-
-  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-}
-
-static void
-demo_tagged_entry_get_property (GObject    *object,
-                                guint       prop_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  if (gtk_editable_delegate_get_property (object, prop_id, value, pspec))
-    return;
-
-  G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-}
-
-static void
-demo_tagged_entry_measure (GtkWidget      *widget,
-                           GtkOrientation  orientation,
-                           int             for_size,
-                           int            *minimum,
-                           int            *natural,
-                           int            *minimum_baseline,
-                           int            *natural_baseline)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_measure (priv->box, orientation, for_size,
-                      minimum, natural,
-                      minimum_baseline, natural_baseline);
-}
-
-static void
-demo_tagged_entry_size_allocate (GtkWidget *widget,
-                                 int        width,
-                                 int        height,
-                                 int        baseline)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_size_allocate (priv->box,
-                            &(GtkAllocation) { 0, 0, width, height },
-                            baseline);
-}
-
-static void
-demo_tagged_entry_grab_focus (GtkWidget *widget)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  gtk_widget_grab_focus (priv->entry);
-}
-
-static void
-demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = demo_tagged_entry_dispose;
-  object_class->finalize = demo_tagged_entry_finalize;
-  object_class->get_property = demo_tagged_entry_get_property;
-  object_class->set_property = demo_tagged_entry_set_property;
-
-  widget_class->measure = demo_tagged_entry_measure;
-  widget_class->size_allocate = demo_tagged_entry_size_allocate;
-  widget_class->grab_focus = demo_tagged_entry_grab_focus;
- 
-  gtk_editable_install_properties (object_class, 1);
-
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
-  gtk_widget_class_set_css_name (widget_class, "entry");
-}
-
-static GtkEditable *
-demo_tagged_entry_get_delegate (GtkEditable *editable)
-{
-  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (editable);
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  return GTK_EDITABLE (priv->entry);
-}
-
-static void
-demo_tagged_entry_editable_init (GtkEditableInterface *iface)
-{
-  iface->get_delegate = demo_tagged_entry_get_delegate;
-}
-
-GtkWidget *
-demo_tagged_entry_new (void)
-{
-  return GTK_WIDGET (g_object_new (DEMO_TYPE_TAGGED_ENTRY, NULL));
-}
-
-void
-demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
-                           GtkWidget       *tag)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  gtk_container_add (GTK_CONTAINER (priv->box), tag);
-}
-
-void
-demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
-                                    GtkWidget       *tag,
-                                    GtkWidget       *sibling)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  if (sibling == NULL)
-    gtk_container_add (GTK_CONTAINER (priv->box), tag);
-  else
-    gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
-}
-
-void
-demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
-                              GtkWidget       *tag)
-{
-  DemoTaggedEntryPrivate *priv = demo_tagged_entry_get_instance_private (entry);
-
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
-
-  gtk_container_remove (GTK_CONTAINER (priv->box), tag);
-}
-
-struct _DemoTaggedEntryTag
-{
-  GtkWidget parent;
-  GtkWidget *box;
-  GtkWidget *label;
-  GtkWidget *button;
-
-  gboolean has_close_button;
-  char *style;
-};
-
-struct _DemoTaggedEntryTagClass
-{
-  GtkWidgetClass parent_class;
-};
-
-enum {
-  PROP_0,
-  PROP_LABEL,
-  PROP_HAS_CLOSE_BUTTON,
-};
-
-enum {
-  SIGNAL_CLICKED,
-  SIGNAL_BUTTON_CLICKED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0, };
-
-G_DEFINE_TYPE (DemoTaggedEntryTag, demo_tagged_entry_tag, GTK_TYPE_WIDGET)
-
-static void
-on_released (GtkGestureClick      *gesture,
-             int                   n_press,
-             double                x,
-             double                y,
-             DemoTaggedEntryTag   *tag)
-{
-  g_signal_emit (tag, signals[SIGNAL_CLICKED], 0);
-}
-
-static void
-demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
-{
-  GtkGesture *gesture;
-  GtkCssProvider *provider;
-
-  tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
-  tag->label = gtk_label_new ("");
-  gtk_container_add (GTK_CONTAINER (tag->box), tag->label);
-
-  gesture = gtk_gesture_click_new ();
-  g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag);
-  gtk_widget_add_controller (GTK_WIDGET (tag), GTK_EVENT_CONTROLLER (gesture));
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/tagged_entry/tagstyle.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              800);
-  g_object_unref (provider);
-}
-
-static void
-demo_tagged_entry_tag_dispose (GObject *object)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  g_clear_pointer (&tag->box, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (demo_tagged_entry_tag_parent_class)->dispose (object);
-}
-
-static void
-demo_tagged_entry_tag_finalize (GObject *object)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  g_clear_pointer (&tag->box, gtk_widget_unparent);
-  g_clear_pointer (&tag->style, g_free);
-
-  G_OBJECT_CLASS (demo_tagged_entry_tag_parent_class)->finalize (object);
-}
-
-static void
-demo_tagged_entry_tag_set_property (GObject      *object,
-                                    guint         prop_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  switch (prop_id)
-    {
-    case PROP_LABEL:
-      demo_tagged_entry_tag_set_label (tag, g_value_get_string (value));
-      break;
-
-    case PROP_HAS_CLOSE_BUTTON:
-      demo_tagged_entry_tag_set_has_close_button (tag, g_value_get_boolean (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo_tagged_entry_tag_get_property (GObject    *object,
-                                    guint       prop_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (object);
-
-  switch (prop_id)
-    {
-    case PROP_LABEL:
-      g_value_set_string (value, demo_tagged_entry_tag_get_label (tag));
-      break;
-
-    case PROP_HAS_CLOSE_BUTTON:
-      g_value_set_boolean (value, demo_tagged_entry_tag_get_has_close_button (tag));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo_tagged_entry_tag_measure (GtkWidget      *widget,
-                               GtkOrientation  orientation,
-                               int             for_size,
-                               int            *minimum,
-                               int            *natural,
-                               int            *minimum_baseline,
-                               int            *natural_baseline)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (widget);
-
-  gtk_widget_measure (tag->box, orientation, for_size,
-                      minimum, natural,
-                      minimum_baseline, natural_baseline);
-}
-
-static void
-demo_tagged_entry_tag_size_allocate (GtkWidget *widget,
-                                     int        width,
-                                     int        height,
-                                     int        baseline)
-{
-  DemoTaggedEntryTag *tag = DEMO_TAGGED_ENTRY_TAG (widget);
-
-  gtk_widget_size_allocate (tag->box,
-                            &(GtkAllocation) { 0, 0, width, height },
-                            baseline);
-}
-
-static void
-demo_tagged_entry_tag_class_init (DemoTaggedEntryTagClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo_tagged_entry_tag_dispose;
-  object_class->finalize = demo_tagged_entry_tag_finalize;
-  object_class->set_property = demo_tagged_entry_tag_set_property;
-  object_class->get_property = demo_tagged_entry_tag_get_property;
-
-  widget_class->measure = demo_tagged_entry_tag_measure;
-  widget_class->size_allocate = demo_tagged_entry_tag_size_allocate;
-
-  signals[SIGNAL_CLICKED] =
-      g_signal_new ("clicked",
-                    DEMO_TYPE_TAGGED_ENTRY_TAG,
-                    G_SIGNAL_RUN_FIRST,
-                    0, NULL, NULL, NULL,
-                    G_TYPE_NONE, 0);
-  signals[SIGNAL_BUTTON_CLICKED] =
-      g_signal_new ("button-clicked",
-                    DEMO_TYPE_TAGGED_ENTRY_TAG,
-                    G_SIGNAL_RUN_FIRST,
-                    0, NULL, NULL, NULL,
-                    G_TYPE_NONE, 0);
-
-  g_object_class_install_property (object_class, PROP_LABEL,
-      g_param_spec_string ("label", "Label", "Label",
-                           NULL, G_PARAM_READWRITE));
-  g_object_class_install_property (object_class, PROP_HAS_CLOSE_BUTTON,
-      g_param_spec_boolean ("has-close-button", "Has close button", "Whether this tag has a close button",
-                            FALSE, G_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
-
-  gtk_widget_class_set_css_name (widget_class, "tag");
-}
-
-DemoTaggedEntryTag *
-demo_tagged_entry_tag_new (const char *label)
-{
-  return DEMO_TAGGED_ENTRY_TAG (g_object_new (DEMO_TYPE_TAGGED_ENTRY_TAG,
-                                              "label", label,
-                                              NULL));
-}
-
-const char *
-demo_tagged_entry_tag_get_label (DemoTaggedEntryTag *tag)
-{
-  g_return_val_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag), NULL);
-
-  return gtk_label_get_label (GTK_LABEL (tag->label));
-}
-
-void
-demo_tagged_entry_tag_set_label (DemoTaggedEntryTag *tag,
-                                 const char         *label)
-{
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag));
-
-  gtk_label_set_label (GTK_LABEL (tag->label), label);
-}
-
-static void
-on_button_clicked (GtkButton          *button,
-                   DemoTaggedEntryTag *tag)
-{
-  g_signal_emit (tag, signals[SIGNAL_BUTTON_CLICKED], 0);
-}
-
-void
-demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
-                                            gboolean            has_close_button)
-{
-  g_return_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag));
-
-  if ((tag->button != NULL) == has_close_button)
-    return;
-
-  if (!has_close_button && tag->button)
-    {
-      gtk_container_remove (GTK_CONTAINER (tag->box), tag->button);
-      tag->button = NULL;
-    }
-  else if (has_close_button && tag->button == NULL)
-    {
-      GtkWidget *image;
-
-      image = gtk_image_new_from_icon_name ("window-close-symbolic");
-      tag->button = gtk_button_new ();
-      gtk_container_add (GTK_CONTAINER (tag->button), image);
-      gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
-      gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
-      gtk_button_set_relief (GTK_BUTTON (tag->button), GTK_RELIEF_NONE);
-      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
-      g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
-    }
-
-  g_object_notify (G_OBJECT (tag), "has-close-button");
-}
-
-gboolean
-demo_tagged_entry_tag_get_has_close_button (DemoTaggedEntryTag *tag)
-{
-  g_return_val_if_fail (DEMO_IS_TAGGED_ENTRY_TAG (tag), FALSE);
-
-  return tag->button != NULL;
-}
--- a/demos/gtk-demo/demotaggedentry.h
+++ b/demos/gtk-demo/demotaggedentry.h
@@ -1,89 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2019 Red Hat, Inc.
- *
- * Authors:
- * - Matthias Clasen <mclasen@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __DEMO_TAGGED_ENTRY_H__
-#define __DEMO_TAGGED_ENTRY_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define DEMO_TYPE_TAGGED_ENTRY                 (demo_tagged_entry_get_type ())
-#define DEMO_TAGGED_ENTRY(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntry))
-#define DEMO_TAGGED_ENTRY_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
-#define DEMO_IS_TAGGED_ENTRY(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY))
-#define DEMO_IS_TAGGED_ENTRY_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY))
-#define DEMO_TAGGED_ENTRY_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY, DemoTaggedEntryClass))
-
-typedef struct _DemoTaggedEntry       DemoTaggedEntry;
-typedef struct _DemoTaggedEntryClass  DemoTaggedEntryClass;
-
-struct _DemoTaggedEntry
-{
-  GtkWidget parent;
-};
-
-struct _DemoTaggedEntryClass
-{
-  GtkWidgetClass parent_class;
-};
-
-#define DEMO_TYPE_TAGGED_ENTRY_TAG                (demo_tagged_entry_tag_get_type ())
-#define DEMO_TAGGED_ENTRY_TAG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
-#define DEMO_TAGGED_ENTRY_TAG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTag))
-#define DEMO_IS_TAGGED_ENTRY_TAG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG))
-#define DEMO_IS_TAGGED_ENTRY_TAG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), DEMO_TYPE_TAGGED_ENTRY_TAG))
-#define DEMO_TAGGED_ENTRY_TAG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), DEMO_TYPE_TAGGED_ENTRY_TAG, DemoTaggedEntryTagClass))
-
-typedef struct _DemoTaggedEntryTag       DemoTaggedEntryTag;
-typedef struct _DemoTaggedEntryTagClass  DemoTaggedEntryTagClass;
-
-
-GType           demo_tagged_entry_get_type (void) G_GNUC_CONST;
-GType           demo_tagged_entry_tag_get_type (void) G_GNUC_CONST;
-
-GtkWidget *     demo_tagged_entry_new     (void);
-
-void            demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
-                                           GtkWidget       *tag);
-
-void            demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
-                                                    GtkWidget       *tag,
-                                                    GtkWidget       *sibling);
-
-void            demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
-                                              GtkWidget       *tag);
-
-DemoTaggedEntryTag *
-                demo_tagged_entry_tag_new (const char *label);
-
-const char *    demo_tagged_entry_tag_get_label (DemoTaggedEntryTag *tag);
-
-void            demo_tagged_entry_tag_set_label (DemoTaggedEntryTag *tag,
-                                                 const char         *label);
-
-gboolean        demo_tagged_entry_tag_get_has_close_button (DemoTaggedEntryTag *tag);
-
-void            demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,
-                                                            gboolean            has_close_button);
-
-G_END_DECLS
-
-#endif /* __DEMO_TAGGED_ENTRY_H__ */
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -56,20 +56,20 @@ interactive_dialog_clicked (GtkButton *button,
  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_container_add (GTK_CONTAINER (content_area), hbox);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox);

  image = gtk_image_new_from_icon_name ("dialog-question");
  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-  gtk_container_add (GTK_CONTAINER (hbox), image);
+  gtk_box_pack_start (GTK_BOX (hbox), image);

  table = gtk_grid_new ();
  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_container_add (GTK_CONTAINER (hbox), table);
+  gtk_box_pack_start (GTK_BOX (hbox), table);
  label = gtk_label_new_with_mnemonic ("_Entry 1");
  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
  local_entry1 = gtk_entry_new ();
-  gtk_editable_set_text (GTK_EDITABLE (local_entry1), gtk_editable_get_text (GTK_EDITABLE (entry1)));
+  gtk_entry_set_text (GTK_ENTRY (local_entry1), gtk_entry_get_text (GTK_ENTRY (entry1)));
  gtk_grid_attach (GTK_GRID (table), local_entry1, 1, 0, 1, 1);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry1);

@@ -77,7 +77,7 @@ interactive_dialog_clicked (GtkButton *button,
  gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);

  local_entry2 = gtk_entry_new ();
-  gtk_editable_set_text (GTK_EDITABLE (local_entry2), gtk_editable_get_text (GTK_EDITABLE (entry2)));
+  gtk_entry_set_text (GTK_ENTRY (local_entry2), gtk_entry_get_text (GTK_ENTRY (entry2)));
  gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);

@@ -85,8 +85,8 @@ interactive_dialog_clicked (GtkButton *button,

  if (response == GTK_RESPONSE_OK)
    {
-      gtk_editable_set_text (GTK_EDITABLE (entry1), gtk_editable_get_text (GTK_EDITABLE (local_entry1)));
-      gtk_editable_set_text (GTK_EDITABLE (entry2), gtk_editable_get_text (GTK_EDITABLE (local_entry2)));
+      gtk_entry_set_text (GTK_ENTRY (entry1), gtk_entry_get_text (GTK_ENTRY (local_entry1)));
+      gtk_entry_set_text (GTK_ENTRY (entry2), gtk_entry_get_text (GTK_ENTRY (local_entry2)));
    }

  gtk_widget_destroy (dialog);
@@ -123,29 +123,29 @@ do_dialog (GtkWidget *do_widget)

      /* Standard message dialog */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_pack_start (GTK_BOX (hbox), button);

-      gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+      gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));

      /* Interactive dialog*/
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_container_add (GTK_CONTAINER (hbox), vbox2);
-      gtk_container_add (GTK_CONTAINER (vbox2), button);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2);
+      gtk_box_pack_start (GTK_BOX (vbox2), button);

      table = gtk_grid_new ();
      gtk_grid_set_row_spacing (GTK_GRID (table), 4);
      gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_container_add (GTK_CONTAINER (hbox), table);
+      gtk_box_pack_start (GTK_BOX (hbox), table);

      label = gtk_label_new_with_mnemonic ("_Entry 1");
      gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -196,10 +196,10 @@ edit_label_done (GtkWidget *entry, gpointer data)
  GtkWidget *label;
  int x, y;

-  gtk_fixed_get_child_position (GTK_FIXED (fixed), entry, &x, &y);
+  gtk_container_child_get (GTK_CONTAINER (fixed), entry, "x", &x, "y", &y, NULL);

  label = GTK_WIDGET (g_object_get_data (G_OBJECT (entry), "label"));
-  gtk_label_set_text (GTK_LABEL (label), gtk_editable_get_text (GTK_EDITABLE (entry)));
+  gtk_label_set_text (GTK_LABEL (label), gtk_entry_get_text (GTK_ENTRY (entry)));

  gtk_widget_destroy (entry);
 }
@@ -210,7 +210,7 @@ edit_cb (GtkWidget *child)
  GtkWidget *fixed = gtk_widget_get_parent (child);
  int x, y;

-  gtk_fixed_get_child_position (GTK_FIXED (fixed), child, &x, &y);
+  gtk_container_child_get (GTK_CONTAINER (fixed), child, "x", &x, "y", &y, NULL);

  if (GTK_IS_LABEL (child))
    {
@@ -218,7 +218,7 @@ edit_cb (GtkWidget *child)

      g_object_set_data (G_OBJECT (entry), "label", child);

-      gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_LABEL (child)));
+      gtk_entry_set_text (GTK_ENTRY (entry), gtk_label_get_text (GTK_LABEL (child)));
      g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
      gtk_fixed_put (GTK_FIXED (fixed), entry, x, y);
      gtk_widget_grab_focus (entry);
@@ -243,7 +243,7 @@ pressed_cb (GtkGesture *gesture,
  GtkWidget *child;

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y, GTK_PICK_DEFAULT);
+  child = gtk_widget_pick (widget, x, y);

  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
    {
@@ -299,7 +299,7 @@ pressed_cb (GtkGesture *gesture,
      rect.height = 0;

      gtk_menu_popup_at_rect (GTK_MENU (menu),
-                              gtk_native_get_surface (gtk_widget_get_native (widget)),
+                              gtk_widget_get_surface (widget),
                              &rect,
                              GDK_GRAVITY_NORTH_WEST,
                              GDK_GRAVITY_NORTH_WEST,
@@ -320,7 +320,7 @@ released_cb (GtkGesture *gesture,
  GtkWidget *child;

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  child = gtk_widget_pick (widget, x, y, 0);
+  child = gtk_widget_pick (widget, x, y);

  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
    {
@@ -352,11 +352,11 @@ do_dnd (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      fixed = gtk_fixed_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), fixed);
+      gtk_box_pack_start (GTK_BOX (vbox), fixed);
      gtk_widget_set_hexpand (fixed, TRUE);
      gtk_widget_set_vexpand (fixed, TRUE);

-      multipress = gtk_gesture_click_new ();
+      multipress = gtk_gesture_multi_press_new ();
      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (multipress), 0);
      g_signal_connect (multipress, "pressed", G_CALLBACK (pressed_cb), NULL);
      g_signal_connect (multipress, "released", G_CALLBACK (released_cb), NULL);
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -208,12 +208,12 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Checkerboard pattern</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_vexpand (frame, TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -228,12 +228,12 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Scribble area</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_vexpand (frame, TRUE);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -356,7 +356,7 @@ do_editable_cells (GtkWidget *do_widget)
      g_object_set (vbox, "margin", 5, NULL);
      gtk_container_add (GTK_CONTAINER (window), vbox);

-      gtk_container_add (GTK_CONTAINER (vbox),
+      gtk_box_pack_start (GTK_BOX (vbox),
                          gtk_label_new ("Shopping list (you can edit the cells!)"));

      sw = gtk_scrolled_window_new (NULL, NULL);
@@ -365,7 +365,7 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);

      /* create models */
      items_model = create_items_model ();
@@ -387,17 +387,17 @@ do_editable_cells (GtkWidget *do_widget)
      /* some buttons */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);

      button = gtk_button_new_with_label ("Add item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (add_item), treeview);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_pack_start (GTK_BOX (hbox), button);

      button = gtk_button_new_with_label ("Remove item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (remove_item), treeview);
-      gtk_container_add (GTK_CONTAINER (hbox), button);
+      gtk_box_pack_start (GTK_BOX (hbox), button);

      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
    }
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -34,19 +34,19 @@ do_entry_buffer (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "Entries share a buffer. Typing in one is reflected in the other.");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      /* Create a buffer */
      buffer = gtk_entry_buffer_new (NULL, 0);

      /* Create our first entry */
      entry = gtk_entry_new_with_buffer (buffer);
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);

      /* Create the second entry */
      entry = gtk_entry_new_with_buffer (buffer);
      gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);

      g_object_unref (buffer);
    }
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -60,11 +60,11 @@ do_entry_completion (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      /* Create our entry */
      entry = gtk_entry_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);

      /* Create the completion object */
      completion = gtk_entry_completion_new ();
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -31,14 +31,13 @@ do_expander (GtkWidget *do_widget)
  GtkWidget *toplevel;
  GtkWidget *area;
  GtkWidget *expander;
-  GtkWidget *label;
  GtkWidget *sw;
  GtkWidget *tv;
  GtkTextBuffer *buffer;

  if (!window)
    {
-      toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
+      toplevel = gtk_widget_get_toplevel (do_widget);
      window = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
                                                   0,
                                                   GTK_MESSAGE_ERROR,
@@ -51,19 +50,13 @@ do_expander (GtkWidget *do_widget)

      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));

-      label = gtk_widget_get_last_child (area);
-      gtk_label_set_line_wrap (GTK_LABEL (label), FALSE);
-      gtk_widget_set_vexpand (label, FALSE);
-
      expander = gtk_expander_new ("Details:");
-      gtk_widget_set_vexpand (expander, TRUE);
      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 100);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (sw), TRUE);

      tv = gtk_text_view_new ();
      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (tv));
@@ -80,7 +73,7 @@ do_expander (GtkWidget *do_widget)
                                "resize the window. Do it already !", -1);
      gtk_container_add (GTK_CONTAINER (sw), tv);
      gtk_container_add (GTK_CONTAINER (expander), sw);
-      gtk_container_add (GTK_CONTAINER (area), expander);
+      gtk_box_pack_end (GTK_BOX (area), expander);
      g_signal_connect (expander, "notify::expanded",
                        G_CALLBACK (expander_cb), window);

--- a/demos/gtk-demo/filtermodel.ui
+++ b/demos/gtk-demo/filtermodel.ui
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
  <requires lib="gtk+" version="3.16"/>
  <object class="GtkListStore" id="liststore1">
    <columns>
+      <!-- column-name width -->
      <column type="gint"/>
+      <!-- column-name height -->
      <column type="gint"/>
    </columns>
    <data>
@@ -40,16 +43,16 @@
            <property name="label" translatable="yes">Original</property>
            <property name="xalign">0</property>
            <attributes>
-              <attribute name="weight" value="bold"></attribute>
+              <attribute name="weight" value="bold"/>
            </attributes>
            <accessibility>
              <relation type="label-for" target="treeview1"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview1">
@@ -84,11 +87,11 @@
            <accessibility>
              <relation type="labelled-by" target="label1"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview2">
@@ -135,43 +138,43 @@
            <accessibility>
              <relation type="labelled-by" target="label2"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="label2">
            <property name="label" translatable="yes">Computed Columns</property>
            <property name="xalign">0</property>
            <attributes>
-              <attribute name="weight" value="bold"></attribute>
+              <attribute name="weight" value="bold"/>
            </attributes>
            <accessibility>
              <relation type="label-for" target="treeview2"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
        </child>
        <child>
          <object class="GtkLabel" id="label3">
            <property name="label" translatable="yes">Filtered</property>
            <property name="xalign">0</property>
            <attributes>
-              <attribute name="weight" value="bold"></attribute>
+              <attribute name="weight" value="bold"/>
            </attributes>
            <accessibility>
              <relation type="label-for" target="treeview3"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
        </child>
        <child>
          <object class="GtkTreeView" id="treeview3">
@@ -200,11 +203,11 @@
            <accessibility>
              <relation type="labelled-by" target="label3"/>
            </accessibility>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+          </packing>
        </child>
      </object>
    </child>
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -164,26 +164,6 @@ create_switch (void)
  return w;
 }

-static void
-mapped (GtkWidget *w)
-{
-  gtk_menu_button_popup (GTK_MENU_BUTTON (w));
-}
-
-static GtkWidget *
-create_menu_button (void)
-{
-  GtkWidget *w = gtk_menu_button_new ();
-  GtkWidget *popover = gtk_popover_new (NULL);
-
-  gtk_container_add (GTK_CONTAINER (popover), gtk_button_new_with_label ("Hey!"));
-  gtk_popover_set_autohide (GTK_POPOVER (popover), FALSE);
-  gtk_menu_button_set_popover (GTK_MENU_BUTTON (w), popover);
-  g_signal_connect (w, "map", G_CALLBACK (mapped), NULL);
-
-  return w;
-}
-
 static const struct {
  const char *name;
  GtkWidget * (*create_func) (void);
@@ -199,7 +179,6 @@ static const struct {
  { "Video",      create_video          },
  { "Gears",      create_gears          },
  { "Switch",     create_switch         },
-  { "Menubutton", create_menu_button    },
 };

 static int selected_widget_type = -1;
@@ -219,7 +198,7 @@ set_widget_type (GtkFishbowl *fishbowl,
  gtk_fishbowl_set_creation_func (fishbowl,
                                  widget_types[selected_widget_type].create_func);

-  window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (fishbowl)));
+  window = gtk_widget_get_toplevel (GTK_WIDGET (fishbowl));
  headerbar = gtk_window_get_titlebar (GTK_WINDOW (window));
  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
                            widget_types[selected_widget_type].name);
@@ -255,15 +234,6 @@ prev_button_clicked_cb (GtkButton *source,
  set_widget_type (fishbowl, new_index);
 }

-void
-changes_toggled_cb (GtkToggleButton *button,
-                    gpointer         user_data)
-{
-  if (gtk_toggle_button_get_active (button))
-    gtk_button_set_icon_name (GTK_BUTTON (button), "changes-prevent");
-  else
-    gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow");
-}

 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
@@ -291,14 +261,10 @@ do_fishbowl (GtkWidget *do_widget)
      gtk_builder_add_callback_symbols (builder,
                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
-                                        "changes_toggled_cb", G_CALLBACK (changes_toggled_cb),
                                        NULL);
      gtk_builder_connect_signals (builder, NULL);
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
-      selected_widget_type = -1;
      set_widget_type (GTK_FISHBOWL (bowl), 0);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
@@ -313,5 +279,6 @@ do_fishbowl (GtkWidget *do_widget)
  else
    gtk_widget_destroy (window);

+
  return window;
 }
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <!-- interface-requires gtk+ 3.6 -->
  <object class="GtkWindow" id="window">
    <property name="title" translatable="yes">Fishbowl</property>
-    <property name="default-width">400</property>
-    <property name="default-height">400</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="">
        <property name="show-title-buttons">1</property>
@@ -26,32 +25,58 @@
            </child>
          </object>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkLabel">
            <property name="label">fps</property>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkLabel">
-            <property name="label" bind-source="bowl" bind-property="framerate-string"/>
+            <property name="label" bind-source="bowl" bind-property="framerate"/>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkLabel">
            <property name="label">Icons, </property>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkLabel">
            <property name="label" bind-source="bowl" bind-property="count"/>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
-        <child type="end">
+        <child>
          <object class="GtkToggleButton" id="changes_allow">
+            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
            <property name="icon-name">changes-allow</property>
            <property name="relief">none</property>
-            <signal name="notify::active" handler="changes_toggled_cb"/>
          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="changes_prevent">
+            <property name="active" bind-source="changes_allow" bind-property="active" bind-flags="bidirectional|invert-boolean">True</property>
+            <property name="visible" bind-source="changes_prevent" bind-property="active" bind-flags="invert-boolean">False</property>
+            <property name="icon-name">changes-prevent</property>
+            <property name="relief">none</property>
+          </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
        </child>
      </object>
    </child>
@@ -59,7 +84,7 @@
      <object class="GtkFishbowl" id="bowl">
        <property name="visible">True</property>
        <property name="animating">True</property>
-        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean | sync-create"/>
+        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
      </object>
    </child>
  </object>
--- a/demos/gtk-demo/fixed.c
+++ b/demos/gtk-demo/fixed.c
@@ -1,167 +0,0 @@
-/* Fixed layout
- *
- * GtkFixed is a container that allows placing and transforming
- * widgets manually.
- */
-
-#include <gtk/gtk.h>
-
-/* This enumeration determines the paint order */
-enum {
-  FACE_BACK,
-  FACE_LEFT,
-  FACE_BOTTOM,
-  FACE_RIGHT,
-  FACE_TOP,
-  FACE_FRONT,
-
-  N_FACES
-};
-
-/* Map face widgets to CSS classes */
-static struct {
-  GtkWidget *face;
-  const char *css_class;
-} faces[N_FACES] = {
-  [FACE_BACK] = { NULL, "back", },
-  [FACE_LEFT] = { NULL, "left", },
-  [FACE_RIGHT] = { NULL, "right", },
-  [FACE_TOP] = { NULL, "top", },
-  [FACE_BOTTOM] = { NULL, "bottom", },
-  [FACE_FRONT] = { NULL, "front", },
-};
-
-static GtkWidget *
-create_faces (void)
-{
-  GtkWidget *fixed = gtk_fixed_new ();
-  int face_size = 200;
-  float w, h, d, p;
-
-  gtk_widget_set_overflow (fixed, GTK_OVERFLOW_VISIBLE);
-
-  w = (float) face_size / 2.f;
-  h = (float) face_size / 2.f;
-  d = (float) face_size / 2.f;
-  p = face_size * 3.f;
-
-  for (int i = 0; i < N_FACES; i++)
-    {
-      GskTransform *transform = NULL;
-
-      /* Add a face */
-      faces[i].face = gtk_frame_new (NULL);
-      gtk_widget_set_size_request (faces[i].face, face_size, face_size);
-      gtk_style_context_add_class (gtk_widget_get_style_context (faces[i].face), faces[i].css_class);
-      gtk_container_add (GTK_CONTAINER (fixed), faces[i].face);
-
-      /* Set up the transformation for each face */
-      transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w, h));
-      transform = gsk_transform_perspective (transform, p);
-      transform = gsk_transform_rotate_3d (transform, -30.f, graphene_vec3_x_axis ());
-      transform = gsk_transform_rotate_3d (transform, 135.f, graphene_vec3_y_axis ());
-      transform = gsk_transform_translate_3d (transform, &GRAPHENE_POINT3D_INIT (0, 0, -face_size / 6.f));
-
-      switch (i)
-        {
-        case FACE_FRONT:
-          transform = gsk_transform_rotate_3d (transform, 0.f, graphene_vec3_y_axis ());
-          break;
-
-        case FACE_BACK:
-          transform = gsk_transform_rotate_3d (transform, -180.f, graphene_vec3_y_axis ());
-          break;
-
-        case FACE_RIGHT:
-          transform = gsk_transform_rotate_3d (transform, 90.f, graphene_vec3_y_axis ());
-          break;
-
-        case FACE_LEFT:
-          transform = gsk_transform_rotate_3d (transform, -90.f, graphene_vec3_y_axis ());
-          break;
-
-        case FACE_TOP:
-          transform = gsk_transform_rotate_3d (transform, 90.f, graphene_vec3_x_axis ());
-          break;
-
-        case FACE_BOTTOM:
-          transform = gsk_transform_rotate_3d (transform, -90.f, graphene_vec3_x_axis ());
-          break;
-
-        default:
-          break;
-        }
-
-      transform = gsk_transform_translate_3d (transform, &GRAPHENE_POINT3D_INIT (0, 0, d));
-      transform = gsk_transform_translate_3d (transform, &GRAPHENE_POINT3D_INIT (-w, -h, 0));
-
-      gtk_fixed_set_child_transform (GTK_FIXED (fixed), faces[i].face, transform);
-      gsk_transform_unref (transform);
-    }
-
-  return fixed;
-}
-
-static GtkWidget *demo_window = NULL;
-static GtkCssProvider *provider = NULL;
-
-static void
-close_window (GtkWidget *widget)
-{
-  /* Reset the state */
-  for (int i = 0; i < N_FACES; i++)
-    faces[i].face = NULL;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (),
-                                                 GTK_STYLE_PROVIDER (provider));
-  provider = NULL;
-
-  demo_window = NULL;
-}
-
-static GtkWidget *
-create_demo_window (GtkWidget *do_widget)
-{
-  GtkWidget *window, *sw, *fixed, *cube;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
-  gtk_window_set_title (GTK_WINDOW (window), "Fixed layout");
-  gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
-
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (window), sw);
-
-  fixed = gtk_fixed_new ();
-  gtk_container_add (GTK_CONTAINER (sw), fixed);
-  gtk_widget_set_halign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);
-
-  cube = create_faces ();
-  gtk_container_add (GTK_CONTAINER (fixed), cube);
-  gtk_widget_set_overflow (fixed, GTK_OVERFLOW_VISIBLE);
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/fixed/fixed.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              800);
-  g_object_unref (provider);
-
-  return window;
-}
-
-GtkWidget*
-do_fixed (GtkWidget *do_widget)
-{
-  if (demo_window == NULL)
-    demo_window = create_demo_window (do_widget);
-
-  if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_show (demo_window);
-  else
-    gtk_widget_destroy (demo_window);
-
-  return demo_window;
-}
--- a/demos/gtk-demo/fixed.css
+++ b/demos/gtk-demo/fixed.css
@@ -1,29 +0,0 @@
-frame.front {
-  border: 2px solid white;
-  background-color: rgba(228, 0, 0, 0.8);
-}
-
-frame.back {
-  border: 2px solid white;
-  background-color: rgba(228, 0, 0, 0.8);
-}
-
-frame.right {
-  border: 2px solid white;
-  background-color: rgba(127, 231, 25, 0.8);
-}
-
-frame.left {
-  border: 2px solid white;
-  background-color: rgba(127, 231, 25, 0.8);
-}
-
-frame.top {
-  border: 2px solid white;
-  background-color: rgba(114, 159, 207, 0.8);
-}
-
-frame.bottom {
-  border: 2px solid white;
-  background-color: rgba(114, 159, 207, 0.8);
-}
--- a/demos/gtk-demo/font-features.ui
+++ b/demos/gtk-demo/font-features.ui
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.1 -->
 <interface>
  <requires lib="gtk+" version="3.12"/>
  <object class="GtkWindow" id="window">
@@ -52,7 +53,7 @@
                            <property name="xalign">0</property>
                            <property name="label" translatable="yes">Font Features</property>
                            <attributes>
-                              <attribute name="weight" value="bold"></attribute>
+                              <attribute name="weight" value="bold"/>
                            </attributes>
                          </object>
                        </child>
@@ -83,7 +84,7 @@
                            <property name="label" translatable="yes">Font Variations</property>
                            <property name="xalign">0</property>
                            <attributes>
-                              <attribute name="weight" value="bold"></attribute>
+                              <attribute name="weight" value="bold"/>
                            </attributes>
                          </object>
                        </child>
@@ -114,35 +115,31 @@
            <child>
              <object class="GtkStack" id="stack">
                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">label</property>
-                    <property name="child">
-                      <object class="GtkLabel" id="label">
-                        <property name="wrap">1</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="valign">start</property>
-                        <property name="selectable">1</property>
-                      </object>
-                    </property>
+                  <object class="GtkLabel" id="label">
+                    <property name="wrap">1</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <property name="valign">start</property>
+                    <property name="selectable">1</property>
                  </object>
+                  <packing>
+                    <property name="name">label</property>
+                  </packing>
                </child>
                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">entry</property>
-                    <property name="child">
-                      <object class="GtkEntry" id="entry">
-                        <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
+                  <object class="GtkEntry" id="entry">
+                    <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.

 Разъяренный чтец эгоистично бьёт пятью жердями шустрого фехтовальщика. Наш банк вчера же выплатил Ф.Я. Эйхгольду комиссию за ценные вещи. Эх, чужак, общий съём цен шляп (юфть) – вдрызг! В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!

 Τάχιστη αλώπηξ βαφής ψημένη γη, δρασκελίζει υπέρ νωθρού κυνός</property>
-                        <signal name="activate" handler="stop_edit"/>
-                        <property name="valign">start</property>
-                        <property name="width-chars">50</property>
-                      </object>
-                    </property>
+                    <signal name="activate" handler="stop_edit"/>
+                    <property name="valign">start</property>
+                    <property name="width-chars">50</property>
                  </object>
+                  <packing>
+                    <property name="name">entry</property>
+                  </packing>
                </child>
              </object>
            </child>
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -305,7 +305,7 @@ update_display (void)
  char *font_desc;
  char *features;

-  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+  text = gtk_entry_get_text (GTK_ENTRY (entry));

  if (gtk_label_get_selection_bounds (GTK_LABEL (label), &ins, &bound))
    {
@@ -495,11 +495,7 @@ update_script_combo (void)
  gboolean have_active = FALSE;

  lang = gtk_font_chooser_get_language (GTK_FONT_CHOOSER (font));
-
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  active = hb_ot_tag_from_language (hb_language_from_string (lang, -1));
-  G_GNUC_END_IGNORE_DEPRECATIONS
-
  g_free (lang);

  store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
@@ -732,7 +728,7 @@ adjustment_changed (GtkAdjustment *adjustment,
  char *str;

  str = g_strdup_printf ("%g", gtk_adjustment_get_value (adjustment));
-  gtk_editable_set_text (GTK_EDITABLE (entry), str);
+  gtk_entry_set_text (GTK_ENTRY (entry), str);
  g_free (str);

  update_display ();
@@ -745,7 +741,7 @@ entry_activated (GtkEntry *entry,
  gdouble value;
  gchar *err = NULL;

-  value = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err);
+  value = g_strtod (gtk_entry_get_text (entry), &err);
  if (err != NULL)
    gtk_adjustment_set_value (adjustment, value);
 }
@@ -825,7 +821,7 @@ add_axis (FT_Var_Axis *ax, FT_Fixed value, int i)
  gtk_grid_attach (GTK_GRID (variations_grid), axis_scale, 1, i, 1, 1);
  axis_entry = gtk_entry_new ();
  gtk_widget_set_valign (axis_entry, GTK_ALIGN_BASELINE);
-  gtk_editable_set_width_chars (GTK_EDITABLE (axis_entry), 4);
+  gtk_entry_set_width_chars (GTK_ENTRY (axis_entry), 4);
  gtk_grid_attach (GTK_GRID (variations_grid), axis_entry, 2, i, 1, 1);

  axis = g_new (Axis, 1);
@@ -1643,7 +1639,7 @@ static char *text;
 static void
 switch_to_entry (void)
 {
-  text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (entry)));
+  text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
  gtk_stack_set_visible_child_name (GTK_STACK (stack), "entry");
  gtk_widget_grab_focus (entry);
 }
@@ -1669,7 +1665,7 @@ toggle_edit (void)
 static void
 stop_edit (void)
 {
-  g_signal_emit_by_name (edit_toggle, "clicked");
+  gtk_button_clicked (GTK_BUTTON (edit_toggle));
 }

 static gboolean
@@ -1681,7 +1677,7 @@ entry_key_press (GtkEventController *controller,
 {
  if (keyval == GDK_KEY_Escape)
    {
-      gtk_editable_set_text (GTK_EDITABLE (entry), text);
+      gtk_entry_set_text (GTK_ENTRY (entry), text);
      stop_edit ();
      return GDK_EVENT_STOP;
    }
--- a/demos/gtk-demo/fontplane.c
+++ b/demos/gtk-demo/fontplane.c
@@ -209,6 +209,7 @@ gtk_font_plane_init (GtkFontPlane *plane)
 {
  GtkGesture *gesture;

+  gtk_widget_set_has_surface (GTK_WIDGET (plane), FALSE);
  gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);

  gesture = gtk_gesture_drag_new ();
--- a/demos/gtk-demo/foreigndrawing.c
+++ b/demos/gtk-demo/foreigndrawing.c
@@ -1,8 +1,8 @@
 /* Foreign drawing
 *
- * Many applications can't use GTK widgets, for a variety of reasons,
+ * 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
+ * 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.
--- a/demos/gtk-demo/gtkfishbowl.c
+++ b/demos/gtk-demo/gtkfishbowl.c
@@ -53,7 +53,6 @@ enum {
   PROP_BENCHMARK,
   PROP_COUNT,
   PROP_FRAMERATE,
-   PROP_FRAMERATE_STRING,
   PROP_UPDATE_DELAY,
   NUM_PROPERTIES
 };
@@ -67,6 +66,8 @@ gtk_fishbowl_init (GtkFishbowl *fishbowl)
 {
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);

+  gtk_widget_set_has_surface (GTK_WIDGET (fishbowl), FALSE);
+
  priv->update_delay = G_USEC_PER_SEC;
 }

@@ -289,14 +290,6 @@ gtk_fishbowl_get_property (GObject         *object,
      g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
      break;

-    case PROP_FRAMERATE_STRING:
-      {
-        char *s = g_strdup_printf ("%.2f", gtk_fishbowl_get_framerate (fishbowl));
-        g_value_set_string (value, s);
-        g_free (s);
-      }
-      break;
-
    case PROP_UPDATE_DELAY:
      g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
      break;
@@ -350,13 +343,6 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                           0,
                           G_PARAM_READABLE);

-  props[PROP_FRAMERATE_STRING] =
-      g_param_spec_string ("framerate-string",
-                           "Framerate as string",
-                           "Framerate as string, with 2 decimals",
-                           NULL,
-                           G_PARAM_READABLE);
-
  props[PROP_UPDATE_DELAY] =
      g_param_spec_int64 ("update-delay",
                          "Update delay",
@@ -505,10 +491,7 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)

  n_frames = end_counter - start_counter;
  priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
-  priv->framerate = ((int)(priv->framerate * 100))/100.0;
-
  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE_STRING]);

  if (!priv->benchmark)
    return;
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -136,11 +136,11 @@ static void set_cursor_if_appropriate (GtkTextView *text_view,
                                       gint         y);

 static void
-released_cb (GtkGestureClick *gesture,
-             guint            n_press,
-             gdouble          x,
-             gdouble          y,
-             GtkWidget       *text_view)
+released_cb (GtkGestureMultiPress *gesture,
+             guint                 n_press,
+             gdouble               x,
+             gdouble               y,
+             GtkWidget            *text_view)
 {
  GtkTextIter start, end, iter;
  GtkTextBuffer *buffer;
@@ -247,7 +247,7 @@ do_hypertext (GtkWidget *do_widget)
      g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), view);
      gtk_widget_add_controller (view, controller);

-      controller = GTK_EVENT_CONTROLLER (gtk_gesture_click_new ());
+      controller = GTK_EVENT_CONTROLLER (gtk_gesture_multi_press_new ());
      g_signal_connect (controller, "released",
                        G_CALLBACK (released_cb), view);
      gtk_widget_add_controller (view, controller);
--- a/demos/gtk-demo/icons/16x16/actions/application-exit.png
+++ b/demos/gtk-demo/icons/16x16/actions/application-exit.png
--- a/demos/gtk-demo/icons/16x16/actions/document-edit-symbolic.symbolic.png
+++ b/demos/gtk-demo/icons/16x16/actions/document-edit-symbolic.symbolic.png
--- a/demos/gtk-demo/icons/16x16/actions/document-new.png
+++ b/demos/gtk-demo/icons/16x16/actions/document-new.png
--- a/demos/gtk-demo/icons/16x16/actions/document-open.png
+++ b/demos/gtk-demo/icons/16x16/actions/document-open.png
--- a/demos/gtk-demo/icons/16x16/actions/document-save.png
+++ b/demos/gtk-demo/icons/16x16/actions/document-save.png
--- a/demos/gtk-demo/icons/16x16/actions/edit-copy.png
+++ b/demos/gtk-demo/icons/16x16/actions/edit-copy.png
--- a/demos/gtk-demo/icons/16x16/actions/edit-cut.png
+++ b/demos/gtk-demo/icons/16x16/actions/edit-cut.png
--- a/demos/gtk-demo/icons/16x16/actions/edit-paste.png
+++ b/demos/gtk-demo/icons/16x16/actions/edit-paste.png
--- a/demos/gtk-demo/icons/16x16/actions/go-home.png
+++ b/demos/gtk-demo/icons/16x16/actions/go-home.png
--- a/demos/gtk-demo/icons/16x16/actions/go-up.png
+++ b/demos/gtk-demo/icons/16x16/actions/go-up.png
--- a/demos/gtk-demo/icons/16x16/actions/mail-send-receive-symbolic.symbolic.png
+++ b/demos/gtk-demo/icons/16x16/actions/mail-send-receive-symbolic.symbolic.png
--- a/demos/gtk-demo/icons/16x16/actions/process-stop.png
+++ b/demos/gtk-demo/icons/16x16/actions/process-stop.png
--- a/demos/gtk-demo/icons/16x16/actions/view-fullscreen-symbolic.symbolic.png
+++ b/demos/gtk-demo/icons/16x16/actions/view-fullscreen-symbolic.symbolic.png
--- a/demos/gtk-demo/icons/16x16/categories/applications-other.png
+++ b/demos/gtk-demo/icons/16x16/categories/applications-other.png
--- a/demos/gtk-demo/icons/16x16/emotes/face-cool.png
+++ b/demos/gtk-demo/icons/16x16/emotes/face-cool.png
--- a/demos/gtk-demo/icons/16x16/emotes/face-laugh-symbolic.symbolic.png
+++ b/demos/gtk-demo/icons/16x16/emotes/face-laugh-symbolic.symbolic.png
--- a/demos/gtk-demo/icons/16x16/status/battery-caution-charging-symbolic.symbolic.png
+++ b/demos/gtk-demo/icons/16x16/status/battery-caution-charging-symbolic.symbolic.png
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -266,7 +266,7 @@ do_iconview (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      tool_bar = gtk_toolbar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), tool_bar);
+      gtk_box_pack_start (GTK_BOX (vbox), tool_bar);

      up_button = gtk_tool_button_new (NULL, NULL);
      gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up"));
@@ -292,7 +292,7 @@ do_iconview (GtkWidget *do_widget)
                                      GTK_POLICY_AUTOMATIC);
      gtk_widget_set_vexpand (sw, TRUE);

-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);

      /* Create the store and fill it with the contents of '/' */
      parent = g_strdup ("/");
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -262,7 +262,7 @@ start_progressive_loading (GtkWidget *picture)
   * pauses in the reading process.
   */
  load_timeout = g_timeout_add (150, progressive_timeout, picture);
-  g_source_set_name_by_id (load_timeout, "[gtk] progressive_timeout");
+  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
 }

 static void
@@ -354,13 +354,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Image loaded from a file</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      image = gtk_image_new_from_icon_name ("gtk3-demo");
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
@@ -373,13 +373,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Animation loaded from a file</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");

@@ -390,13 +390,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Symbolic themed icon</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
      image = gtk_image_new_from_gicon (gicon);
@@ -412,13 +412,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Progressive image loading</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      /* Create an empty image for now; the progressive loader
       * will create the pixbuf and fill it in.
@@ -435,13 +435,13 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Displaying video</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      video = gtk_video_new_for_resource ("/images/gtk-logo.webm");
      gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE);
@@ -454,7 +454,7 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>GtkWidgetPaintable</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      paintable = gtk_widget_paintable_new (do_widget);
      picture = gtk_picture_new_for_paintable (paintable);
@@ -464,7 +464,7 @@ do_images (GtkWidget *do_widget)

      /* Sensitivity control */
      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_container_add (GTK_CONTAINER (base_vbox), button);
+      gtk_box_pack_start (GTK_BOX (base_vbox), button);

      g_signal_connect (button, "toggled",
                        G_CALLBACK (toggle_sensitivity_callback),
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -20,7 +20,7 @@ on_bar_response (GtkInfoBar *info_bar,
      return;
    }

-  window = GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (info_bar)));
+  window = gtk_widget_get_toplevel (GTK_WIDGET (info_bar));
  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                   GTK_MESSAGE_INFO,
@@ -65,24 +65,24 @@ do_infobar (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (window), vbox);

      bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
      gtk_label_set_line_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_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Message");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
      gtk_label_set_line_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_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Warning");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -91,24 +91,24 @@ do_infobar (GtkWidget *do_widget)
      bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
      gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
      g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
      gtk_label_set_line_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_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Question");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
      gtk_label_set_line_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_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Error");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -116,12 +116,12 @@ do_infobar (GtkWidget *do_widget)
      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_container_add (GTK_CONTAINER (vbox), bar);
+      gtk_box_pack_start (GTK_BOX (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
      gtk_label_set_line_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_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label);

      button = gtk_toggle_button_new_with_label ("Other");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
@@ -130,7 +130,7 @@ do_infobar (GtkWidget *do_widget)
      frame = gtk_frame_new ("Info bars");
      gtk_widget_set_margin_top (frame, 8);
      gtk_widget_set_margin_bottom (frame, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);

      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      g_object_set (vbox2, "margin", 8, NULL);
@@ -138,9 +138,9 @@ do_infobar (GtkWidget *do_widget)

      /* Standard message dialog */
      label = gtk_label_new ("An example of different info bars");
-      gtk_container_add (GTK_CONTAINER (vbox2), label);
+      gtk_box_pack_start (GTK_BOX (vbox2), label);

-      gtk_container_add (GTK_CONTAINER (vbox2), actions);
+      gtk_box_pack_start (GTK_BOX (vbox2), actions);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -25,7 +25,7 @@ activate_link (GtkWidget   *label,
      GtkWidget *dialog;
      GtkWidget *parent;

-      parent = GTK_WIDGET (gtk_widget_get_root (label));
+      parent = gtk_widget_get_toplevel (label);
      dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (parent),
                 GTK_DIALOG_DESTROY_WITH_PARENT,
                 GTK_MESSAGE_INFO,
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -268,7 +268,7 @@ do_list_store (GtkWidget *do_widget)
      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).");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -276,7 +276,7 @@ do_list_store (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_add (GTK_CONTAINER (vbox), sw);
+      gtk_box_pack_start (GTK_BOX (vbox), sw);

      /* create tree model */
      model = create_model ();
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -9,16 +9,11 @@
 #include <stdlib.h>
 #include <string.h>

+#include "message.h"
+
 static GdkPixbuf *avatar_pixbuf_other;
 static GtkWidget *window = NULL;

-#define GTK_TYPE_MESSAGE		  (gtk_message_get_type ())
-#define GTK_MESSAGE(message)		  (G_TYPE_CHECK_INSTANCE_CAST ((message), GTK_TYPE_MESSAGE, GtkMessage))
-#define GTK_MESSAGE_CLASS(klass)		  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MESSAGE, GtkMessageClass))
-#define GTK_IS_MESSAGE(message)		  (G_TYPE_CHECK_INSTANCE_TYPE ((message), GTK_TYPE_MESSAGE))
-#define GTK_IS_MESSAGE_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MESSAGE))
-#define GTK_MESSAGE_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE, GtkMessageClass))
-
 #define GTK_TYPE_MESSAGE_ROW		  (gtk_message_row_get_type ())
 #define GTK_MESSAGE_ROW(message_row)		  (G_TYPE_CHECK_INSTANCE_CAST ((message_row), GTK_TYPE_MESSAGE_ROW, GtkMessageRow))
 #define GTK_MESSAGE_ROW_CLASS(klass)		  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_MESSAGE_ROW, GtkMessageRowClass))
@@ -26,33 +21,10 @@ static GtkWidget *window = NULL;
 #define GTK_IS_MESSAGE_ROW_CLASS(klass)	  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_MESSAGE_ROW))
 #define GTK_MESSAGE_ROW_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_MESSAGE_ROW, GtkMessageRowClass))

-typedef struct _GtkMessage   GtkMessage;
-typedef struct _GtkMessageClass  GtkMessageClass;
 typedef struct _GtkMessageRow   GtkMessageRow;
 typedef struct _GtkMessageRowClass  GtkMessageRowClass;
 typedef struct _GtkMessageRowPrivate  GtkMessageRowPrivate;

-
-struct _GtkMessage
-{
-  GObject parent;
-
-  guint id;
-  char *sender_name;
-  char *sender_nick;
-  char *message;
-  gint64 time;
-  guint reply_to;
-  char *resent_by;
-  int n_favorites;
-  int n_reshares;
-};
-
-struct _GtkMessageClass
-{
-  GObjectClass parent_class;
-};
-
 struct _GtkMessageRow
 {
  GtkListBoxRow parent;
@@ -83,84 +55,10 @@ struct _GtkMessageRowPrivate
  GtkButton *expand_button;
 };

-GType      gtk_message_get_type  (void) G_GNUC_CONST;
 GType      gtk_message_row_get_type  (void) G_GNUC_CONST;

-G_DEFINE_TYPE (GtkMessage, gtk_message, G_TYPE_OBJECT);
-
-static void
-gtk_message_finalize (GObject *obj)
-{
-  GtkMessage *msg = GTK_MESSAGE (obj);
-
-  g_free (msg->sender_name);
-  g_free (msg->sender_nick);
-  g_free (msg->message);
-  g_free (msg->resent_by);
-
-  G_OBJECT_CLASS (gtk_message_parent_class)->finalize (obj);
-}
-static void
-gtk_message_class_init (GtkMessageClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  object_class->finalize = gtk_message_finalize;
-}
-
-static void
-gtk_message_init (GtkMessage *msg)
-{
-}
-
-static void
-gtk_message_parse (GtkMessage *msg, const char *str)
-{
-  char **strv;
-  int i;
-
-  strv = g_strsplit (str, "|", 0);
-
-  i = 0;
-  msg->id = strtol (strv[i++], NULL, 10);
-  msg->sender_name = g_strdup (strv[i++]);
-  msg->sender_nick = g_strdup (strv[i++]);
-  msg->message = g_strdup (strv[i++]);
-  msg->time = strtol (strv[i++], NULL, 10);
-  if (strv[i])
-    {
-      msg->reply_to = strtol (strv[i++], NULL, 10);
-      if (strv[i])
-        {
-          if (*strv[i])
-            msg->resent_by = g_strdup (strv[i]);
-          i++;
-          if (strv[i])
-            {
-              msg->n_favorites = strtol (strv[i++], NULL, 10);
-              if (strv[i])
-                {
-                  msg->n_reshares = strtol (strv[i++], NULL, 10);
-                }
-
-            }
-        }
-    }
-
-  g_strfreev (strv);
-}
-
-static GtkMessage *
-gtk_message_new (const char *str)
-{
-  GtkMessage *msg;
-  msg = g_object_new (gtk_message_get_type (), NULL);
-  gtk_message_parse (msg, str);
-  return msg;
-}
-
 G_DEFINE_TYPE_WITH_PRIVATE (GtkMessageRow, gtk_message_row, GTK_TYPE_LIST_BOX_ROW);

-
 static void
 gtk_message_row_update (GtkMessageRow *row)
 {
@@ -333,15 +231,48 @@ row_activated (GtkListBox *listbox, GtkListBoxRow *row)
  gtk_message_row_expand (GTK_MESSAGE_ROW (row));
 }

+static void
+update_count (GtkListBox *listbox, GtkLabel *label)
+{
+  GList *children = gtk_container_get_children (GTK_CONTAINER (listbox));
+  guint n_items = g_list_length (children);
+  g_list_free (children);
+
+  char *text = g_strdup_printf ("%u rows", n_items);
+  gtk_label_set_label (label, text);
+  g_free (text);
+}
+
+static GtkWidget *header_label;
+
+static void
+add_more (GtkListBox *listbox)
+{
+  GBytes *data;
+  char **lines;
+  int i;
+
+  data = g_resources_lookup_data ("/listbox/messages.txt", 0, NULL);
+  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
+
+  for (i = 0; lines[i] != NULL && *lines[i]; i++)
+    {
+      GtkMessage *message = gtk_message_new (lines[i]);
+      GtkMessageRow *row = gtk_message_row_new (message);
+      gtk_container_add (GTK_CONTAINER (listbox), GTK_WIDGET (row));
+    }
+
+  g_strfreev (lines);
+  g_bytes_unref (data);
+
+  update_count (listbox, GTK_LABEL (header_label));
+}
+
 GtkWidget *
 do_listbox (GtkWidget *do_widget)
 {
  GtkWidget *scrolled, *listbox, *vbox, *label;
-  GtkMessage *message;
-  GtkMessageRow *row;
-  GBytes *data;
-  char **lines;
-  int i;
+  GtkWidget *header, *more;

  if (!window)
    {
@@ -350,43 +281,43 @@ do_listbox (GtkWidget *do_widget)
      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "List Box");
-      gtk_window_set_default_size (GTK_WINDOW (window),
-                                   400, 600);
+      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);

      /* NULL window variable when window is closed */
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed),
                        &window);

+      listbox = gtk_list_box_new ();
+
+      header = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
+      gtk_header_bar_set_title (GTK_HEADER_BAR (header), "List View");
+      header_label = gtk_label_new ("");
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), header_label);
+      more = gtk_button_new_from_icon_name ("list-add");
+
+      g_signal_connect_swapped (more, "clicked", G_CALLBACK (add_more), listbox);
+
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), more);
+      gtk_window_set_titlebar (GTK_WINDOW (window), header);
+
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
      gtk_container_add (GTK_CONTAINER (window), vbox);
-      label = gtk_label_new ("Messages from GTK and friends");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      label = gtk_label_new ("Messages from Gtk+ and friends");
+      gtk_box_pack_start (GTK_BOX (vbox), label);
      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
      gtk_widget_set_vexpand (scrolled, TRUE);
-      gtk_container_add (GTK_CONTAINER (vbox), scrolled);
-      listbox = gtk_list_box_new ();
+      gtk_box_pack_start (GTK_BOX (vbox), scrolled);
      gtk_container_add (GTK_CONTAINER (scrolled), listbox);

      gtk_list_box_set_sort_func (GTK_LIST_BOX (listbox), (GtkListBoxSortFunc)gtk_message_row_sort, listbox, NULL);
      gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (listbox), FALSE);
      g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), NULL);

-      data = g_resources_lookup_data ("/listbox/messages.txt", 0, NULL);
-      lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
-
-      for (i = 0; lines[i] != NULL && *lines[i]; i++)
-        {
-          message = gtk_message_new (lines[i]);
-          row = gtk_message_row_new (message);
-          gtk_widget_show (GTK_WIDGET (row));
-          gtk_container_add (GTK_CONTAINER (listbox), GTK_WIDGET (row));
-        }
-
-      g_strfreev (lines);
-      g_bytes_unref (data);
+      add_more (listbox);
+      update_count (listbox, header_label);
    }

  if (!gtk_widget_get_visible (window))
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	8833158176	Redo the sorting in testlistview Sort the entire treelistmodel, not individual directories. This lets us change sort order and (almost) get working persistence for selection.	2019-01-06 21:25:13 -05:00
Matthias Clasen	964e5a9fe2	typo fix	2019-01-06 20:29:37 -05:00
Matthias Clasen	615337863b	testsuite: Add selection model tests	2019-01-06 20:27:27 -05:00
Matthias Clasen	437fa857f4	multi-selection: Implement persistence This is not very efficient for Ctrl-A. No way around it.	2019-01-06 20:27:27 -05:00
Matthias Clasen	9757582e8d	set: Add an iter	2019-01-06 20:27:27 -05:00
Matthias Clasen	21ccf55aed	set: Fix gtk_set_remove_range This was showing up in obvious test cases such as gtk_set_add_range (set, 3, 1); gtk_set_remove_range (set, 3, 1); not yielding an empty set.	2019-01-06 20:27:27 -05:00
Matthias Clasen	62fce3bdf5	Remove debug spew	2019-01-06 17:45:18 -05:00
Matthias Clasen	30db87b120	Emit selection-changed for autoselection This was missed in the case that the child model goes from empty to non-empty.	2019-01-06 17:45:18 -05:00
Matthias Clasen	9e2eb047d0	Restrict splice tests to new-enough GLib Copied from the sort list model tests.	2019-01-06 12:28:10 -05:00
Matthias Clasen	a68ee2d4f1	testsuite: Add slice model tests Do the same style of tests we do for all the other list models. These tests found the issue fixed in the previous commit.	2019-01-06 12:26:37 -05:00
Matthias Clasen	ce1ac00c59	slice model: Don't report excessive changes We were not skipping an unchanged initial segment of the slice in some cases. Fix that.	2019-01-06 12:24:57 -05:00
Matthias Clasen	75a1bafcc0	single selection: Be robust Make gtk_single_selection_set_selected work without a model. It gets called a internally, and that might just happen when there's no model.	2019-01-06 10:52:20 -05:00
Matthias Clasen	c70130edc5	Drop unused variables	2019-01-06 10:52:20 -05:00
Matthias Clasen	596b9202ce	Don't warn when setting properties to their default value That makes our tests choke, and is not really necessary.	2019-01-06 10:52:20 -05:00
Matthias Clasen	c8f27d1ac6	Add missing headers to the public-headers list Without this, the types don't end up in gtk_test_list_all_types, and then tests like the defaultvalue test don't check them.	2019-01-06 10:52:07 -05:00
Matthias Clasen	a0f8bf0f6b	testlistview: Allow changing sort order This is a good test case for persistence of selection.	2019-01-05 22:52:34 -05:00
Matthias Clasen	d0ef5f5db4	selection: Make the model an interface property This is in line with what we do for other wrapper models.	2019-01-05 22:52:34 -05:00
Matthias Clasen	dfd280acd0	gtk-demo: Add a listview demo Duplicate the listbox demo with GtkListView, and give both demos a "more messages" button, to demonstrate scalability.	2019-01-05 21:13:26 -05:00
Matthias Clasen	c97f62a471	Fix up selection constructor return types Follow the pattern we use for the other list model types, and return the exact type.	2019-01-05 18:54:05 -05:00
Matthias Clasen	135a875c25	Add a no selection This is a GtkSelectionModel that never selects anything. The equivalent of GTK_SELECTION_MODE_NONE.	2019-01-05 17:47:39 -05:00
Matthias Clasen	09cbb5154f	font chooser: Add back row activation This one is easy and doesn't need any list view features.	2019-01-05 14:53:27 -05:00
Matthias Clasen	9e2250e35d	list view: Be more careful with selection I've seen crashes in the font chooser with the selection-changed signal getting emitted early, and row being NULL.	2019-01-05 14:38:20 -05:00
Matthias Clasen	d844c98c8a	Fix an accidental change This was just to test multiselection locally.	2019-01-05 14:37:59 -05:00
Matthias Clasen	779fb56213	font chooser: Port to GtkListView This works, as far as the required features are present in GtkListview yet. Still missing: - keynav - row activation - scroll to selection	2019-01-05 14:36:31 -05:00
Matthias Clasen	ad25afc298	typo fix	2019-01-05 09:06:25 -05:00
Matthias Clasen	18d7a7daaa	gtk: Add GtkMultiSelection This is a selection modelt that allows selecting more than one item. The behavior is not 100% right yet for extending selections, but it basically works.	2019-01-05 08:49:23 -05:00
Benjamin Otte	be4fe26fef	listitem: Add a press gesture to select the item This requires a bunch of refactoring because so far the ListItem had no knowledge of the manager, but it needs the manager so it can access the selection to trigger the select/unselect operation.	2019-01-05 00:30:22 +01:00
Benjamin Otte	46fa122c98	listview: Add initial support for displaying selections	2019-01-05 00:30:22 +01:00
Benjamin Otte	2b780de342	gtk: Add GtkSingleSelection GtkSingleSelection is a GtkSelectionModel that allows selecting a single item.	2019-01-05 00:30:22 +01:00
Benjamin Otte	ec0483bdfe	gtk: Add GtkSelectionModel The selection model is a list model interface that takes care of selections and is to be used by the list model widgets to manage their selections.	2019-01-05 00:30:22 +01:00
Benjamin Otte	1547d81eb9	listview: Reset listitems' CSS animations when rebinding This way, newly displayed rows don't play an unselect animation (text fading in) when they are unselected, but the row was previously used for a selected item.	2019-01-05 00:30:22 +01:00
Benjamin Otte	498351784c	listview: Add selection properties to ListItem This just brings the infrastructure into place, we're not using the properties yet.	2019-01-05 00:30:22 +01:00
Benjamin Otte	1f07f9bbae	listview: Try to keep the list items in order when scrolling Instead of just destroying all items and then recreating them (or even hide()ing and then show()ing them again (or even even repositioning them in the widget tree)), just try to reust them in the order they are. This works surprisingly well when scrolling and most/all widgets just moved.	2019-01-05 00:30:22 +01:00
Benjamin Otte	aa71d8fc51	listlistmodel: Add gtk_list_list_model_item_moved() Use it to fix a case that just said g_warning ("oops"). Apparently I had forgotten the case where a container moved a child in the widget tree.	2019-01-05 00:30:22 +01:00
Benjamin Otte	44e4ddfdf0	listitemmanager: Switch from "insert_before" to "insert_after" argumnet We reorder widgets start to end, so when reusing a list item, we correctly know the previous sibling for that list item, but not the next sibling yet. We just know the widget it should ultimately be in front of. So we can do a more correct guess of the list item's place in the widget tree if we think about where to place an item like this. Actually using this change will come in the next commit.	2019-01-05 00:30:22 +01:00
Benjamin Otte	3481dddbc2	testlistview: Create widgets only once Previously, we were recreating all widgets every time the list item was rebound, which caused a lot of extra work every time we scrolled. Now we keep the widgets around and only set their properties again when the item changes.	2019-01-05 00:30:22 +01:00
Benjamin Otte	841d6cb327	testlistview: Show the row number Always show the current row. This is mostly useful for debugging, not for beauty.	2019-01-05 00:30:22 +01:00
Benjamin Otte	b21fd5fd22	listview: Only allocate necesary rows This is the big one. The listview only allocates 200 rows around the visible row now. Everything else is kept in ListRow instances with row->widget == NULL. For rows without a widget, we assign the median height of the child widgets as the row's height and then do all calculations as if there were widgets that had requested that height (like setting adjustment values or reacting to adjustment value changes). When the view is scrolled, we bind the 200 rows to the new visible area, so that the part of the listview that can be seen is always allocated.	2019-01-05 00:30:20 +01:00
Benjamin Otte	660a6f4e8e	listview: Change anchor handling again The anchor is now a tuple of { listitem, align }. Using the actual list item allows keeping the anchor across changes in position (ie when lists get resorted) while still being able to fall back to positions (list items store their position) when an item gets removed. The align value is in the range [0..1] and defines where in the visible area to do the alignment. 0.0 means to align the top of the row with the top of the visible area, 1.0 aligns the bottom of the widget with the visible area and 0.5 keeps the center of the widget at the center of the visible area. It works conceptually the same as percentages in CSS background-position (where the background area and the background image's size are matched the same way) or CSS transform-origin.	2019-01-05 00:24:55 +01:00
Benjamin Otte	72902be840	listview: Change how binding is done We now don't let the functions create widgets for the item from the listmodel, instead we hand out a GtkListItem for them to add a widget to. GtkListItems are created in advance and can only be filled in by the binding code by gtk_container_add()ing a widget. However, they are GObjects, so they can provide properties that the binding code can make use of - either via notify signals or GBinding.	2019-01-05 00:24:55 +01:00
Benjamin Otte	2a7746dba6	listitem: Add gtk_list_item_get_position() Also refactor the whole list item management yet again. Now, list item APIs doesn't have bind/unbind functions anymore, but only property setters. The item factory is the only one doing the binding. As before, the item manager manages when items need to be bound.	2019-01-05 00:24:55 +01:00
Benjamin Otte	badad04eb7	tests: Make animating listview do random resorts	2019-01-05 00:24:55 +01:00
Benjamin Otte	81690c7049	listview: Change change management Add a GtkListItemManagerChange object that tracks all removed list rows during an item-changed signal so they can be added back later.	2019-01-05 00:24:55 +01:00
Benjamin Otte	ae1331ee92	listview: Make the listitemmanager stricter Require that items created with the manager get destroyed via the manager. To that purpose, renamed create_list_item() to acquire_list_item() and add a matching release_list_item() function. This way, the manager can in the future keep track of all items and cache information about them.	2019-01-05 00:24:55 +01:00
Benjamin Otte	e2354e5f3b	listview: Add GtkListItem GtkListItem is a generic row widget that is supposed to replace GtkListBoxRow and GtkFlowBoxChild.	2019-01-05 00:24:55 +01:00
Benjamin Otte	2d472da14b	listview: Add GtkListItemManager It's all stubs for now, but here's the basic ideas about what this object is supposed to do: (1) It's supposed to be handling all the child GtkWidgets that are used by the listview, so that the listview can concern itself with how many items it needs and where to put them. (2) It's meant to do the caching of widgets that are not (currently) used. (3) It's meant to track items that remain in the model across items-changed emissions and just change position. (2) It's code that can be shared between listview and potential other widgets like a GridView. It's also free to assume that the number of items it's supposed to manage doesn't grow too much, so it's free to use O(N) algorithms.	2019-01-05 00:24:55 +01:00
Benjamin Otte	7edeef2f71	listview: Implement an anchor The anchor selection is very basic: just anchor the top row. That's vastly better than any other widget already though.	2019-01-05 00:24:55 +01:00
Benjamin Otte	07ec4f9de0	tests: Add a test for a permanently changing listview This is mostly for dealing with proper anchoring and can be used to check that things don't scroll or that selection and focus handling properly works. For comparison purposes, a ListBox is provided next to it.	2019-01-05 00:24:55 +01:00
Benjamin Otte	b00b9500e7	listview: Implement GtkScrollable Scrolling in a very basic form is also supported	2019-01-05 00:24:53 +01:00
Benjamin Otte	d7e64c4423	listview: Make widget actually do something The thing we're actually doing is create and maintain a widget for every row. That's it. Also add a testcase using this. The testcase quickly allocates too many rows though and then becomes unresponsive though. You have been warned.	2019-01-05 00:13:20 +01:00
Benjamin Otte	5596063220	listview: Introduce GtkListItemFactory Thisis the abstraction I intend to use for creating widgets and binding them to the item out of the listview. For now this is a very dumb wrapper around the functions that exist in the API. But it leaves the freedom to turn this into public API, make an interface out of it and most of all write different implementations, in particular one that uses GtkBuilder.	2019-01-04 23:57:45 +01:00
Benjamin Otte	3485a4582c	gtk: Add a GtkListView skeleton	2019-01-04 23:57:45 +01:00
Benjamin Otte	f1c34aefe0	main: Report correct target for button release events Button release events should not go to the widget below the pointer, but to the widget that received the original button press. Fixes #24	2019-01-04 23:57:45 +01:00
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.0"><defs><linearGradient id="f"><stop offset="0" stop-color="#ff7800"/><stop offset="1" stop-color="#ed333b"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#f5c211"/><stop offset="1" stop-color="#33d17a" stop-opacity=".899"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#c0bfbc"/><stop offset=".036" stop-color="#fafaf9"/><stop offset=".088" stop-color="#c0bfbc"/><stop offset=".399" stop-color="#d5d5d3"/><stop offset=".491" stop-color="#eaeae9"/><stop offset=".569" stop-color="#a7a5a1"/><stop offset=".966" stop-color="#a9a7a3"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#f6f5f4"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#d5d3cf"/><stop offset="1" stop-color="#949390"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#9a9996"/><stop offset="1" stop-color="#77767b"/></linearGradient><linearGradient xlink:href="#d" id="g" x1="-142.049" y1="236.001" x2="-9.951" y2="236.001" gradientUnits="userSpaceOnUse"/><radialGradient xlink:href="#e" id="h" cx="90.974" cy="263.479" fx="90.974" fy="263.479" r="22.703" gradientTransform="matrix(1.90297 -.05506 .0501 1.73133 -89.25 -176.863)" gradientUnits="userSpaceOnUse"/><radialGradient xlink:href="#f" id="i" cx="61.718" cy="270.719" fx="61.718" fy="270.719" r="22.703" gradientTransform="matrix(2.49049 0 0 2.92132 -91.99 -503.52)" gradientUnits="userSpaceOnUse"/></defs><path transform="translate(123.265 -118.118) scale(.7798)" d="M-75.74 161.438a10.997 10.997 0 0 0-5.758 1.468l-55.053 31.785a10.997 10.997 0 0 0-5.498 9.524v63.57a10.997 10.997 0 0 0 5.498 9.524l55.053 31.785a10.997 10.997 0 0 0 10.996 0l55.053-31.785a10.997 10.997 0 0 0 5.498-9.524v-63.57a10.997 10.997 0 0 0-5.498-9.524l-55.053-31.785a10.997 10.997 0 0 0-5.238-1.469z" style="marker:none" fill="url(#g)"/><path style="marker:none" d="M64.203 3.77a8.575 8.575 0 0 0-4.49 1.146l-42.93 24.786a8.575 8.575 0 0 0-4.288 7.427V86.7a8.575 8.575 0 0 0 4.287 7.426l42.93 24.786a8.575 8.575 0 0 0 8.575 0l42.93-24.786a8.575 8.575 0 0 0 4.288-7.426V37.129a8.575 8.575 0 0 0-4.287-7.427L68.288 4.916a8.575 8.575 0 0 0-4.085-1.145z" fill="#fff"/><path style="marker:none" d="M109.869 33.297L64 59.779 18.131 33.297 64 6.814z" fill="#98c1f1"/><path style="marker:none" d="M66.263 287.505l45.35-25.884.056-52.762-45.406 26.215z" fill="url(#h)" transform="translate(0 -172)"/><path d="M61.718 287.34l-45.35-25.885-.056-52.761 45.406 26.215z" style="marker:none" fill="url(#i)" transform="translate(0 -172)"/></svg>