Add a "devel" CSS theme for our demos

It's useful to know if you're running the demos from an unstable version
of GTK+, so we should use a CSS fragment that updates the visual
identity of gtk-demo and gtk-widget-factory depending on the version of
GTK+ they are running against.

.gitignore

@@ -1 +0,0 @@
-/subprojects/*/

.gitlab-ci.yml

@@ -1,7 +1,6 @@
 stages:
   - build
   - flatpak
-  - deploy
 
 .cache-paths: &cache-paths
   paths:
@@ -13,7 +12,7 @@ stages:
     - subprojects/pango/
 
 fedora-x86_64:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v1
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker.sh
@@ -44,7 +43,7 @@ msys2-mingw32:
   <<: *mingw-defaults
 
 .flatpak-defaults: &flatpak-defaults
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+  image: registry.gitlab.com/alatiera/gnome-nightly-oci/gnome-master:latest
   stage: flatpak
   artifacts:
     paths:
@@ -62,21 +61,3 @@ flatpak:widget-factory:
   variables:
     APPID: org.gtk.WidgetFactory
   <<: *flatpak-defaults
-
-pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v2
-  stage: deploy 
-  script:
-    - meson -Ddocumentation=true _build .
-    - ninja -C _build
-    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-
-    - mkdir -p public/
-    - mv _build/docs/reference/gtk/html/ public/gtk/
-    - mv _build/docs/reference/gdk/html/ public/gdk/
-    - mv _build/docs/reference/gsk/html/ public/gsk/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master

.gitlab-ci/Dockerfile

@@ -1,7 +1,6 @@
-FROM fedora:29
+FROM fedora:28
 
 RUN dnf -y install \
-    hicolor-icon-theme \
     adwaita-icon-theme \
     atk-devel \
     at-spi2-atk-devel \
@@ -33,7 +32,6 @@ RUN dnf -y install \
     iso-codes \
     itstool \
     json-glib-devel \
-    lcov \
     libattr-devel \
     libepoxy-devel \
     libffi-devel \
@@ -70,7 +68,7 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
  && dnf clean all
 
-RUN pip3 install meson==0.49.0
+RUN pip3 install meson
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/run-docker.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v2"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v1"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .

.gitlab-ci/test-msys2.sh

@@ -45,7 +45,6 @@ meson \
     -Denable-x11-backend=false \
     -Denable-wayland-backend=false \
     -Denable-win32-backend=true \
-    -Dvulkan=no \
     _build
 unset CCACHE_DISABLE
 

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` and `README.commits` files. In particular,
+don't, under any circumstances, push anything to Git before reading and
+understanding `README.commmits`.
+
 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.

NEWS

@@ -27,8 +27,8 @@ Overview of Changes in GTK+ 3.94.0
 * Applications can now create their own GtkSnapshot objects for
   intermediate rendering.
 
-* Widget event signals have been replaced by event controllers,
-  and some new event controllers have been introduced for this:
+* Widget event signals have been replaced by event controller, and
+  some new event controllers have been introduced for this:
   GtkEventControllerMotion
   GtkEventControllerKey
   GtkGestureStylus
@@ -68,10 +68,6 @@ Overview of Changes in GTK+ 3.94.0
   gtk_widget_draw
   gtk_render_icon_surface
 
-* Incomplete transitions:
-  The ::event signal is not still there, but it will be removed
-  The DND apis are not finalized yet
-
 * Translation updates:
  Croatian
  Esperanto

README.commits

@@ -0,0 +1,72 @@
+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.
+
+1) Ask _first_.
+
+2) 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:
+
+=== begin example commit ===
+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.
+=== end example commit ===
+
+  - 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

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.
 
@@ -31,15 +31,10 @@ Information about mailing lists can be found at
 
   - http://www.gtk.org/mailing-lists.php
 
-Nightly documentation can be found at
-  - Gtk: https://gnome.pages.gitlab.gnome.org/gtk/gtk/
-  - Gdk: https://gnome.pages.gitlab.gnome.org/gtk/gdk/
-  - Gsk: https://gnome.pages.gitlab.gnome.org/gtk/gsk/
-
 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 +74,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 +89,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 +113,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 +138,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 +147,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.
 

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

@@ -5,6 +5,7 @@
     "sdk": "org.gnome.Sdk",
     "command": "gtk4-demo",
     "tags": ["devel", "development", "nightly"],
+    "rename-desktop-file": "gtk4-demo.desktop",
     "rename-icon": "gtk4-demo",
     "desktop-file-name-prefix": "(Development) ",
     "finish-args": [
@@ -45,9 +46,7 @@
             "buildsystem": "meson",
             "builddir": true,
             "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
+                "--libdir=/app/lib"
             ],
             "sources": [
                 {

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

@@ -5,6 +5,7 @@
     "sdk": "org.gnome.Sdk",
     "command": "gtk4-widget-factory",
     "tags": ["devel", "development", "nightly"],
+    "rename-desktop-file": "gtk4-widget-factory.desktop",
     "rename-icon": "gtk4-widget-factory",
     "desktop-file-name-prefix": "(Development) ",
     "finish-args": [
@@ -45,9 +46,7 @@
             "buildsystem": "meson",
             "builddir": true,
             "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
+                "--libdir=/app/lib"
             ],
             "sources": [
                 {

config.h.meson

@@ -305,13 +305,3 @@
 #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

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", "gtk4-demo",
-                         "title", "About GTK Code Demos",
+                         "title", "About GTK+ Code Demos",
                          NULL);
 }
 
@@ -455,16 +455,13 @@ demo_application_window_constructed (GObject *object)
 }
 
 static void
-demo_application_window_size_allocate (GtkWidget *widget,
-                                       int        width,
-                                       int        height,
-                                       int        baseline)
+demo_application_window_size_allocate (GtkWidget           *widget,
+                                       const GtkAllocation *allocation,
+                                       int                  baseline)
 {
   DemoApplicationWindow *window = (DemoApplicationWindow *)widget;
 
-  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget,
-                                                                          width,
-                                                                          height,
+  GTK_WIDGET_CLASS (demo_application_window_parent_class)->size_allocate (widget, allocation,
                                                                           baseline);
 
   if (!window->maximized && !window->fullscreen)

demos/gtk-demo/assistant.c

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

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;
+}

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
@@ -87,14 +87,14 @@ find_toplevel_at_pointer (GdkDisplay *display)
   return widget ? gtk_widget_get_toplevel (widget) : NULL;
 }
 
-static void
-released_cb (GtkGestureMultiPress *gesture,
-             guint                 n_press,
-             gdouble               x,
-             gdouble               y,
-             gboolean             *clicked)
+static gboolean
+release_event_cb (GtkWidget *widget,
+                  GdkEvent  *event,
+                  gboolean  *clicked)
 {
-  *clicked = TRUE;
+  if (gdk_event_get_event_type (event) == GDK_BUTTON_RELEASE)
+    *clicked = TRUE;
+  return TRUE;
 }
 
 /* Asks the user to click on a window, then waits for them click
@@ -132,12 +132,10 @@ query_for_toplevel (GdkDisplay *display,
                      GDK_SEAT_CAPABILITY_ALL_POINTING,
                      FALSE, cursor, NULL, NULL, NULL) == GDK_GRAB_SUCCESS)
     {
-      GtkGesture *gesture = gtk_gesture_multi_press_new ();
       gboolean clicked = FALSE;
 
-      g_signal_connect (gesture, "released",
-                        G_CALLBACK (released_cb), &clicked);
-      gtk_widget_add_controller (popup, GTK_EVENT_CONTROLLER (gesture));
+      g_signal_connect (popup, "event",
+                        G_CALLBACK (release_event_cb), &clicked);
 
       /* Process events until clicked is set by our button release event handler.
        * We pass in may_block=TRUE since we want to wait if there
@@ -146,8 +144,6 @@ query_for_toplevel (GdkDisplay *display,
       while (!clicked)
         g_main_context_iteration (NULL, TRUE);
 
-      gdk_seat_ungrab (gdk_device_get_seat (device));
-
       toplevel = find_toplevel_at_pointer (display);
       if (toplevel == popup)
         toplevel = NULL;
@@ -315,7 +311,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);
@@ -325,7 +321,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);
@@ -365,11 +361,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,
@@ -542,10 +538,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);
 

demos/gtk-demo/clipboard.c

@@ -120,7 +120,7 @@ get_image_paintable (GtkImage *image)
 
 static void
 drag_begin (GtkWidget      *widget,
-            GdkDrag        *drag,
+            GdkDragContext *context,
             gpointer        data)
 {
   GdkPaintable *paintable;
@@ -128,16 +128,17 @@ drag_begin (GtkWidget      *widget,
   paintable = get_image_paintable (GTK_IMAGE (widget));
   if (paintable)
     {
-      gtk_drag_set_icon_paintable (drag, paintable, -2, -2);
+      gtk_drag_set_icon_paintable (context, paintable, -2, -2);
       g_object_unref (paintable);
     }
 }
 
 void
 drag_data_get (GtkWidget        *widget,
-               GdkDrag          *drag,
+               GdkDragContext   *context,
                GtkSelectionData *selection_data,
                guint             info,
+               guint             time,
                gpointer          data)
 {
   GdkPaintable *paintable;
@@ -149,8 +150,9 @@ drag_data_get (GtkWidget        *widget,
 
 static void
 drag_data_received (GtkWidget        *widget,
-                    GdkDrop          *drop,
+                    GdkDragContext   *context,
                     GtkSelectionData *selection_data,
+                    guint32           time,
                     gpointer          data)
 {
   if (gtk_selection_data_get_length (selection_data) > 0)
@@ -259,45 +261,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");

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

demos/gtk-demo/combobox.c

@@ -144,7 +144,7 @@ create_capital_store (void)
     { NULL, "Jackson" },
     { NULL, "Jefferson City" },
     { NULL, "Juneau" },
-    { "K - O", NULL },
+    { "K - O" },
     { NULL, "Lansing" },
     { NULL, "Lincoln" },
     { NULL, "Little Rock" },
@@ -154,7 +154,7 @@ create_capital_store (void)
     { NULL, "Nashville" },
     { NULL, "Oklahoma City" },
     { NULL, "Olympia" },
-    { "P - S", NULL },
+    { NULL, "P - S" },
     { NULL, "Phoenix" },
     { NULL, "Pierre" },
     { NULL, "Providence" },
@@ -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);

demos/gtk-demo/demo.gresource.xml

@@ -3,6 +3,7 @@
   <gresource prefix="/ui">
     <file preprocess="xml-stripblanks">main.ui</file>
     <file preprocess="xml-stripblanks">appmenu.ui</file>
+    <file>theme.css</file>
   </gresource>
   <gresource prefix="/application_demo">
     <file>application.c</file>
@@ -105,6 +106,9 @@
     <file>gnome-fs-directory.png</file>
     <file>gnome-fs-regular.png</file>
   </gresource>
+  <gresource prefix="/stack">
+    <file>stack.ui</file>
+  </gresource>
   <gresource prefix="/shortcuts">
     <file>shortcuts.ui</file>
     <file>shortcuts-builder.ui</file>
@@ -112,14 +116,6 @@
     <file>shortcuts-clocks.ui</file>
     <file>shortcuts-boxes.ui</file>
   </gresource>
-  <gresource prefix="/sliding_puzzle">
-    <file>puzzlepiece.c</file>
-    <file>puzzlepiece.h</file>
-    <file>portland-rose.jpg</file>
-  </gresource>
-  <gresource prefix="/stack">
-    <file>stack.ui</file>
-  </gresource>
   <gresource prefix="/revealer">
     <file>revealer.ui</file>
   </gresource>
@@ -143,6 +139,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>
@@ -160,6 +157,7 @@
     <file>editable_cells.c</file>
     <file>entry_buffer.c</file>
     <file>entry_completion.c</file>
+    <file>event_axes.c</file>
     <file>expander.c</file>
     <file>filtermodel.c</file>
     <file>fishbowl.c</file>
@@ -201,7 +199,6 @@
     <file>shortcuts.c</file>
     <file>sizegroup.c</file>
     <file>sidebar.c</file>
-    <file>sliding_puzzle.c</file>
     <file>stack.c</file>
     <file>spinbutton.c</file>
     <file>spinner.c</file>

demos/gtk-demo/demo.ui

@@ -199,6 +199,9 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -252,10 +255,16 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
         </child>
         <child>
           <object class="GtkStatusbar" id="statusbar1">
           </object>
+          <packing>
+            <property name="position">3</property>
+          </packing>
         </child>
       </object>
     </child>

demos/gtk-demo/dialog.c

@@ -56,16 +56,16 @@ 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 ();
@@ -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);

demos/gtk-demo/dnd.c

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

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

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

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

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

demos/gtk-demo/event_axes.c

@@ -0,0 +1,666 @@
+/* Touch and Drawing Tablets
+ *
+ * Demonstrates advanced handling of event information from exotic
+ * input devices.
+ *
+ * On one hand, this snippet demonstrates management of drawing tablets,
+ * those contain additional information for the pointer other than
+ * X/Y coordinates. Tablet pads events are mapped to actions, which
+ * are both defined and interpreted by the application.
+ *
+ * Input axes are dependent on hardware devices, on linux/unix you
+ * can see the device axes through xinput list <device>. Each time
+ * a different hardware device is used to move the pointer, the
+ * master device will be updated to match the axes it provides,
+ * these changes can be tracked through GdkDevice::changed, or
+ * checking gdk_event_get_source_device().
+ *
+ * On the other hand, this demo handles basic multitouch events,
+ * each event coming from an specific touchpoint will contain a
+ * GdkEventSequence that's unique for its lifetime, so multiple
+ * touchpoints can be tracked.
+ */
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+typedef struct {
+  GdkDevice *last_source;
+  GdkDeviceTool *last_tool;
+  gdouble *axes;
+  GdkRGBA color;
+  gdouble x;
+  gdouble y;
+} AxesInfo;
+
+typedef struct {
+  GHashTable *pointer_info; /* GdkDevice -> AxesInfo */
+  GHashTable *touch_info; /* GdkEventSequence -> AxesInfo */
+} EventData;
+
+const gchar *colors[] = {
+  "black",
+  "orchid",
+  "fuchsia",
+  "indigo",
+  "thistle",
+  "sienna",
+  "azure",
+  "plum",
+  "lime",
+  "navy",
+  "maroon",
+  "burlywood"
+};
+
+static GtkPadActionEntry pad_actions[] = {
+  { GTK_PAD_ACTION_BUTTON, 1, -1, N_("Nuclear strike"), "pad.nuke" },
+  { GTK_PAD_ACTION_BUTTON, 2, -1, N_("Release siberian methane reserves"), "pad.heat" },
+  { GTK_PAD_ACTION_BUTTON, 3, -1, N_("Release solar flare"), "pad.fry" },
+  { GTK_PAD_ACTION_BUTTON, 4, -1, N_("De-stabilize Oort cloud"), "pad.fall" },
+  { GTK_PAD_ACTION_BUTTON, 5, -1, N_("Ignite WR-104"), "pad.burst" },
+  { GTK_PAD_ACTION_BUTTON, 6, -1, N_("Lart whoever asks about this button"), "pad.lart" },
+  { GTK_PAD_ACTION_RING, -1, -1, N_("Earth axial tilt"), "pad.tilt" },
+  { GTK_PAD_ACTION_STRIP, -1, -1, N_("Extent of weak nuclear force"), "pad.dissolve" },
+};
+
+static const gchar *pad_action_results[] = {
+  "☢",
+  "♨",
+  "☼",
+  "☄",
+  "⚡",
+  "💫",
+  "◑",
+  "⚛"
+};
+
+static guint cur_color = 0;
+static guint pad_action_timeout_id = 0;
+
+static AxesInfo *
+axes_info_new (void)
+{
+  AxesInfo *info;
+
+  info = g_new0 (AxesInfo, 1);
+  gdk_rgba_parse (&info->color, colors[cur_color]);
+
+  cur_color = (cur_color + 1) % G_N_ELEMENTS (colors);
+
+  return info;
+}
+
+static EventData *
+event_data_new (void)
+{
+  EventData *data;
+
+  data = g_new0 (EventData, 1);
+  data->pointer_info = g_hash_table_new_full (NULL, NULL, NULL,
+                                              (GDestroyNotify) g_free);
+  data->touch_info = g_hash_table_new_full (NULL, NULL, NULL,
+                                            (GDestroyNotify) g_free);
+
+  return data;
+}
+
+static void
+event_data_free (EventData *data)
+{
+  g_hash_table_destroy (data->pointer_info);
+  g_hash_table_destroy (data->touch_info);
+  g_free (data);
+}
+
+static void
+update_axes_from_event (GdkEvent  *event,
+                        EventData *data)
+{
+  GdkDevice *device, *source_device;
+  GdkEventSequence *sequence;
+  GdkDeviceTool *tool;
+  GdkEventType type;
+  gdouble x, y;
+  AxesInfo *info;
+
+  device = gdk_event_get_device (event);
+  source_device = gdk_event_get_source_device (event);
+  sequence = gdk_event_get_event_sequence (event);
+  tool = gdk_event_get_device_tool (event);
+  type = gdk_event_get_event_type (event);
+
+  if (type == GDK_TOUCH_END ||
+      type == GDK_TOUCH_CANCEL)
+    {
+      g_hash_table_remove (data->touch_info, sequence);
+      return;
+    }
+  else if (type == GDK_LEAVE_NOTIFY)
+    {
+      g_hash_table_remove (data->pointer_info, device);
+      return;
+    }
+
+  if (!source_device)
+    return;
+
+  if (!sequence)
+    {
+      info = g_hash_table_lookup (data->pointer_info, device);
+
+      if (!info)
+        {
+          info = axes_info_new ();
+          g_hash_table_insert (data->pointer_info, device, info);
+        }
+    }
+  else
+    {
+      info = g_hash_table_lookup (data->touch_info, sequence);
+
+      if (!info)
+        {
+          info = axes_info_new ();
+          g_hash_table_insert (data->touch_info, sequence, info);
+        }
+    }
+
+  if (info->last_source != source_device)
+    info->last_source = source_device;
+
+  if (info->last_tool != tool)
+    info->last_tool = tool;
+
+  g_clear_pointer (&info->axes, g_free);
+
+  if (type == GDK_TOUCH_BEGIN ||
+      type == GDK_TOUCH_UPDATE)
+    {
+      gboolean emulating_pointer;
+
+      gdk_event_get_touch_emulating_pointer (event, &emulating_pointer);
+      if (sequence && emulating_pointer)
+        g_hash_table_remove (data->pointer_info, device);
+    }
+  if (type == GDK_MOTION_NOTIFY ||
+      type == GDK_BUTTON_PRESS ||
+      type == GDK_BUTTON_RELEASE)
+    {
+      gdouble *axes;
+      guint n_axes;
+
+      gdk_event_get_axes (event, &axes, &n_axes);
+      info->axes = g_memdup (axes, sizeof (double) * n_axes);
+    }
+
+  if (gdk_event_get_coords (event, &x, &y))
+    {
+      info->x = x;
+      info->y = y;
+    }
+}
+
+static gboolean
+event_cb (GtkWidget *widget,
+          GdkEvent  *event,
+          gpointer   user_data)
+{
+  update_axes_from_event (event, user_data);
+  gtk_widget_queue_draw (widget);
+  return FALSE;
+}
+
+static void
+render_arrow (cairo_t     *cr,
+              gdouble      x_diff,
+              gdouble      y_diff,
+              const gchar *label)
+{
+  cairo_save (cr);
+
+  cairo_set_source_rgb (cr, 0, 0, 0);
+  cairo_new_path (cr);
+  cairo_move_to (cr, 0, 0);
+  cairo_line_to (cr, x_diff, y_diff);
+  cairo_stroke (cr);
+
+  cairo_move_to (cr, x_diff, y_diff);
+  cairo_show_text (cr, label);
+
+  cairo_restore (cr);
+}
+
+static void
+draw_axes_info (cairo_t       *cr,
+                AxesInfo      *info,
+                int            width,
+                int            height)
+{
+  gdouble pressure, tilt_x, tilt_y, distance, wheel, rotation, slider;
+  GdkAxisFlags axes = gdk_device_get_axes (info->last_source);
+
+  cairo_save (cr);
+
+  cairo_set_line_width (cr, 1);
+  gdk_cairo_set_source_rgba (cr, &info->color);
+
+  cairo_move_to (cr, 0, info->y);
+  cairo_line_to (cr, width, info->y);
+  cairo_move_to (cr, info->x, 0);
+  cairo_line_to (cr, info->x, height);
+  cairo_stroke (cr);
+
+  cairo_translate (cr, info->x, info->y);
+
+  if (!info->axes)
+    {
+      cairo_restore (cr);
+      return;
+    }
+
+  if (axes & GDK_AXIS_FLAG_PRESSURE)
+    {
+      cairo_pattern_t *pattern;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_PRESSURE,
+                           &pressure);
+
+      pattern = cairo_pattern_create_radial (0, 0, 0, 0, 0, 100);
+      cairo_pattern_add_color_stop_rgba (pattern, pressure, 1, 0, 0, pressure);
+      cairo_pattern_add_color_stop_rgba (pattern, 1, 0, 0, 1, 0);
+
+      cairo_set_source (cr, pattern);
+
+      cairo_arc (cr, 0, 0, 100, 0, 2 * G_PI);
+      cairo_fill (cr);
+
+      cairo_pattern_destroy (pattern);
+    }
+
+  if (axes & GDK_AXIS_FLAG_XTILT &&
+      axes & GDK_AXIS_FLAG_YTILT)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_XTILT,
+                           &tilt_x);
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_YTILT,
+                           &tilt_y);
+
+      render_arrow (cr, tilt_x * 100, tilt_y * 100, "Tilt");
+    }
+
+  if (axes & GDK_AXIS_FLAG_DISTANCE)
+    {
+      double dashes[] = { 5.0, 5.0 };
+      cairo_text_extents_t extents;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_DISTANCE,
+                           &distance);
+
+      cairo_save (cr);
+
+      cairo_move_to (cr, distance * 100, 0);
+
+      cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
+      cairo_set_dash (cr, dashes, 2, 0.0);
+      cairo_arc (cr, 0, 0, distance * 100, 0, 2 * G_PI);
+      cairo_stroke (cr);
+
+      cairo_move_to (cr, 0, -distance * 100);
+      cairo_text_extents (cr, "Distance", &extents);
+      cairo_rel_move_to (cr, -extents.width / 2, 0);
+      cairo_show_text (cr, "Distance");
+
+      cairo_move_to (cr, 0, 0);
+
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_WHEEL)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_WHEEL,
+                           &wheel);
+
+      cairo_save (cr);
+      cairo_set_line_width (cr, 10);
+      cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
+
+      cairo_new_sub_path (cr);
+      cairo_arc (cr, 0, 0, 100, 0, wheel * 2 * G_PI);
+      cairo_stroke (cr);
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_ROTATION)
+    {
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_ROTATION,
+                           &rotation);
+      rotation *= 2 * G_PI;
+
+      cairo_save (cr);
+      cairo_rotate (cr, - G_PI / 2);
+      cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+      cairo_set_line_width (cr, 5);
+
+      cairo_new_sub_path (cr);
+      cairo_arc (cr, 0, 0, 100, 0, rotation);
+      cairo_stroke (cr);
+      cairo_restore (cr);
+    }
+
+  if (axes & GDK_AXIS_FLAG_SLIDER)
+    {
+      cairo_pattern_t *pattern, *mask;
+
+      gdk_device_get_axis (info->last_source, info->axes, GDK_AXIS_SLIDER,
+                           &slider);
+
+      cairo_save (cr);
+
+      cairo_move_to (cr, 0, -10);
+      cairo_rel_line_to (cr, 0, -50);
+      cairo_rel_line_to (cr, 10, 0);
+      cairo_rel_line_to (cr, -5, 50);
+      cairo_close_path (cr);
+
+      cairo_clip_preserve (cr);
+
+      pattern = cairo_pattern_create_linear (0, -10, 0, -60);
+      cairo_pattern_add_color_stop_rgb (pattern, 0, 0, 1, 0);
+      cairo_pattern_add_color_stop_rgb (pattern, 1, 1, 0, 0);
+      cairo_set_source (cr, pattern);
+      cairo_pattern_destroy (pattern);
+
+      mask = cairo_pattern_create_linear (0, -10, 0, -60);
+      cairo_pattern_add_color_stop_rgba (mask, 0, 0, 0, 0, 1);
+      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 1);
+      cairo_pattern_add_color_stop_rgba (mask, slider, 0, 0, 0, 0);
+      cairo_pattern_add_color_stop_rgba (mask, 1, 0, 0, 0, 0);
+      cairo_mask (cr, mask);
+      cairo_pattern_destroy (mask);
+
+      cairo_set_source_rgb (cr, 0, 0, 0);
+      cairo_stroke (cr);
+
+      cairo_restore (cr);
+    }
+
+  cairo_restore (cr);
+}
+
+static const gchar *
+tool_type_to_string (GdkDeviceToolType tool_type)
+{
+  switch (tool_type)
+    {
+    case GDK_DEVICE_TOOL_TYPE_PEN:
+      return "Pen";
+    case GDK_DEVICE_TOOL_TYPE_ERASER:
+      return "Eraser";
+    case GDK_DEVICE_TOOL_TYPE_BRUSH:
+      return "Brush";
+    case GDK_DEVICE_TOOL_TYPE_PENCIL:
+      return "Pencil";
+    case GDK_DEVICE_TOOL_TYPE_AIRBRUSH:
+      return "Airbrush";
+    case GDK_DEVICE_TOOL_TYPE_MOUSE:
+      return "Mouse";
+    case GDK_DEVICE_TOOL_TYPE_LENS:
+      return "Lens cursor";
+    case GDK_DEVICE_TOOL_TYPE_UNKNOWN:
+    default:
+      return "Unknown";
+    }
+}
+
+static void
+draw_device_info (GtkWidget        *widget,
+                  cairo_t          *cr,
+                  GdkEventSequence *sequence,
+                  gint             *y,
+                  AxesInfo         *info)
+{
+  PangoLayout *layout;
+  GString *string;
+  gint height;
+
+  cairo_save (cr);
+
+  string = g_string_new (NULL);
+  g_string_append_printf (string, "Source: %s",
+                          gdk_device_get_name (info->last_source));
+
+  if (sequence)
+    g_string_append_printf (string, "\nSequence: %d",
+                            GPOINTER_TO_UINT (sequence));
+
+  if (info->last_tool)
+    {
+      const gchar *tool_type;
+      guint64 serial;
+
+      tool_type = tool_type_to_string (gdk_device_tool_get_tool_type (info->last_tool));
+      serial = gdk_device_tool_get_serial (info->last_tool);
+      g_string_append_printf (string, "\nTool: %s", tool_type);
+
+      if (serial != 0)
+        g_string_append_printf (string, ", Serial: %lx", serial);
+    }
+
+  cairo_move_to (cr, 10, *y);
+  layout = gtk_widget_create_pango_layout (widget, string->str);
+  pango_cairo_show_layout (cr, layout);
+  cairo_stroke (cr);
+
+  pango_layout_get_pixel_size (layout, NULL, &height);
+
+  gdk_cairo_set_source_rgba (cr, &info->color);
+  cairo_set_line_width (cr, 10);
+  cairo_move_to (cr, 0, *y);
+
+  *y = *y + height;
+  cairo_line_to (cr, 0, *y);
+  cairo_stroke (cr);
+
+  cairo_restore (cr);
+
+  g_object_unref (layout);
+  g_string_free (string, TRUE);
+}
+
+static void
+draw_cb (GtkDrawingArea *da,
+         cairo_t        *cr,
+         int             width,
+         int             height,
+         gpointer        user_data)
+{
+  GtkWidget *widget = GTK_WIDGET (da);
+  EventData *data = user_data;
+  AxesInfo *info;
+  GHashTableIter iter;
+  gpointer key, value;
+  gint y = 0;
+
+  /* Draw Abs info */
+  g_hash_table_iter_init (&iter, data->pointer_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_axes_info (cr, info, width, height);
+    }
+
+  g_hash_table_iter_init (&iter, data->touch_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_axes_info (cr, info, width, height);
+    }
+
+  /* Draw name, color legend and misc data */
+  g_hash_table_iter_init (&iter, data->pointer_info);
+
+  while (g_hash_table_iter_next (&iter, NULL, &value))
+    {
+      info = value;
+      draw_device_info (widget, cr, NULL, &y, info);
+    }
+
+  g_hash_table_iter_init (&iter, data->touch_info);
+
+  while (g_hash_table_iter_next (&iter, &key, &value))
+    {
+      info = value;
+      draw_device_info (widget, cr, key, &y, info);
+    }
+}
+
+static void
+update_label_text (GtkWidget   *label,
+                   const gchar *text)
+{
+  gchar *markup = NULL;
+
+  if (text)
+    markup = g_strdup_printf ("<span font='48.0'>%s</span>", text);
+  gtk_label_set_markup (GTK_LABEL (label), markup);
+  g_free (markup);
+}
+
+static gboolean
+reset_label_text_timeout_cb (gpointer user_data)
+{
+  GtkWidget *label = user_data;
+
+  update_label_text (label, NULL);
+  pad_action_timeout_id = 0;
+  return G_SOURCE_REMOVE;
+}
+
+static void
+update_label_and_timeout (GtkWidget   *label,
+                          const gchar *text)
+{
+  if (pad_action_timeout_id)
+    g_source_remove (pad_action_timeout_id);
+
+  update_label_text (label, text);
+  pad_action_timeout_id = g_timeout_add (200, reset_label_text_timeout_cb, label);
+}
+
+static void
+on_action_activate (GSimpleAction *action,
+                    GVariant      *parameter,
+                    gpointer       user_data)
+{
+  GtkWidget *label = user_data;
+  const gchar *result;
+  gchar *str;
+
+  result = g_object_get_data (G_OBJECT (action), "action-result");
+
+  if (!parameter)
+    update_label_and_timeout (label, result);
+  else
+    {
+      str = g_strdup_printf ("%s %.2f", result, g_variant_get_double (parameter));
+      update_label_and_timeout (label, str);
+      g_free (str);
+    }
+}
+
+static void
+init_pad_controller (GtkWidget *window,
+                     GtkWidget *label)
+{
+  GtkPadController *pad_controller;
+  GSimpleActionGroup *action_group;
+  GSimpleAction *action;
+  gint i;
+
+  action_group = g_simple_action_group_new ();
+  pad_controller = gtk_pad_controller_new (G_ACTION_GROUP (action_group),
+                                           NULL);
+
+  for (i = 0; i < G_N_ELEMENTS (pad_actions); i++)
+    {
+      if (pad_actions[i].type == GTK_PAD_ACTION_BUTTON)
+        {
+          action = g_simple_action_new (pad_actions[i].action_name, NULL);
+        }
+      else
+        {
+          action = g_simple_action_new_stateful (pad_actions[i].action_name,
+                                                 G_VARIANT_TYPE_DOUBLE, NULL);
+        }
+
+      g_signal_connect (action, "activate",
+                        G_CALLBACK (on_action_activate), label);
+      g_object_set_data (G_OBJECT (action), "action-result",
+                         (gpointer) pad_action_results[i]);
+      g_action_map_add_action (G_ACTION_MAP (action_group), G_ACTION (action));
+      g_object_unref (action);
+    }
+
+  gtk_pad_controller_set_action_entries (pad_controller, pad_actions,
+                                         G_N_ELEMENTS (pad_actions));
+  gtk_widget_add_controller (window, GTK_EVENT_CONTROLLER (pad_controller));
+
+  g_object_unref (action_group);
+}
+
+GtkWidget *
+do_event_axes (GtkWidget *toplevel)
+{
+  static GtkWidget *window = NULL;
+  EventData *event_data;
+  GtkWidget *label;
+  GtkWidget *overlay;
+  GtkWidget *da;
+
+  if (!window)
+    {
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_title (GTK_WINDOW (window), "Touch and Drawing Tablets");
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_widget_set_support_multidevice (window, TRUE);
+
+      event_data = event_data_new ();
+      g_object_set_data_full (G_OBJECT (window), "gtk-demo-event-data",
+                              event_data, (GDestroyNotify) event_data_free);
+
+      da = gtk_drawing_area_new ();
+      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 400);
+      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 400);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), draw_cb, event_data, NULL);
+      gtk_widget_set_can_focus (da, TRUE);
+      gtk_widget_grab_focus (da);
+
+      g_signal_connect (da, "event",
+                        G_CALLBACK (event_cb), event_data);
+
+      label = gtk_label_new ("");
+      gtk_widget_set_halign (label, GTK_ALIGN_START);
+      gtk_widget_set_valign (label, GTK_ALIGN_START);
+      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+
+      overlay = gtk_overlay_new ();
+      gtk_container_add (GTK_CONTAINER (window), overlay);
+      gtk_container_add (GTK_CONTAINER (overlay), da);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
+
+      init_pad_controller (da, label);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+  return window;
+}

demos/gtk-demo/expander.c

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

demos/gtk-demo/fishbowl.c

@@ -134,9 +134,7 @@ static GtkWidget *
 create_video (void)
 {
   GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-  GtkWidget *w = gtk_picture_new_for_paintable (GDK_PAINTABLE (stream));
-
-  gtk_widget_set_size_request (w, 64, 64);
+  GtkWidget *w = gtk_image_new_from_paintable (GDK_PAINTABLE (stream));
   gtk_media_stream_set_loop (stream, TRUE);
   gtk_media_stream_play (stream);
   g_object_unref (stream);

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.

demos/gtk-demo/gestures.c

@@ -166,6 +166,7 @@ do_gestures (GtkWidget *do_widget)
 
       /* 3fg swipe for touchpads */
       gesture = g_object_new (GTK_TYPE_GESTURE_SWIPE,
+                              "widget", drawing_area,
                               "n-points", 3,
                               NULL);
       g_signal_connect (gesture, "begin",
@@ -174,8 +175,7 @@ do_gestures (GtkWidget *do_widget)
                         G_CALLBACK (swipe_gesture_swept), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
-
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* Long press */
       gesture = gtk_gesture_long_press_new ();

demos/gtk-demo/gtk4-demo.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=GTK Demo
-Comment=GTK code examples and demonstrations
+Name=GTK+ Demo
+Comment=GTK+ code examples and demonstrations
 Exec=gtk4-demo
 Icon=gtk4-demo
 Terminal=false

demos/gtk-demo/gtkfishbowl.c

@@ -128,10 +128,9 @@ gtk_fishbowl_measure (GtkWidget      *widget,
 }
 
 static void
-gtk_fishbowl_size_allocate (GtkWidget *widget,
-                            int        width,
-                            int        height,
-                            int        baseline)
+gtk_fishbowl_size_allocate (GtkWidget           *widget,
+                            const GtkAllocation *allocation,
+                            int                  baseline)
 {
   GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
@@ -148,8 +147,8 @@ gtk_fishbowl_size_allocate (GtkWidget *widget,
         continue;
 
       gtk_widget_get_preferred_size (child->widget, &child_requisition, NULL);
-      child_allocation.x = round (child->x * (width - child_requisition.width));
-      child_allocation.y = round (child->y * (height - child_requisition.height));
+      child_allocation.x = allocation->x + round (child->x * (allocation->width - child_requisition.width));
+      child_allocation.y = allocation->y + round (child->y * (allocation->height - child_requisition.height));
       child_allocation.width = child_requisition.width;
       child_allocation.height = child_requisition.height;
 

demos/gtk-demo/hypertext.c

@@ -135,42 +135,55 @@ static void set_cursor_if_appropriate (GtkTextView *text_view,
                                        gint         x,
                                        gint         y);
 
-static void
-released_cb (GtkGestureMultiPress *gesture,
-             guint                 n_press,
-             gdouble               x,
-             gdouble               y,
-             GtkWidget            *text_view)
+/* Links can also be activated by clicking or tapping.
+ */
+static gboolean
+event_cb (GtkWidget *text_view,
+          GdkEvent  *ev)
 {
   GtkTextIter start, end, iter;
   GtkTextBuffer *buffer;
-  int tx, ty;
+  gdouble ex, ey;
+  int x, y;
+  GdkEventType type;
 
-  if (gtk_gesture_single_get_button (GTK_GESTURE_SINGLE (gesture)) > 1)
-    return;
+  type = gdk_event_get_event_type (ev);
 
+  gdk_event_get_coords (ev, &ex, &ey);
   gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view),
                                          GTK_TEXT_WINDOW_WIDGET,
-                                         x, y, &tx, &ty);
+                                         ex, ey, &x, &y);
+
+  if (type == GDK_BUTTON_RELEASE)
+    {
+      guint button;
+
+      gdk_event_get_button (ev, &button);
+      if (button != GDK_BUTTON_PRIMARY)
+        return FALSE;
+    }
+  else if (type == GDK_MOTION_NOTIFY)
+    {
+      set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
+      return FALSE;
+    }
+  else if (type == GDK_TOUCH_END)
+    {
+    }
+  else
+    return FALSE;
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
 
   /* we shouldn't follow a link if the user has selected something */
   gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
   if (gtk_text_iter_get_offset (&start) != gtk_text_iter_get_offset (&end))
-    return;
+    return FALSE;
 
   if (gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW (text_view), &iter, x, y))
     follow_if_link (text_view, &iter);
-}
 
-static void
-motion_cb (GtkEventControllerMotion *controller,
-           gdouble                   x,
-           gdouble                   y,
-           GtkTextView              *text_view)
-{
-  set_cursor_if_appropriate (text_view, x, y);
+  return TRUE;
 }
 
 static gboolean hovering_over_link = FALSE;
@@ -246,16 +259,8 @@ do_hypertext (GtkWidget *do_widget)
       controller = gtk_event_controller_key_new ();
       g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), view);
       gtk_widget_add_controller (view, controller);
-
-      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);
-
-      controller = gtk_event_controller_motion_new ();
-      g_signal_connect (controller, "motion",
-                        G_CALLBACK (motion_cb), view);
-      gtk_widget_add_controller (view, controller);
+      g_signal_connect (view, "event",
+                        G_CALLBACK (event_cb), NULL);
 
       buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 

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 ("/");

demos/gtk-demo/images.c

@@ -1,15 +1,15 @@
 /* Images
  *
- * GtkImage and GtkPicture are used to display an image; the image can be
- * in a number of formats.
- *
- * GtkImage is the widget used to display icons or images that should be
- * sized and styled like an icon, while GtkPicture is used for images
- * that should be displayed as-is.
+ * GtkImage is used to display an image; the image can be in a number of formats.
+ * Typically, you load an image into a GdkPixbuf, then display the pixbuf.
  *
  * This demo code shows some of the more obscure cases, in the simple
- * case a call to gtk_picture_new_for_file() or
- * gtk_image_new_from_icon_name() is all you need.
+ * case a call to gtk_image_new_from_file() is all you need.
+ *
+ * If you want to put image data in your program as a C variable,
+ * use the make-inline-pixbuf program that comes with GTK+.
+ * This way you won't need to depend on loading external files, your
+ * application binary can be self-contained.
  */
 
 #include <gtk/gtk.h>
@@ -27,9 +27,9 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
                                gpointer         data)
 {
   GdkPixbuf *pixbuf;
-  GtkWidget *picture;
+  GtkWidget *image;
 
-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);
 
   pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
 
@@ -38,7 +38,7 @@ progressive_prepared_callback (GdkPixbufLoader *loader,
    */
   gdk_pixbuf_fill (pixbuf, 0xaaaaaaff);
 
-  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 }
 
 static void
@@ -49,21 +49,21 @@ progressive_updated_callback (GdkPixbufLoader *loader,
                               gint                 height,
                               gpointer     data)
 {
-  GtkWidget *picture;
+  GtkWidget *image;
   GdkPixbuf *pixbuf;
 
-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);
 
   pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
+  gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
 }
 
 static gint
 progressive_timeout (gpointer data)
 {
-  GtkWidget *picture;
+  GtkWidget *image;
 
-  picture = GTK_WIDGET (data);
+  image = GTK_WIDGET (data);
 
   /* This shows off fully-paranoid error handling, so looks scary.
    * You could factor out the error handling code into a nice separate
@@ -241,10 +241,10 @@ progressive_timeout (gpointer data)
       pixbuf_loader = gdk_pixbuf_loader_new ();
 
       g_signal_connect (pixbuf_loader, "area-prepared",
-                        G_CALLBACK (progressive_prepared_callback), picture);
+                        G_CALLBACK (progressive_prepared_callback), image);
 
       g_signal_connect (pixbuf_loader, "area-updated",
-                        G_CALLBACK (progressive_updated_callback), picture);
+                        G_CALLBACK (progressive_updated_callback), image);
     }
 
   /* leave timeout installed */
@@ -252,7 +252,7 @@ progressive_timeout (gpointer data)
 }
 
 static void
-start_progressive_loading (GtkWidget *picture)
+start_progressive_loading (GtkWidget *image)
 {
   /* This is obviously totally contrived (we slow down loading
    * on purpose to show how incremental loading works).
@@ -261,8 +261,8 @@ start_progressive_loading (GtkWidget *picture)
    * The timeout simply simulates a slow data source by inserting
    * 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");
+  load_timeout = g_timeout_add (150, progressive_timeout, image);
+  g_source_set_name_by_id (load_timeout, "[gtk+] progressive_timeout");
 }
 
 static void
@@ -323,7 +323,6 @@ do_images (GtkWidget *do_widget)
   GtkWidget *hbox;
   GtkWidget *base_vbox;
   GtkWidget *image;
-  GtkWidget *picture;
   GtkWidget *label;
   GtkWidget *button;
   GdkPaintable *paintable;
@@ -354,13 +353,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,30 +372,30 @@ 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");
+      image = gtk_image_new_from_resource ("/images/floppybuddy.gif");
 
-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      gtk_container_add (GTK_CONTAINER (frame), image);
 
       /* Symbolic icon */
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Symbolic themed icon</u>");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_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,21 +411,21 @@ 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.
        */
-      picture = gtk_picture_new ();
-      gtk_container_add (GTK_CONTAINER (frame), picture);
+      image = gtk_image_new_from_pixbuf (NULL);
+      gtk_container_add (GTK_CONTAINER (frame), image);
 
-      start_progressive_loading (picture);
+      start_progressive_loading (image);
 
       /* Video */
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
@@ -435,13 +434,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,17 +453,18 @@ 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);
-      gtk_widget_set_size_request (picture, 100, 100);
-      gtk_widget_set_valign (picture, GTK_ALIGN_START);
-      gtk_container_add (GTK_CONTAINER (vbox), picture);
+      image = gtk_image_new_from_paintable (paintable);
+      gtk_image_set_can_shrink (GTK_IMAGE (image), TRUE);
+      gtk_widget_set_size_request (image, 100, 100);
+      gtk_widget_set_valign (image, GTK_ALIGN_START);
+      gtk_container_add (GTK_CONTAINER (vbox), image);
 
       /* 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),

demos/gtk-demo/infobar.c

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

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

demos/gtk-demo/listbox.c

@@ -361,12 +361,12 @@ do_listbox (GtkWidget *do_widget)
 
       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);
+      gtk_box_pack_start (GTK_BOX (vbox), scrolled);
       listbox = gtk_list_box_new ();
       gtk_container_add (GTK_CONTAINER (scrolled), listbox);
 

demos/gtk-demo/listbox.ui

@@ -67,6 +67,9 @@
                   <class name="dim-label"/>
                 </style>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="short_time_label">
@@ -76,6 +79,10 @@
                   <class name="dim-label"/>
                 </style>
               </object>
+              <packing>
+                <property name="pack-type">end</property>
+                <property name="position">2</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -111,6 +118,9 @@
               <object class="GtkLabel" id="label4">
                 <property name="label" translatable="yes">Resent by</property>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child>
               <object class="GtkLinkButton" id="resent_by_button">
@@ -120,6 +130,9 @@
                 <property name="relief">none</property>
                 <property name="uri">http://www.gtk.org</property>
               </object>
+              <packing>
+                <property name="position">2</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -141,7 +154,6 @@
             </child>
             <child>
               <object class="GtkBox" id="extra_buttons_box">
-                <property name="visible">0</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkButton" id="reply-button">
@@ -159,6 +171,9 @@
                     <property name="relief">none</property>
                     <signal name="clicked" handler="reshare_clicked" swapped="yes"/>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkButton" id="favorite-buttton">
@@ -168,6 +183,9 @@
                     <property name="relief">none</property>
                     <signal name="clicked" handler="favorite_clicked" swapped="yes"/>
                   </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkMenuButton" id="more-button">
@@ -181,8 +199,14 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
           </object>
           <packing>
@@ -225,8 +249,14 @@ FAVORITES</property>
                         </child>
                         <child type="label_item"/>
                       </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="box6">
@@ -248,8 +278,14 @@ FAVORITES</property>
                           <class name="dim-label"/>
                         </style>
                       </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
               </object>
             </child>

demos/gtk-demo/main.c

@@ -42,24 +42,24 @@ activate_about (GSimpleAction *action,
 {
   GtkApplication *app = user_data;
   const gchar *authors[] = {
-    "The GTK Team",
+    "The GTK+ Team",
     NULL
   };
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK Demo",
-                         "version", g_strdup_printf ("%s,\nRunning against GTK %d.%d.%d",
+                         "program-name", "GTK+ Demo",
+                         "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 widgets",
+                         "comments", "Program to demonstrate GTK+ widgets",
                          "authors", authors,
-                         "logo-icon-name", "gtk4-demo",
-                         "title", "About GTK Demo",
+                         "logo-icon-name", "gtk3-demo",
+                         "title", "About GTK+ Demo",
                          NULL);
 }
 
@@ -831,14 +831,15 @@ load_file (const gchar *demoname,
           /* Skipping blank lines */
           while (g_ascii_isspace (*p))
             p++;
-
-          if (!*p)
+          if (*p)
+            {
+              p = lines[i];
+              state++;
+              /* Fall through */
+            }
+          else
             break;
 
-          p = lines[i];
-          state++;
-          /* Fall through */
-
         case 3:
           /* Reading program body */
           gtk_text_buffer_insert (source_buffer, &start, p, -1);
@@ -996,6 +997,41 @@ scrollbar_popup (GtkWidget *scrollbar, GtkWidget *menu)
   return TRUE;
 }
 
+static void
+settings__notify_gtk_theme_name (GObject *gobject,
+                                 GParamSpec *pspec,
+                                 gpointer data)
+{
+  static GtkCssProvider *css_provider;
+
+  GtkWidget *window = data;
+  char *theme_name;
+
+  g_object_get (gobject, "gtk-theme-name", &theme_name, NULL);
+  if (g_strcmp0 (theme_name, "Adwaita") == 0)
+    {
+      if (css_provider == NULL)
+        {
+          css_provider = gtk_css_provider_new ();
+          gtk_css_provider_load_from_resource (css_provider, "/ui/theme.css");
+          gtk_style_context_add_provider_for_display (gtk_widget_get_display (window),
+                                                      GTK_STYLE_PROVIDER (css_provider),
+                                                      GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+        }
+    }
+  else
+    {
+      if (css_provider != NULL)
+        {
+          gtk_style_context_remove_provider_for_display (gtk_widget_get_display (window),
+                                                         GTK_STYLE_PROVIDER (css_provider));
+          g_clear_object (&css_provider);
+        }
+    }
+
+  g_free (theme_name);
+}
+
 static void
 activate (GApplication *app)
 {
@@ -1028,6 +1064,20 @@ activate (GApplication *app)
                                    win_entries, G_N_ELEMENTS (win_entries),
                                    window);
 
+  g_signal_connect (gtk_settings_get_default (), "notify::gtk-theme-name",
+                    G_CALLBACK (settings__notify_gtk_theme_name),
+                    window);
+
+  if (gtk_get_minor_version () % 2 != 0)
+    {
+      GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (window));
+      gtk_style_context_add_class (context, "devel");
+    }
+
+  settings__notify_gtk_theme_name (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (window))),
+                                   NULL,
+                                   window);
+
   notebook = (GtkWidget *)gtk_builder_get_object (builder, "notebook");
 
   info_view = (GtkWidget *)gtk_builder_get_object (builder, "info-textview");

demos/gtk-demo/main.ui

@@ -16,10 +16,9 @@
     </columns>
   </object>
   <object class="GtkApplicationWindow" id="window">
-    <style><class name="devel"/></style>
     <property name="default-width">800</property>
     <property name="default-height">600</property>
-    <property name="title">GTK Demo</property>
+    <property name="title">GTK+ Demo</property>
     <signal name="destroy" handler="gtk_main_quit" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar">
@@ -152,6 +151,9 @@
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>

demos/gtk-demo/menus.c

@@ -115,7 +115,7 @@ do_menus (GtkWidget *do_widget)
 
       menubar = gtk_menu_bar_new ();
       gtk_widget_set_hexpand (menubar, TRUE);
-      gtk_container_add (GTK_CONTAINER (box1), menubar);
+      gtk_box_pack_start (GTK_BOX (box1), menubar);
       gtk_widget_show (menubar);
 
       menu = create_menu (2);
@@ -136,19 +136,19 @@ do_menus (GtkWidget *do_widget)
       gtk_widget_show (menuitem);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_container_add (GTK_CONTAINER (box1), box2);
+      gtk_box_pack_start (GTK_BOX (box1), box2);
       gtk_widget_show (box2);
 
       button = gtk_button_new_with_label ("Flip");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (change_orientation), menubar);
-      gtk_container_add (GTK_CONTAINER (box2), button);
+      gtk_box_pack_start (GTK_BOX (box2), button);
       gtk_widget_show (button);
 
       button = gtk_button_new_with_label ("Close");
       g_signal_connect_swapped (button, "clicked",
                                 G_CALLBACK(gtk_widget_destroy), window);
-      gtk_container_add (GTK_CONTAINER (box2), button);
+      gtk_box_pack_start (GTK_BOX (box2), button);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);

demos/gtk-demo/meson.build

@@ -4,6 +4,7 @@ demos = files([
   'application_demo.c',
   'assistant.c',
   'builder.c',
+  'button_box.c',
   'changedisplay.c',
   'clipboard.c',
   'colorsel.c',
@@ -21,6 +22,7 @@ demos = files([
   'editable_cells.c',
   'entry_buffer.c',
   'entry_completion.c',
+  'event_axes.c',
   'expander.c',
   'filtermodel.c',
   'fishbowl.c',
@@ -59,7 +61,6 @@ demos = files([
   'shortcuts.c',
   'sidebar.c',
   'sizegroup.c',
-  'sliding_puzzle.c',
   'spinbutton.c',
   'spinner.c',
   'stack.c',
@@ -75,7 +76,7 @@ demos = files([
 
 gtkdemo_deps = [ libgtk_dep, ]
 
-extra_demo_sources = files(['main.c', 'gtkfishbowl.c', 'fontplane.c', 'gtkgears.c', 'puzzlepiece.c'])
+extra_demo_sources = files(['main.c', 'gtkfishbowl.c', 'fontplane.c', 'gtkgears.c'])
 
 if harfbuzz_dep.found() and pangoft_dep.found()
   demos += files('font_features.c')
@@ -128,7 +129,7 @@ foreach icon_size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
 endforeach
 
 # desktop file
-install_data('org.gtk.Demo.desktop', install_dir: gtk_applicationsdir)
+install_data('gtk4-demo.desktop', install_dir: gtk_applicationsdir)
 
 # GSettings
 install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir)

demos/gtk-demo/org.gtk.Demo.appdata.xml

@@ -3,12 +3,12 @@
   <id>org.gtk.Demo.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0+</project_license>
-  <name>GTK Demo</name>
-  <summary>Program to demonstrate GTK functions</summary>
+  <name>GTK+ Demo</name>
+  <summary>Program to demonstrate GTK+ functions</summary>
   <description>
     <p>
-      GTK Demo is a collection of examples that demonstrate the major
-      features of the GTK toolkit.
+      GTK+ Demo is a collection of examples that demonstrate the major
+      features of the GTK+ toolkit.
     </p>
   </description>
   <screenshots>
@@ -30,4 +30,4 @@
   <translation type="gettext">gtk-4.0</translation>
   <update_contact>matthias.clasen_at_gmail.com</update_contact>
   <developer_name>Matthias Clasen and others</developer_name>
-</component>
+</component>

demos/gtk-demo/overlay.c

@@ -65,7 +65,7 @@ do_overlay (GtkWidget *do_widget)
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       gtk_widget_set_margin_top (label, 8);
       gtk_widget_set_margin_bottom (label, 50);
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
@@ -74,7 +74,7 @@ do_overlay (GtkWidget *do_widget)
       gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
       gtk_widget_set_margin_top (entry, 50);
       gtk_widget_set_margin_bottom (entry, 8);
-      gtk_container_add (GTK_CONTAINER (vbox), entry);
+      gtk_box_pack_start (GTK_BOX (vbox), entry);
 
       gtk_container_add (GTK_CONTAINER (window), overlay);
 

demos/gtk-demo/paint.c

@@ -3,24 +3,14 @@
  * Demonstrates practical handling of drawing tablets in a real world
  * usecase.
  */
-#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-enum {
-  COLOR_SET,
-  N_SIGNALS
-};
-
-static guint area_signals[N_SIGNALS] = { 0, };
-
 typedef struct
 {
   GtkWidget parent_instance;
   cairo_surface_t *surface;
   cairo_t *cr;
   GdkRGBA draw_color;
-  GtkPadController *pad_controller;
-  gdouble brush_size;
 } DrawingArea;
 
 typedef struct
@@ -28,30 +18,8 @@ typedef struct
   GtkWidgetClass parent_class;
 } DrawingAreaClass;
 
-static GtkPadActionEntry pad_actions[] = {
-  { GTK_PAD_ACTION_BUTTON, 1, -1, N_("Black"), "pad.black" },
-  { GTK_PAD_ACTION_BUTTON, 2, -1, N_("Pink"), "pad.pink" },
-  { GTK_PAD_ACTION_BUTTON, 3, -1, N_("Green"), "pad.green" },
-  { GTK_PAD_ACTION_BUTTON, 4, -1, N_("Red"), "pad.red" },
-  { GTK_PAD_ACTION_BUTTON, 5, -1, N_("Purple"), "pad.purple" },
-  { GTK_PAD_ACTION_BUTTON, 6, -1, N_("Orange"), "pad.orange" },
-  { GTK_PAD_ACTION_STRIP, -1, -1, N_("Brush size"), "pad.brush_size" },
-};
-
-static const gchar *pad_colors[] = {
-  "black",
-  "pink",
-  "green",
-  "red",
-  "purple",
-  "orange"
-};
-
 G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_WIDGET)
 
-static void drawing_area_set_color (DrawingArea *area,
-                                    GdkRGBA     *color);
-
 static void
 drawing_area_ensure_surface (DrawingArea *area,
                              gint         width,
@@ -84,16 +52,15 @@ drawing_area_ensure_surface (DrawingArea *area,
 }
 
 static void
-drawing_area_size_allocate (GtkWidget *widget,
-                            int        width,
-                            int        height,
-                            int        baseline)
+drawing_area_size_allocate (GtkWidget           *widget,
+                            const GtkAllocation *allocation,
+                            int                  baseline)
 {
   DrawingArea *area = (DrawingArea *) widget;
 
-  drawing_area_ensure_surface (area, width, height);
+  drawing_area_ensure_surface (area, allocation->width, allocation->height);
 
-  GTK_WIDGET_CLASS (drawing_area_parent_class)->size_allocate (widget, width, height, baseline);
+  GTK_WIDGET_CLASS (drawing_area_parent_class)->size_allocate (widget, allocation, baseline);
 }
 
 static void
@@ -148,82 +115,6 @@ drawing_area_snapshot (GtkWidget   *widget,
   cairo_destroy (cr);
 }
 
-static void
-on_pad_button_activate (GSimpleAction *action,
-                        GVariant      *parameter,
-                        DrawingArea   *area)
-{
-  const gchar *color = g_object_get_data (G_OBJECT (action), "color");
-  GdkRGBA rgba;
-
-  gdk_rgba_parse (&rgba, color);
-  drawing_area_set_color (area, &rgba);
-}
-
-static void
-on_pad_knob_change (GSimpleAction *action,
-                    GVariant      *parameter,
-                    DrawingArea   *area)
-{
-  gdouble value = g_variant_get_double (parameter);
-
-  area->brush_size = value;
-}
-
-static void
-drawing_area_hierarchy_changed (GtkWidget *widget,
-                                GtkWidget *previous_toplevel)
-{
-  DrawingArea *area = (DrawingArea *) widget;
-  GSimpleActionGroup *action_group;
-  GSimpleAction *action;
-  GtkWidget *toplevel;
-  gint i;
-
-  if (previous_toplevel && area->pad_controller)
-    {
-      gtk_widget_remove_controller (previous_toplevel,
-                                    GTK_EVENT_CONTROLLER (area->pad_controller));
-      area->pad_controller = NULL;
-    }
-
-  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (area));
-  if (!GTK_IS_WINDOW (toplevel))
-    return;
-
-  action_group = g_simple_action_group_new ();
-  area->pad_controller = gtk_pad_controller_new (G_ACTION_GROUP (action_group),
-                                                 NULL);
-
-  for (i = 0; i < G_N_ELEMENTS (pad_actions); i++)
-    {
-      if (pad_actions[i].type == GTK_PAD_ACTION_BUTTON)
-        {
-          action = g_simple_action_new (pad_actions[i].action_name, NULL);
-          g_object_set_data (G_OBJECT (action), "color",
-                             (gpointer) pad_colors[i]);
-          g_signal_connect (action, "activate",
-                            G_CALLBACK (on_pad_button_activate), area);
-        }
-      else
-        {
-          action = g_simple_action_new_stateful (pad_actions[i].action_name,
-                                                 G_VARIANT_TYPE_DOUBLE, NULL);
-          g_signal_connect (action, "activate",
-                            G_CALLBACK (on_pad_knob_change), area);
-        }
-
-      g_action_map_add_action (G_ACTION_MAP (action_group), G_ACTION (action));
-      g_object_unref (action);
-    }
-
-  gtk_pad_controller_set_action_entries (area->pad_controller, pad_actions,
-                                         G_N_ELEMENTS (pad_actions));
-
-  gtk_widget_add_controller (toplevel,
-                             GTK_EVENT_CONTROLLER (area->pad_controller));
-}
-
 static void
 drawing_area_class_init (DrawingAreaClass *klass)
 {
@@ -233,14 +124,6 @@ drawing_area_class_init (DrawingAreaClass *klass)
   widget_class->snapshot = drawing_area_snapshot;
   widget_class->map = drawing_area_map;
   widget_class->unmap = drawing_area_unmap;
-  widget_class->hierarchy_changed = drawing_area_hierarchy_changed;
-
-  area_signals[COLOR_SET] =
-    g_signal_new ("color-set",
-                  G_TYPE_FROM_CLASS (widget_class),
-                  G_SIGNAL_RUN_FIRST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, GDK_TYPE_RGBA);
 }
 
 static void
@@ -252,12 +135,12 @@ drawing_area_apply_stroke (DrawingArea   *area,
 {
   if (gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
     {
-      cairo_set_line_width (area->cr, 10 * pressure * area->brush_size);
+      cairo_set_line_width (area->cr, 10 * pressure);
       cairo_set_operator (area->cr, CAIRO_OPERATOR_DEST_OUT);
     }
   else
     {
-      cairo_set_line_width (area->cr, 4 * pressure * area->brush_size);
+      cairo_set_line_width (area->cr, 4 * pressure);
       cairo_set_operator (area->cr, CAIRO_OPERATOR_SATURATE);
     }
 
@@ -265,6 +148,8 @@ drawing_area_apply_stroke (DrawingArea   *area,
                          area->draw_color.green, area->draw_color.blue,
                          area->draw_color.alpha * pressure);
 
+  //cairo_set_source_rgba (area->cr, 0, 0, 0, pressure);
+
   cairo_line_to (area->cr, x, y);
   cairo_stroke (area->cr);
   cairo_move_to (area->cr, x, y);
@@ -340,15 +225,11 @@ drawing_area_new (void)
   return g_object_new (drawing_area_get_type (), NULL);
 }
 
-static void
+void
 drawing_area_set_color (DrawingArea *area,
                         GdkRGBA     *color)
 {
-  if (gdk_rgba_equal (&area->draw_color, color))
-    return;
-
   area->draw_color = *color;
-  g_signal_emit (area, area_signals[COLOR_SET], 0, &area->draw_color);
 }
 
 static void
@@ -361,14 +242,6 @@ color_button_color_set (GtkColorButton *button,
   drawing_area_set_color (draw_area, &color);
 }
 
-static void
-drawing_area_color_set (DrawingArea    *area,
-                        GdkRGBA        *color,
-                        GtkColorButton *button)
-{
-  gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (button), color);
-}
-
 GtkWidget *
 do_paint (GtkWidget *toplevel)
 {
@@ -390,8 +263,6 @@ do_paint (GtkWidget *toplevel)
       colorbutton = gtk_color_button_new ();
       g_signal_connect (colorbutton, "color-set",
                         G_CALLBACK (color_button_color_set), draw_area);
-      g_signal_connect (draw_area, "color-set",
-                        G_CALLBACK (drawing_area_color_set), colorbutton);
       gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (colorbutton),
                                   &(GdkRGBA) { 0, 0, 0, 1 });
 

demos/gtk-demo/panes.c

@@ -148,7 +148,7 @@ do_panes (GtkWidget *do_widget)
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       g_object_set (vpaned, "margin", 5, NULL);
-      gtk_container_add (GTK_CONTAINER (vbox), vpaned);
+      gtk_box_pack_start (GTK_BOX (vbox), vpaned);
 
       hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
@@ -173,13 +173,13 @@ do_panes (GtkWidget *do_widget)
 
       /* Now create toggle buttons to control sizing */
 
-      gtk_container_add (GTK_CONTAINER (vbox),
+      gtk_box_pack_start (GTK_BOX (vbox),
                           create_pane_options (GTK_PANED (hpaned),
                                                "Horizontal",
                                                "Left",
                                                "Right"));
 
-      gtk_container_add (GTK_CONTAINER (vbox),
+      gtk_box_pack_start (GTK_BOX (vbox),
                           create_pane_options (GTK_PANED (vpaned),
                                                "Vertical",
                                                "Top",

demos/gtk-demo/popover.c

@@ -55,11 +55,10 @@ create_complex_popover (GtkWidget       *parent,
 }
 
 static void
-entry_size_allocate_cb (GtkEntry *entry,
-                        int       width,
-                        int       height,
-                        int       baseline,
-                        gpointer  user_data)
+entry_size_allocate_cb (GtkEntry            *entry,
+                        const GtkAllocation *allocation,
+                        int                  baseline,
+                        gpointer             user_data)
 {
   GtkEntryIconPosition popover_pos;
   GtkPopover *popover = user_data;
@@ -78,6 +77,7 @@ entry_size_allocate_cb (GtkEntry *entry,
 static void
 entry_icon_press_cb (GtkEntry             *entry,
                      GtkEntryIconPosition  icon_pos,
+                     GdkEvent             *event,
                      gpointer              user_data)
 {
   GtkWidget *popover = user_data;
@@ -119,7 +119,7 @@ day_selected_cb (GtkCalendar *calendar,
 
   gtk_widget_show (popover);
 
-  g_object_unref (event);
+  gdk_event_free (event);
 }
 
 GtkWidget *

demos/gtk-demo/popover.ui

@@ -81,6 +81,9 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>

demos/gtk-demo/puzzlepiece.c

@@ -1,220 +0,0 @@
-/* Paintable/A simple paintable
- *
- * GdkPaintable is an interface used by GTK for drawings of any sort
- * that do not require layouting or positioning.
- *
- * This demo code gives a simple example on how a paintable can
- * be created.
- *
- * Paintables can be used in many places inside GTK widgets, but the
- * most common usage is inside GtkImage and that's what we're going
- * to do here.
- */
-
-#include <gtk/gtk.h>
-
-#include "puzzlepiece.h"
-
-/* Declare the struct. */
-struct _GtkPuzzlePiece
-{
-  GObject parent_instance;
-
-  GdkPaintable *puzzle;
-  guint x;
-  guint y;
-  guint width;
-  guint height;
-};
-
-struct _GtkPuzzlePieceClass
-{
-  GObjectClass parent_class;
-};
-
-/* This is the function that draws the puzzle piece.
- * It just draws a rectangular cutout of the puzzle by clipping
- * away the rest.
- */
-static void
-gtk_puzzle_piece_snapshot (GdkPaintable *paintable,
-                           GdkSnapshot  *snapshot,
-                           double        width,
-                           double        height)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  gtk_snapshot_push_clip (snapshot,
-                          &GRAPHENE_RECT_INIT (0, 0, width, height));
-
-  gtk_snapshot_offset (snapshot,
-                       - width * self->x,
-                       - height * self->y);
-  gdk_paintable_snapshot (self->puzzle,
-                          snapshot,
-                          width * self->width,
-                          height * self->height);
-
-  gtk_snapshot_pop (snapshot);
-}
-
-static GdkPaintableFlags
-gtk_puzzle_piece_get_flags (GdkPaintable *paintable)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  /* The flags are the same as the ones of the puzzle.
-   * If the puzzle changes in some way, so do the pieces.
-   */
-  return gdk_paintable_get_flags (self->puzzle);
-}
-
-static int
-gtk_puzzle_piece_get_intrinsic_width (GdkPaintable *paintable)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  /* We can compute our width relative to the puzzle.
-   * This logic even works for the case where the puzzle
-   * has no width, because the 0 return value is unchanged.
-   * Round up the value.
-   */
-  return (gdk_paintable_get_intrinsic_width (self->puzzle) + self->width - 1) / self->width;
-}
-
-static int
-gtk_puzzle_piece_get_intrinsic_height (GdkPaintable *paintable)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  /* Do the same thing we did for the width with the height.
-   */
-  return (gdk_paintable_get_intrinsic_height (self->puzzle) + self->height - 1) / self->height;
-}
-
-static double
-gtk_puzzle_piece_get_intrinsic_aspect_ratio (GdkPaintable *paintable)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (paintable);
-
-  /* We can compute our aspect ratio relative to the puzzle.
-   * This logic again works for the case where the puzzle
-   * has no aspect ratio, because the 0 return value is unchanged.
-   */
-  return gdk_paintable_get_intrinsic_aspect_ratio (self->puzzle) * self->height / self->width;
-}
-
-static void
-gtk_puzzle_piece_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_puzzle_piece_snapshot;
-  iface->get_flags = gtk_puzzle_piece_get_flags;
-  iface->get_intrinsic_width = gtk_puzzle_piece_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_puzzle_piece_get_intrinsic_height;
-  iface->get_intrinsic_aspect_ratio = gtk_puzzle_piece_get_intrinsic_aspect_ratio;
-}
-
-/* When defining the GType, we need to implement the GdkPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkPuzzlePiece, gtk_puzzle_piece, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_puzzle_piece_paintable_init))
-
-/* We need to declare a destructor to release our reference to the
- * puzzle paintable and disconnect our signal handlers.
- */
-static void
-gtk_puzzle_piece_dispose (GObject *object)
-{
-  GtkPuzzlePiece *self = GTK_PUZZLE_PIECE (object);
-
-  if (self->puzzle)
-    {
-      g_signal_handlers_disconnect_by_func (self->puzzle, gdk_paintable_invalidate_contents, self);
-      g_signal_handlers_disconnect_by_func (self->puzzle, gdk_paintable_invalidate_size, self);
-      g_clear_object (&self->puzzle);
-    }
-
-  G_OBJECT_CLASS (gtk_puzzle_piece_parent_class)->dispose (object);
-}
-
-/* Here's the boilerplate for the GObject declaration.
- */
-static void
-gtk_puzzle_piece_class_init (GtkPuzzlePieceClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->dispose = gtk_puzzle_piece_dispose;
-}
-
-static void
-gtk_puzzle_piece_init (GtkPuzzlePiece *self)
-{
-}
-
-/* And finally, we add a constructor.
- * It is declared in the header so that the other examples
- * can use it.
- */
-GdkPaintable *
-gtk_puzzle_piece_new (GdkPaintable *puzzle,
-                      guint         x,
-                      guint         y,
-                      guint         width,
-                      guint         height)
-{
-  GtkPuzzlePiece *self;
-
-  /* These are sanity checks, so that we get warnings if we accidentally
-   * do anything stupid. */
-  g_return_val_if_fail (GDK_IS_PAINTABLE (puzzle), NULL);
-  g_return_val_if_fail (width > 0, NULL);
-  g_return_val_if_fail (height > 0, NULL);
-  g_return_val_if_fail (x < width, NULL);
-  g_return_val_if_fail (y < height, NULL);
-
-  self = g_object_new (GTK_TYPE_PUZZLE_PIECE, NULL);
-
-  self->puzzle = g_object_ref (puzzle);
-  g_signal_connect_swapped (puzzle, "invalidate-contents", G_CALLBACK (gdk_paintable_invalidate_contents), self);
-  g_signal_connect_swapped (puzzle, "invalidate-size", G_CALLBACK (gdk_paintable_invalidate_size), self);
-  self->x = x;
-  self->y = y;
-  self->width = width;
-  self->height = height;
-
-  return GDK_PAINTABLE (self);
-}
-
-/* Here are the accessors that we need to inspect the puzzle
- * pieces in other code.
- */
-GdkPaintable *
-gtk_puzzle_piece_get_puzzle (GtkPuzzlePiece *self)
-{
-  /* Add sanity checks here, too.
-   * If you make a habit out of this, you can always rely
-   * on your code having sanity checks, which makes it
-   * way easier to debug.
-   */
-  g_return_val_if_fail (GTK_IS_PUZZLE_PIECE (self), NULL);
-
-  return self->puzzle;
-}
-
-guint
-gtk_puzzle_piece_get_x (GtkPuzzlePiece *self)
-{
-  g_return_val_if_fail (GTK_IS_PUZZLE_PIECE (self), 0);
-
-  return self->x;
-}
-
-guint
-gtk_puzzle_piece_get_y (GtkPuzzlePiece *self)
-{
-  g_return_val_if_fail (GTK_IS_PUZZLE_PIECE (self), 0);
-
-  return self->y;
-}
-

demos/gtk-demo/puzzlepiece.h

@@ -1,23 +0,0 @@
-#ifndef __PUZZLE_PIECE_H__
-#define __PUZZLE_PIECE_H__
-
-#include <gtk/gtk.h>
-
-/* First, add the boilerplate for the object itself.
- */
-#define GTK_TYPE_PUZZLE_PIECE (gtk_puzzle_piece_get_type ())
-G_DECLARE_FINAL_TYPE (GtkPuzzlePiece, gtk_puzzle_piece, GTK, PUZZLE_PIECE, GObject)
-
-/* Then, declare all constructors */
-GdkPaintable *  gtk_puzzle_piece_new            (GdkPaintable           *puzzle,
-                                                 guint                   x,
-                                                 guint                   y,
-                                                 guint                   width,
-                                                 guint                   height);
-
-/* Next, add the getters and setters for object properties */
-GdkPaintable *  gtk_puzzle_piece_get_puzzle     (GtkPuzzlePiece         *self);
-guint           gtk_puzzle_piece_get_x          (GtkPuzzlePiece         *self);
-guint           gtk_puzzle_piece_get_y          (GtkPuzzlePiece         *self);
-
-#endif /* __PUZZLE_PIECE_H__ */

demos/gtk-demo/rotated_text.c

@@ -12,7 +12,7 @@
 #include <string.h>
 
 #define HEART "♥"
-const char text[] = "I ♥ GTK";
+const char text[] = "I ♥ GTK+";
 
 static void
 fancy_shape_renderer (cairo_t        *cr,

demos/gtk-demo/search_entry.c

@@ -151,10 +151,11 @@ create_search_menu (GtkWidget *entry)
 static void
 icon_press_cb (GtkEntry       *entry,
                gint            position,
+               GdkEventButton *event,
                gpointer        data)
 {
   if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+    gtk_menu_popup_at_pointer (GTK_MENU (menu), (GdkEvent *) event);
 }
 
 static void
@@ -240,20 +241,20 @@ do_search_entry (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       /* Create our entry */
       entry = gtk_search_entry_new ();
-      gtk_container_add (GTK_CONTAINER (hbox), entry);
+      gtk_box_pack_start (GTK_BOX (hbox), entry);
 
       /* Create the find and cancel buttons */
       notebook = gtk_notebook_new ();
       gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
       gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-      gtk_container_add (GTK_CONTAINER (hbox), notebook);
+      gtk_box_pack_start (GTK_BOX (hbox), notebook);
 
       find_button = gtk_button_new_with_label ("Find");
       g_signal_connect (find_button, "clicked",

demos/gtk-demo/search_entry2.c

@@ -26,6 +26,17 @@ changed_cb (GtkEditable *editable)
   g_message ("changed: %s", text);
 }
 
+static gboolean
+window_key_press_event_cb (GtkWidget    *widget,
+			   GdkEvent     *event,
+			   GtkSearchBar *bar)
+{
+  if (gdk_event_get_event_type (event) == GDK_KEY_PRESS)
+    return gtk_search_bar_handle_event (bar, event);
+
+  return GDK_EVENT_PROPAGATE;
+}
+
 static void
 search_changed (GtkSearchEntry *entry,
                 GtkLabel       *label)
@@ -83,38 +94,38 @@ do_search_entry2 (GtkWidget *do_widget)
       entry = gtk_search_entry_new ();
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
-      gtk_container_add (GTK_CONTAINER (container), entry);
+      gtk_box_pack_start (GTK_BOX (container), entry);
       searchbar = gtk_search_bar_new ();
       gtk_search_bar_connect_entry (GTK_SEARCH_BAR (searchbar), GTK_ENTRY (entry));
       gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (searchbar), FALSE);
       gtk_container_add (GTK_CONTAINER (searchbar), container);
-      gtk_container_add (GTK_CONTAINER (vbox), searchbar);
+      gtk_box_pack_start (GTK_BOX (vbox), searchbar);
 
       /* Hook the search bar to key presses */
-      gtk_search_bar_set_key_capture_widget (GTK_SEARCH_BAR (searchbar), window);
+      g_signal_connect (window, "event", G_CALLBACK (window_key_press_event_cb), searchbar);
 
       /* Help */
       label = gtk_label_new ("Start Typing to search");
-      gtk_container_add (GTK_CONTAINER (vbox), label);
+      gtk_box_pack_start (GTK_BOX (vbox), label);
 
       /* Toggle button */
       button = gtk_toggle_button_new_with_label ("Search");
       g_object_bind_property (button, "active",
                               searchbar, "search-mode-enabled",
                               G_BINDING_BIDIRECTIONAL);
-      gtk_container_add (GTK_CONTAINER (vbox), button);
+      gtk_box_pack_start (GTK_BOX (vbox), button);
 
       /* Result */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       label = gtk_label_new ("Result:");
       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
       gtk_widget_set_margin_start (label, 6);
-      gtk_container_add (GTK_CONTAINER (hbox), label);
+      gtk_box_pack_start (GTK_BOX (hbox), label);
 
       label = gtk_label_new ("");
-      gtk_container_add (GTK_CONTAINER (hbox), label);
+      gtk_box_pack_start (GTK_BOX (hbox), label);
 
       g_signal_connect (entry, "search-changed",
                         G_CALLBACK (search_changed_cb), label);
@@ -122,15 +133,15 @@ do_search_entry2 (GtkWidget *do_widget)
                         G_CALLBACK (changed_cb), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_container_add (GTK_CONTAINER (vbox), hbox);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox);
 
       label = gtk_label_new ("Signal:");
       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
       gtk_widget_set_margin_start (label, 6);
-      gtk_container_add (GTK_CONTAINER (hbox), label);
+      gtk_box_pack_start (GTK_BOX (hbox), label);
 
       label = gtk_label_new ("");
-      gtk_container_add (GTK_CONTAINER (hbox), label);
+      gtk_box_pack_start (GTK_BOX (hbox), label);
 
       g_signal_connect (entry, "search-changed",
                         G_CALLBACK (search_changed), label);

demos/gtk-demo/sidebar.c

@@ -19,7 +19,7 @@ do_sidebar (GtkWidget *do_widget)
   GtkWidget *widget;
   GtkWidget *header;
   const gchar* pages[] = {
-    "Welcome to GTK",
+    "Welcome to GTK+",
     "GtkStackSidebar Widget",
     "Automatic navigation",
     "Consistent appearance",
@@ -49,7 +49,7 @@ do_sidebar (GtkWidget *do_widget)
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       sidebar = gtk_stack_sidebar_new ();
-      gtk_container_add (GTK_CONTAINER (box), sidebar);
+      gtk_box_pack_start (GTK_BOX (box), sidebar);
 
       stack = gtk_stack_new ();
       gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
@@ -57,9 +57,9 @@ do_sidebar (GtkWidget *do_widget)
 
       /* Separator between sidebar and stack */
       widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_add (GTK_CONTAINER(box), widget);
+      gtk_box_pack_start (GTK_BOX(box), widget);
 
-      gtk_container_add (GTK_CONTAINER (box), stack);
+      gtk_box_pack_start (GTK_BOX (box), stack);
 
       for (i=0; (c = *(pages+i)) != NULL; i++ )
         {

demos/gtk-demo/sizegroup.c

@@ -116,7 +116,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* Create one frame holding color options */
       frame = gtk_frame_new ("Color Options");
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       table = gtk_grid_new ();
       g_object_set (table, "margin", 5, NULL);
@@ -129,7 +129,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* And another frame holding line style options */
       frame = gtk_frame_new ("Line Options");
-      gtk_container_add (GTK_CONTAINER (vbox), frame);
+      gtk_box_pack_start (GTK_BOX (vbox), frame);
 
       table = gtk_grid_new ();
       g_object_set (table, "margin", 5, NULL);
@@ -142,7 +142,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* And a check button to turn grouping on and off */
       check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
-      gtk_container_add (GTK_CONTAINER (vbox), check_button);
+      gtk_box_pack_start (GTK_BOX (vbox), check_button);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
       g_signal_connect (check_button, "toggled",

demos/gtk-demo/sliding_puzzle.c

@@ -1,486 +0,0 @@
-/* Sliding puzzle
- *
- * This demo demonstrates how to use gestures and paintables to create a
- * small sliding puzzle game.
- *
- */
-
-#include <gtk/gtk.h>
-
-/* Include the header for the puzzle piece */
-#include "puzzlepiece.h"
-#include "paintable.h"
-
-static GtkWidget *window = NULL;
-static GtkWidget *frame = NULL;
-static GtkWidget *choices = NULL;
-static GtkWidget *size_spin = NULL;
-static GdkPaintable *puzzle = NULL;
-
-static gboolean solved = TRUE;
-static guint width = 3;
-static guint height = 3;
-static guint pos_x;
-static guint pos_y;
-
-static gboolean
-move_puzzle (GtkWidget *grid,
-             int        dx,
-             int        dy)
-{
-  GtkWidget *pos, *next;
-  GdkPaintable *piece;
-  guint next_x, next_y;
-
-  /* We don't move anything if the puzzle is solved */
-  if (solved)
-    return FALSE;
-
-  /* Return FALSE if we can't move to where the call 
-   * wants us to move.
-   */
-  if ((dx < 0 && pos_x < -dx) ||
-      dx + pos_x >= width ||
-      (dy < 0 && pos_y < -dy) ||
-      dy + pos_y >= height)
-    return FALSE;
-
-  /* Compute the new position */
-  next_x = pos_x + dx;
-  next_y = pos_y + dy;
-
-  /* Get the current and next image */
-  pos = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y);
-  next = gtk_grid_get_child_at (GTK_GRID (grid), next_x, next_y);
-
-  /* Move the displayed piece. */
-  piece = gtk_picture_get_paintable (GTK_PICTURE (next));
-  gtk_picture_set_paintable (GTK_PICTURE (pos), piece);
-  gtk_picture_set_paintable (GTK_PICTURE (next), NULL);
-
-  /* Update the current position */
-  pos_x = next_x;
-  pos_y = next_y;
-
-  /* Return TRUE because we successfully moved the piece */
-  return TRUE;
-}
-
-static void
-shuffle_puzzle (GtkWidget *grid)
-{
-  guint i, n_steps;
-
-  /* Do this many random moves */
-  n_steps = width * height * 50;
-
-  for (i = 0; i < n_steps; i++)
-    {
-      /* Get a random number for the direction to move in */
-      switch (g_random_int_range (0, 4))
-        {
-        case 0:
-          /* left */
-          move_puzzle (grid, -1, 0);
-          break;
-
-        case 1:
-          /* up */
-          move_puzzle (grid, 0, -1);
-          break;
-
-        case 2:
-          /* right */
-          move_puzzle (grid, 1, 0);
-          break;
-
-        case 3:
-          /* down */
-          move_puzzle (grid, 0, 1);
-          break;
-
-        default:
-          g_assert_not_reached ();
-          continue;
-        }
-    }
-}
-
-static gboolean
-check_solved (GtkWidget *grid)
-{
-  GtkWidget *picture;
-  GdkPaintable *piece;
-  guint x, y;
-
-  /* Nothing to check if the puzzle is already solved */
-  if (solved)
-    return TRUE;
-
-  /* If the empty cell isn't in the bottom right,
-   * the puzzle is obviously not solved */
-  if (pos_x != width - 1 ||
-      pos_y != height - 1)
-    return FALSE;
-
-  /* Check that all pieces are in the right position */
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          picture = gtk_grid_get_child_at (GTK_GRID (grid), x, y);
-          piece = gtk_picture_get_paintable (GTK_PICTURE (picture));
-
-          /* empty cell */
-          if (piece == NULL)
-            continue;
-
-          if (gtk_puzzle_piece_get_x (GTK_PUZZLE_PIECE (piece)) != x ||
-              gtk_puzzle_piece_get_y (GTK_PUZZLE_PIECE (piece)) != y)
-            return FALSE;
-        }
-    }
-
-  /* We solved the puzzle!
-   */
-  solved = TRUE;
-
-  /* Fill the empty cell to show that we're done.
-   */
-  picture = gtk_grid_get_child_at (GTK_GRID (grid), 0, 0);
-  piece = gtk_picture_get_paintable (GTK_PICTURE (picture));
-
-  piece = gtk_puzzle_piece_new (gtk_puzzle_piece_get_puzzle (GTK_PUZZLE_PIECE (piece)),
-                                pos_x, pos_y,
-                                width, height);
-  picture = gtk_grid_get_child_at (GTK_GRID (grid), pos_x, pos_y);
-  gtk_picture_set_paintable (GTK_PICTURE (picture), piece);
-
-  return TRUE;
-}
-
-static gboolean
-puzzle_key_pressed (GtkEventControllerKey *controller,
-                    guint                  keyval,
-                    guint                  keycode,
-                    GdkModifierType        state,
-                    GtkWidget             *grid)
-{
-  int dx, dy;
-
-  dx = 0;
-  dy = 0;
-
-  switch (keyval)
-    {
-    case GDK_KEY_KP_Left:
-    case GDK_KEY_Left:
-      /* left */
-      dx = -1;
-      break;
-
-    case GDK_KEY_KP_Up:
-    case GDK_KEY_Up:
-      /* up */
-      dy = -1;
-      break;
-
-    case GDK_KEY_KP_Right:
-    case GDK_KEY_Right:
-      /* right */
-      dx = 1;
-      break;
-
-    case GDK_KEY_KP_Down:
-    case GDK_KEY_Down:
-      /* down */
-      dy = 1;
-      break;
-
-    default:
-      /* We return FALSE here because we didn't handle the key that was pressed */
-      return FALSE;
-    }
-
-  if (!move_puzzle (grid, dx, dy))
-    {
-      /* Make the error sound and then return TRUE.
-       * We handled this key, even though we didn't
-       * do anything to the puzzle.
-       */
-      gtk_widget_error_bell (grid);
-      return TRUE;
-    }
-
-  check_solved (grid);
-
-  return TRUE;
-}
-
-static void
-puzzle_button_pressed (GtkGestureMultiPress *gesture,
-                       int                   n_press,
-                       double                x,
-                       double                y,
-                       GtkWidget            *grid)
-{
-  GtkWidget *child;
-  int l, t, i;
-  int pos;
-
-  child = gtk_widget_pick (grid, x, y);
-
-  if (!child)
-    {
-      gtk_widget_error_bell (grid);
-      return;
-    }
-
-  gtk_container_child_get (GTK_CONTAINER (grid), child,
-                           "left-attach", &l,
-                           "top-attach", &t,
-                           NULL);
-
-  if (l == pos_x && t == pos_y)
-    {
-      gtk_widget_error_bell (grid);
-    }
-  else if (l == pos_x)
-    {
-      pos = pos_y;
-      for (i = t; i < pos; i++)
-        {
-          if (!move_puzzle (grid, 0, -1))
-            gtk_widget_error_bell (grid);
-        }
-      for (i = pos; i < t; i++)
-        {
-          if (!move_puzzle (grid, 0, 1))
-            gtk_widget_error_bell (grid);
-        }
-    }
-  else if (t == pos_y)
-    {
-      pos = pos_x;
-      for (i = l; i < pos; i++)
-        {
-          if (!move_puzzle (grid, -1, 0))
-            gtk_widget_error_bell (grid);
-        }
-      for (i = pos; i < l; i++)
-        {
-          if (!move_puzzle (grid, 1, 0))
-            gtk_widget_error_bell (grid);
-        }
-    }
-  else
-    {
-      gtk_widget_error_bell (grid);
-    }
-}
-
-static void
-start_puzzle (GdkPaintable *puzzle)
-{
-  GtkWidget *picture, *grid;
-  GtkEventController *controller;
-  guint x, y;
-
-  /* Remove the old grid (if there is one) */
-  grid = gtk_bin_get_child (GTK_BIN (frame));
-  if (grid)
-    gtk_container_remove (GTK_CONTAINER (frame), grid);
-
-  /* Create a new grid */
-  grid = gtk_grid_new ();
-  gtk_widget_set_can_focus (grid, TRUE);
-  gtk_container_add (GTK_CONTAINER (frame), grid);
-  gtk_aspect_frame_set (GTK_ASPECT_FRAME (frame), 0.5, 0.5, (float) gdk_paintable_get_intrinsic_aspect_ratio (puzzle), FALSE);
-
-  /* Add a key event controller so people can use the arrow
-   * keys to move the puzzle */
-  controller = gtk_event_controller_key_new ();
-  g_signal_connect (controller, "key-pressed",
-                    G_CALLBACK (puzzle_key_pressed),
-                    grid);
-  gtk_widget_add_controller (GTK_WIDGET (grid), controller);
-
-  controller = GTK_EVENT_CONTROLLER (gtk_gesture_multi_press_new ());
-  g_signal_connect (controller, "pressed",
-                    G_CALLBACK (puzzle_button_pressed),
-                    grid);
-  gtk_widget_add_controller (GTK_WIDGET (grid), controller);
-
-  /* Make sure the cells have equal size */
-  gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
-  gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
-
-  /* Reset the variables */
-  solved = FALSE;
-  pos_x = width - 1;
-  pos_y = height - 1;
-
-  /* add a picture for every cell */
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          GdkPaintable *piece;
-
-          /* Don't paint anything for the lsiding part of the video */
-          if (x == pos_x && y == pos_y)
-            piece = NULL;
-          else
-            piece = gtk_puzzle_piece_new (puzzle,
-                                          x, y,
-                                          width, height);
-          picture = gtk_picture_new_for_paintable (piece);
-          gtk_picture_set_keep_aspect_ratio (GTK_PICTURE (picture), FALSE);
-          gtk_grid_attach (GTK_GRID (grid),
-                           picture,
-                           x, y,
-                           1, 1);
-        }
-    }
-
-  shuffle_puzzle (grid);
-}
-
-static void
-reshuffle (void)
-{
-  GtkWidget *grid;
-
-  grid = gtk_bin_get_child (GTK_BIN (frame));
-  if (solved)
-    start_puzzle (puzzle);
-  else
-    shuffle_puzzle (grid);
-  gtk_widget_grab_focus (grid);
-}
-
-static void
-reconfigure (void)
-{
-  GtkWidget *popover;
-  GtkWidget *grid;
-  GtkWidget *child;
-  GtkWidget *image;
-  GList *selected;
-
-  width = height = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (size_spin));
-
-  selected = gtk_flow_box_get_selected_children (GTK_FLOW_BOX (choices));
-  if (selected == NULL)
-    child = gtk_widget_get_first_child (choices);
-  else
-    {
-      child = selected->data;
-      g_list_free (selected);
-    }
-  image = gtk_bin_get_child (GTK_BIN (child));
-  puzzle = gtk_image_get_paintable (GTK_IMAGE (image));
-
-  start_puzzle (puzzle); 
-  popover = gtk_widget_get_ancestor (size_spin, GTK_TYPE_POPOVER);
-  gtk_popover_popdown (GTK_POPOVER (popover));
-  grid = gtk_bin_get_child (GTK_BIN (frame));
-  gtk_widget_grab_focus (grid);
-}
-
-static void
-add_choice (GtkWidget    *choices,
-            GdkPaintable *paintable)
-{
-  GtkWidget *icon;
-
-  icon = gtk_image_new_from_paintable (paintable);
-  gtk_image_set_icon_size (GTK_IMAGE (icon), GTK_ICON_SIZE_LARGE);
-
-  gtk_container_add (GTK_CONTAINER (choices), icon);
-}
-
-GtkWidget *
-do_sliding_puzzle (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *header;
-      GtkWidget *restart;
-      GtkWidget *tweak;
-      GtkWidget *popover;
-      GtkWidget *tweaks;
-      GtkWidget *apply;
-      GtkWidget *label;
-      GtkWidget *sw;
-      GtkMediaStream *media;
-
-      puzzle = GDK_PAINTABLE (gdk_texture_new_from_resource ("/sliding_puzzle/portland-rose.jpg"));
-
-      tweaks = gtk_grid_new ();
-      gtk_grid_set_row_spacing (GTK_GRID (tweaks), 10);
-      gtk_grid_set_column_spacing (GTK_GRID (tweaks), 10);
-      g_object_set (tweaks, "margin", 10, NULL);
-
-      choices = gtk_flow_box_new ();
-      gtk_style_context_add_class (gtk_widget_get_style_context (choices), GTK_STYLE_CLASS_VIEW);
-      add_choice (choices, puzzle);
-      add_choice (choices, gtk_nuclear_animation_new ());
-      media = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-      gtk_media_stream_set_loop (media, TRUE);
-      gtk_media_stream_set_muted (media, TRUE);
-      gtk_media_stream_play (media);
-      add_choice (choices, GDK_PAINTABLE (media));
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_container_add (GTK_CONTAINER (sw), choices);
-      gtk_grid_attach (GTK_GRID (tweaks), sw, 0, 0, 2, 1);
-
-      label = gtk_label_new ("Size");
-      gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-      gtk_grid_attach (GTK_GRID (tweaks), label, 0, 1, 1, 1);
-      size_spin = gtk_spin_button_new_with_range (2, 10, 1);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (size_spin), width);
-      gtk_grid_attach (GTK_GRID (tweaks), size_spin, 1, 1, 1, 1);
-
-      apply = gtk_button_new_with_label ("Apply");
-      gtk_widget_set_halign (apply, GTK_ALIGN_END);
-      gtk_grid_attach (GTK_GRID (tweaks), apply, 1, 2, 1, 1);
-      g_signal_connect (apply, "clicked", G_CALLBACK (reconfigure), NULL);
-
-      popover = gtk_popover_new (NULL);
-      gtk_popover_set_modal (GTK_POPOVER (popover), TRUE);
-      gtk_container_add (GTK_CONTAINER (popover), tweaks);
-
-      tweak = gtk_menu_button_new ();
-      gtk_menu_button_set_popover (GTK_MENU_BUTTON (tweak), popover);
-      gtk_button_set_icon_name (GTK_BUTTON (tweak), "emblem-system-symbolic");
-
-      restart = gtk_button_new_from_icon_name ("view-refresh-symbolic");
-      g_signal_connect (restart, "clicked", G_CALLBACK (reshuffle), NULL);
-
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), tweak);
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Sliding Puzzle");
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-
-      frame = gtk_aspect_frame_new (NULL, 0.5, 0.5, (float) gdk_paintable_get_intrinsic_aspect_ratio (puzzle), FALSE);
-      gtk_container_add (GTK_CONTAINER (window), frame);
-
-      start_puzzle (puzzle);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}

demos/gtk-demo/spinner.c

@@ -53,7 +53,7 @@ do_spinner (GtkWidget *do_widget)
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     g_object_set (vbox, "margin", 5, NULL);
-    gtk_container_add (GTK_CONTAINER (content_area), vbox);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox);
 
     /* Sensitive */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);

demos/gtk-demo/textscroll.c

@@ -157,7 +157,7 @@ create_text_view (GtkWidget *hbox,
   guint timeout;
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (hbox), swindow);
+  gtk_box_pack_start (GTK_BOX (hbox), swindow);
   textview = gtk_text_view_new ();
   gtk_container_add (GTK_CONTAINER (swindow), textview);
 

demos/gtk-demo/textview.c

@@ -280,7 +280,7 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_insert (buffer, &iter,
       "This line (and most of the others in this buffer) is word-wrapped, "
       "using the proper Unicode algorithm. Word wrap should work in all "
-      "scripts and languages that GTK supports. Let's make this a long "
+      "scripts and languages that GTK+ supports. Let's make this a long "
       "paragraph to demonstrate: blah blah blah blah blah blah blah blah "
       "blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);
 

demos/gtk-demo/theme.css

@@ -0,0 +1,10 @@
+window.devel headerbar {
+    background: #cbd2d9 -gtk-icontheme("system-run-symbolic") 70% 0/64px 64px no-repeat, linear-gradient(to left, #a5b1bd 0%, #a5b1bd 8%, @theme_bg_color 25%);
+    box-shadow: inset 0 1px #f1f3f5;
+    border-color: #909fae;
+    color: rgba(46, 52, 54, 0.2);
+}
+
+window.devel headerbar label {
+    color: @theme_fg_color;
+}

demos/gtk-demo/theming.ui

@@ -131,6 +131,9 @@
             <property name="can-focus">1</property>
             <property name="receives-default">1</property>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child>
           <object class="GtkButton">
@@ -138,6 +141,9 @@
             <property name="can-focus">1</property>
             <property name="receives-default">1</property>
           </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
         </child>
       </object>
     </child>

demos/gtk-demo/theming_style_classes.c

@@ -1,10 +1,10 @@
 /* Theming/Style Classes
  *
- * GTK uses CSS for theming. Style classes can be associated
+ * GTK+ uses CSS for theming. Style classes can be associated
  * with widgets to inform the theme about intended rendering.
  *
  * This demo shows some common examples where theming features
- * of GTK are used for certain effects: primary toolbars,
+ * of GTK+ are used for certain effects: primary toolbars,
  * inline toolbars and linked buttons.
  */
 

demos/gtk-demo/transparent.c

@@ -12,10 +12,12 @@ do_transparent (GtkWidget *do_widget)
 
   if (!window)
     {
+      GtkWidget *sw;
       GtkWidget *overlay;
       GtkWidget *button;
       GtkWidget *label;
-      GtkWidget *picture;
+      GtkWidget *box;
+      GtkWidget *image;
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_display (GTK_WINDOW (window),
@@ -52,8 +54,17 @@ do_transparent (GtkWidget *do_widget)
       gtk_overlay_add_overlay (GTK_OVERLAY (overlay), button);
       gtk_container_child_set (GTK_CONTAINER (overlay), button, "blur", 5.0, NULL);
 
-      picture = gtk_picture_new_for_resource ("/transparent/portland-rose.jpg");
-      gtk_container_add (GTK_CONTAINER (overlay), picture);
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      sw = gtk_scrolled_window_new (NULL, NULL);
+      gtk_container_add (GTK_CONTAINER (overlay), sw);
+      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+      gtk_container_add (GTK_CONTAINER (sw), box);
+      image = gtk_image_new_from_resource ("/transparent/portland-rose.jpg");
+
+      gtk_container_add (GTK_CONTAINER (box), image);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/tree_store.c

@@ -401,7 +401,7 @@ do_tree_store (GtkWidget *do_widget)
       g_object_set (vbox, "margin", 8, NULL);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
-      gtk_container_add (GTK_CONTAINER (vbox),
+      gtk_box_pack_start (GTK_BOX (vbox),
                           gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));
 
       sw = gtk_scrolled_window_new (NULL, NULL);
@@ -410,7 +410,7 @@ do_tree_store (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 model */
       model = create_model ();

demos/icon-browser/icon.list

@@ -513,5 +513,3 @@ trophy-gold=
 night-light=
 daytime-sunrise=
 daytime-sunset=
-on=
-off=

demos/icon-browser/iconbrowserwin.c

@@ -376,9 +376,10 @@ search_mode_toggled (GObject *searchbar, GParamSpec *pspec, IconBrowserWindow *w
 
 static void
 get_image_data (GtkWidget        *widget,
-                GdkDrag          *drag,
+                GdkDragContext   *context,
                 GtkSelectionData *selection,
                 guint             target_info,
+                guint             time,
                 gpointer          data)
 {
   GtkWidget *image;
@@ -398,9 +399,10 @@ get_image_data (GtkWidget        *widget,
 
 static void
 get_scalable_image_data (GtkWidget        *widget,
-                         GdkDrag          *drag,
+                         GdkDragContext   *context,
                          GtkSelectionData *selection,
                          guint             target_info,
+                         guint             time,
                          gpointer          data)
 {
   gchar *uris[2];

demos/icon-browser/meson.build

@@ -17,4 +17,4 @@ executable('gtk4-icon-browser',
            link_args: extra_demo_ldflags,
            install: true)
 
-install_data('org.gtk.IconBrowser.desktop', install_dir: gtk_applicationsdir)
+install_data('gtk4-icon-browser.desktop', install_dir: gtk_applicationsdir)

demos/icon-browser/window.ui

@@ -6,7 +6,6 @@
     <property name="child-model">store</property>
   </object>
   <template class="IconBrowserWindow" parent="GtkApplicationWindow">
-    <style><class name="devel"/></style>
     <property name="title" translatable="yes">Icon Browser</property>
     <property name="default-width">1024</property>
     <property name="default-height">768</property>
@@ -121,7 +120,7 @@
     <property name="use-header-bar">1</property>
     <property name="resizable">0</property>
     <property name="hide-on-close">1</property>
-    <child internal-child="content_area">
+    <child internal-child="vbox">
       <object class="GtkBox">
         <child>
           <object class="GtkGrid">

demos/widget-factory/gtk4-widget-factory.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Widget Factory
-Comment=A showcase for GTK widgets, designed for testing themes.
+Comment=A showcase for GTK+ widgets, designed for testing themes.
 Exec=gtk4-widget-factory
 Icon=gtk4-widget-factory
 Terminal=false

demos/widget-factory/menus.ui

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

demos/widget-factory/meson.build

@@ -13,7 +13,7 @@ executable('gtk4-widget-factory',
            install: true)
 
 # desktop file
-install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir)
+install_data('gtk4-widget-factory.desktop', install_dir: gtk_applicationsdir)
 
 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

demos/widget-factory/org.gtk.WidgetFactory.appdata.xml

@@ -3,11 +3,11 @@
   <id>org.gtk.WidgetFactory.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LGPL-2.0+</project_license>
-  <name>GTK Widget Factory</name>
-  <summary>Program to demonstrate GTK functions</summary>
+  <name>GTK+ Widget Factory</name>
+  <summary>Program to demonstrate GTK+ functions</summary>
   <description>
     <p>
-      GTK Widget Factory is a showcase of GTK widgets. It was
+      GTK+ Widget Factory is a showcase of GTK+ widgets. It was
       originally created to help theme authors test their creations
       for completeness.
     </p>

demos/widget-factory/widget-factory.c

@@ -212,28 +212,28 @@ activate_about (GSimpleAction *action,
                           glib_major_version,
                           glib_minor_version,
                           glib_micro_version);
-  g_string_append_printf (s, "\tGTK\t%d.%d.%d\n",
+  g_string_append_printf (s, "\tGTK+\t%d.%d.%d\n",
                           gtk_get_major_version (),
                           gtk_get_minor_version (),
                           gtk_get_micro_version ());
   g_string_append_printf (s, "\nA link can apppear here: <http://www.gtk.org>");
 
-  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
+  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 ());
 
   gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK Widget Factory",
+                         "program-name", "GTK+ Widget Factory",
                          "version", 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 themes and widgets",
+                         "comments", "Program to demonstrate GTK+ themes and widgets",
                          "authors", authors,
                          "logo-icon-name", "gtk4-widget-factory",
-                         "title", "About GTK Widget Factory",
+                         "title", "About GTK+ Widget Factory",
                          "system-information", s->str,
                          NULL);
 
@@ -353,6 +353,7 @@ update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget)
 static void
 on_entry_icon_release (GtkEntry            *entry,
                        GtkEntryIconPosition icon_pos,
+                       GdkEvent            *event,
                        gpointer             user_data)
 {
   if (icon_pos != GTK_ENTRY_ICON_SECONDARY)
@@ -803,7 +804,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                 "margin", 6,
                 "xalign", 0.0,
                 NULL);
-  gtk_container_add (GTK_CONTAINER (row), label);
+  gtk_box_pack_start (GTK_BOX (row), label);
   gdk_rgba_parse (&rgba, color);
   swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                          "rgba", &rgba,
@@ -815,7 +816,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                          NULL);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (box), swatch);
-  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_box_pack_start (GTK_BOX (row), box);
   gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
   row = gtk_widget_get_parent (row);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -914,7 +915,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                     "hexpand", TRUE,
                     "xalign", 0.0,
                     NULL);
-      gtk_container_add (GTK_CONTAINER (row), label);
+      gtk_box_pack_start (GTK_BOX (row), label);
       gdk_rgba_parse (&rgba, colors[i].color);
       swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                              "rgba", &rgba,
@@ -926,7 +927,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                              NULL);
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (box), swatch);
-      gtk_container_add (GTK_CONTAINER (row), box);
+      gtk_box_pack_start (GTK_BOX (row), box);
       gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
       row = gtk_widget_get_parent (row);
       gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -966,8 +967,8 @@ background_loaded_cb (GObject      *source,
       return;
     }
 
-  child = gtk_picture_new_for_pixbuf (pixbuf);
-  gtk_widget_set_size_request (child, 110, 70);
+  child = gtk_image_new_from_pixbuf (pixbuf);
+  gtk_widget_show (child);
   gtk_flow_box_insert (GTK_FLOW_BOX (bd->flowbox), child, -1);
   child = gtk_widget_get_parent (child);
   g_object_set_data_full (G_OBJECT (child), "filename", bd->filename, g_free);
@@ -995,7 +996,8 @@ populate_flowbox (GtkWidget *flowbox)
 
   pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 110, 70);
   gdk_pixbuf_fill (pixbuf, 0xffffffff);
-  child = gtk_picture_new_for_pixbuf (pixbuf);
+  child = gtk_image_new_from_pixbuf (pixbuf);
+  gtk_widget_show (child);
   gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), child, -1);
 
   location = "/usr/share/backgrounds/gnome";
@@ -1080,7 +1082,7 @@ set_accel (GtkApplication *app, GtkWidget *widget)
 typedef struct
 {
   GtkTextView tv;
-  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
 } MyTextView;
 
 typedef GtkTextViewClass MyTextViewClass;
@@ -1093,23 +1095,18 @@ my_text_view_init (MyTextView *tv)
 }
 
 static void
-my_tv_snapshot_layer (GtkTextView      *widget,
-                      GtkTextViewLayer  layer,
-                      GtkSnapshot      *snapshot)
+my_tv_draw_layer (GtkTextView      *widget,
+                  GtkTextViewLayer  layer,
+                  cairo_t          *cr)
 {
   MyTextView *tv = (MyTextView *)widget;
 
-  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT && tv->texture)
+  if (layer == GTK_TEXT_VIEW_LAYER_BELOW_TEXT && tv->pixbuf)
     {
-      gtk_snapshot_push_opacity (snapshot, 0.333);
-      gtk_snapshot_append_texture (snapshot,
-                                   tv->texture,
-                                   &GRAPHENE_RECT_INIT(
-                                     0, 0,
-                                     gdk_texture_get_width (tv->texture),
-                                     gdk_texture_get_height (tv->texture)
-                                   ));
-      gtk_snapshot_pop (snapshot);
+      cairo_save (cr);
+      gdk_cairo_set_source_pixbuf (cr, tv->pixbuf, 0.0, 0.0);
+      cairo_paint_with_alpha (cr, 0.333);
+      cairo_restore (cr);
     }
 }
 
@@ -1118,7 +1115,7 @@ my_tv_finalize (GObject *object)
 {
   MyTextView *tv = (MyTextView *)object;
 
-  g_clear_object (&tv->texture);
+  g_clear_object (&tv->pixbuf);
 
   G_OBJECT_CLASS (my_text_view_parent_class)->finalize (object);
 }
@@ -1130,24 +1127,20 @@ my_text_view_class_init (MyTextViewClass *class)
   GObjectClass *o_class = G_OBJECT_CLASS (class);
 
   o_class->finalize = my_tv_finalize;
-  tv_class->snapshot_layer = my_tv_snapshot_layer;
+  tv_class->draw_layer = my_tv_draw_layer;
 }
 
 static void
 my_text_view_set_background (MyTextView *tv, const gchar *filename)
 {
   GError *error = NULL;
-  GFile *file;
 
-  g_clear_object (&tv->texture);
+  g_clear_object (&tv->pixbuf);
 
   if (filename == NULL)
     return;
 
-  file = g_file_new_for_path (filename);
-  tv->texture = gdk_texture_new_from_file (file, &error);
-  g_object_unref (file);
-
+  tv->pixbuf = gdk_pixbuf_new_from_file (filename, &error);
   if (error)
     {
       g_warning ("%s", error->message);
@@ -1612,6 +1605,27 @@ adjustment3_value_changed (GtkAdjustment *adj, GtkProgressBar *pbar)
   gtk_progress_bar_set_fraction (pbar, fraction);
 }
 
+static void
+settings__notify_gtk_theme_name (GObject *gobject,
+                                 GParamSpec *pspec,
+                                 gpointer data)
+{
+  GtkWidget *window = data;
+  char *theme_name = NULL;
+
+  g_object_get (gobject, "gtk-theme-name", &theme_name, NULL);
+
+  if (g_strcmp0 (theme_name, "Adwaita") == 0)
+    {
+      if (gtk_get_minor_version () % 2 != 0)
+        gtk_style_context_add_class (gtk_widget_get_style_context (window), "devel");
+    }
+  else
+    gtk_style_context_remove_class (gtk_widget_get_style_context (window), "devel");
+
+  g_free (theme_name);
+}
+
 static void
 activate (GApplication *app)
 {
@@ -1687,6 +1701,13 @@ activate (GApplication *app)
                                    win_entries, G_N_ELEMENTS (win_entries),
                                    window);
 
+  g_signal_connect (gtk_settings_get_default (), "notify::gtk-theme-name",
+                    G_CALLBACK (settings__notify_gtk_theme_name),
+                    window);
+  settings__notify_gtk_theme_name (G_OBJECT (gtk_settings_get_default ()),
+                                   NULL,
+                                   window);
+
   for (i = 0; i < G_N_ELEMENTS (accels); i++)
     gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
 

demos/widget-factory/widget-factory.css

@@ -24,3 +24,14 @@
 .border-ridge {
   border-width: 2px;
 }
+
+window.devel headerbar {
+    background: #cbd2d9 -gtk-icontheme("system-run-symbolic") 70% 0/64px 64px no-repeat, linear-gradient(to left, #a5b1bd 0%, #a5b1bd 8%, @theme_bg_color 25%);
+    box-shadow: inset 0 1px #f1f3f5;
+    border-color: #909fae;
+    color: rgba(46, 52, 54, 0.2);
+}
+
+window.devel headerbar label {
+    color: @theme_fg_color;
+}

demos/widget-factory/widget-factory.gresource.xml

@@ -6,6 +6,9 @@
   <gresource prefix="/org/gtk/WidgetFactory">
     <file>widget-factory.css</file>
   </gresource>
+  <gresource prefix="/org/gtk/WidgetFactory/gtk">
+    <file preprocess="xml-stripblanks">menus.ui</file>
+  </gresource>
   <gresource prefix="/org/gtk/WidgetFactory/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>
   </gresource>

demos/widget-factory/widget-factory.ui

@@ -16,16 +16,6 @@
         <attribute name="action">win.transition</attribute>
       </item>
     </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
-        <attribute name="action">win.show-help-overlay</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_About Widget Factory</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
   </menu>
   <menu id="dinner_menu">
     <section>
@@ -406,8 +396,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
     </columns>
   </object>
   <object class="GtkApplicationWindow" id="window">
-    <style><class name="devel"/></style>
-    <property name="title">GTK Widget Factory</property>
+    <property name="title">GTK+ Widget Factory</property>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="headerbar1">
         <property name="show-title-buttons">1</property>
@@ -472,6 +461,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry1">
@@ -483,6 +475,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="secondary-icon-tooltip-text">Change mode</property>
                             <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
                           </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entry2">
@@ -491,6 +486,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="invisible-char">•</property>
                             <property name="text" translatable="yes">entry</property>
                           </object>
+                          <packing>
+                            <property name="position">3</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="box223">
@@ -510,8 +508,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="can-focus">1</property>
                                 <property name="icon-name">window-close-symbolic</property>
                               </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">4</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox">
@@ -573,6 +577,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="sensitive">0</property>
                                 <property name="label" translatable="yes">label</property>
                               </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="spinbutton1">
@@ -581,6 +588,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="max-width-chars">2</property>
                                 <property name="adjustment">adjustment2</property>
                               </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkSpinButton" id="spinbutton2">
@@ -589,6 +599,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="width-chars">2</property>
                                 <property name="max-width-chars">2</property>
                               </object>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
@@ -782,6 +795,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                       <object class="GtkSeparator" id="separator1">
                         <property name="orientation">vertical</property>
                       </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="box19">
@@ -801,6 +817,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="can-focus">1</property>
                             <property name="receives-default">1</property>
                           </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="togglebutton3">
@@ -809,6 +828,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="receives-default">1</property>
                             <property name="active">1</property>
                           </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="togglebutton4">
@@ -818,6 +840,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="receives-default">1</property>
                             <property name="active">1</property>
                           </object>
+                          <packing>
+                            <property name="position">3</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="combobox1">
@@ -830,6 +855,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </attributes>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">5</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="combobox2">
@@ -843,6 +871,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </attributes>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">6</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkFontButton" id="fontbutton1">
@@ -850,6 +881,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="receives-default">1</property>
                             <property name="level">family|style|size|features|variations</property>
                           </object>
+                          <packing>
+                            <property name="position">6</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkColorButton" id="colorbutton1">
@@ -858,10 +892,16 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="rgba">#31316867a09f</property>
                             <property name="use-alpha">1</property>
                           </object>
+                          <packing>
+                            <property name="position">8</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkFileChooserButton" id="filechooserbutton1">
                           </object>
+                          <packing>
+                            <property name="position">8</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkLinkButton" id="linkbutton1">
@@ -872,24 +912,39 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             <property name="relief">none</property>
                             <property name="uri">http://www.gtk.org</property>
                           </object>
+                          <packing>
+                            <property name="position">9</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="switch1">
                             <property name="halign">center</property>
                           </object>
+                          <packing>
+                            <property name="position">10</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkSwitch" id="switch2">
                             <property name="sensitive">0</property>
                             <property name="halign">center</property>
                           </object>
+                          <packing>
+                            <property name="position">11</property>
+                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkSeparator" id="separator2">
                         <property name="orientation">vertical</property>
                       </object>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="box20">
@@ -910,17 +965,26 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="fraction">0.5</property>
                                 <property name="inverted">1</property>
                               </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkProgressBar" id="progressbar3">
                                 <property name="fraction">0.5</property>
                                 <property name="show-text">1</property>
                               </object>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkLevelBar" id="levelbar1">
                                 <property name="value">0.6</property>
                               </object>
+                              <packing>
+                                <property name="position">10</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkLevelBar" id="levelbar2">
@@ -933,6 +997,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <offset name="full" value="5"/>
                                 </offsets>
                               </object>
+                              <packing>
+                                <property name="position">11</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
@@ -961,10 +1028,16 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="fill-level">75</property>
                                     <property name="draw-value">0</property>
                                   </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkScale" id="scale5">
@@ -982,6 +1055,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <mark value="4" position="bottom"></mark>
                             </marks>
                           </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="box25">
@@ -1005,6 +1081,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inverted">1</property>
                                     <property name="halign">start</property>
                                   </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                             </child>
@@ -1039,17 +1118,32 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="halign">start</property>
                                     <signal name="format-value" handler="scale_format_value_blank"/>
                                   </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">3</property>
+                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">4</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkSeparator" id="separator3">
                         <property name="orientation">vertical</property>
                       </object>
+                      <packing>
+                        <property name="position">5</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="box26">
@@ -1082,6 +1176,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame3">
@@ -1095,6 +1192,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">2</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame4">
@@ -1108,13 +1208,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">3</property>
+                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">6</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkSeparator" id="separator4">
                         <property name="orientation">vertical</property>
                       </object>
+                      <packing>
+                        <property name="position">7</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="box4">
@@ -1215,13 +1324,25 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">8</property>
+                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkSeparator" id="separator5"/>
+                  <packing>
+                    <property name="position">3</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="box5">
@@ -1247,6 +1368,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           <object class="GtkBox" id="box7">
                             <property name="orientation">vertical</property>
                           </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                         <child type="tab">
                           <object class="GtkLabel" id="label6">
@@ -1328,6 +1452,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkNotebook" id="notebook3">
@@ -1381,6 +1508,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkNotebook" id="notebook4">
@@ -1434,8 +1564,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="position">4</property>
+                  </packing>
                 </child>
               </object>
               <packing>
@@ -2090,9 +2226,6 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="tooltip-text" translatable="yes">Save the current document</property>
                                       </object>
                                     </child>
-                                    <child>
-                                      <object class="GtkSeparatorToolItem"/>
-                                    </child>
                                     <child>
                                       <object class="GtkToolButton">
                                         <property name="label" translatable="yes">Search</property>
@@ -2910,6 +3043,9 @@ microphone-sensitivity-medium-symbolic</property>
                                               <class name="small-button"/>
                                             </style>
                                           </object>
+                                          <packing>
+                                            <property name="pack-type">end</property>
+                                          </packing>
                                         </child>
                                       </object>
                                     </child>
@@ -2940,6 +3076,9 @@ microphone-sensitivity-medium-symbolic</property>
                                               <class name="small-button"/>
                                             </style>
                                           </object>
+                                          <packing>
+                                            <property name="pack-type">end</property>
+                                          </packing>
                                         </child>
                                       </object>
                                     </child>
@@ -2998,6 +3137,9 @@ microphone-sensitivity-medium-symbolic</property>
                             <property name="show-emoji-icon">1</property>
                             <property name="placeholder-text" translatable="yes">Age…</property>
                           </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                         <style>
                           <class name="linked"/>
@@ -3133,7 +3275,7 @@ bad things might happen.</property>
     <property name="use-header-bar">1</property>
     <property name="title" translatable="yes">Zelda</property>
     <property name="hide-on-close">1</property>
-    <child internal-child="content_area">
+    <child internal-child="vbox">
       <object class="GtkBox">
         <child>
           <object class="GtkLabel">
@@ -3172,7 +3314,7 @@ bad things might happen.</property>
     <property name="use-header-bar">1</property>
     <property name="title" translatable="yes">Settings</property>
     <property name="hide-on-close">1</property>
-    <child internal-child="content_area">
+    <child internal-child="vbox">
       <object class="GtkBox">
         <child>
           <object class="GtkGrid">
@@ -3293,7 +3435,7 @@ bad things might happen.</property>
     <property name="use-header-bar">1</property>
     <property name="title" translatable="yes">Choose one</property>
     <property name="hide-on-close">1</property>
-    <child internal-child="content_area">
+    <child internal-child="vbox">
       <object class="GtkBox">
         <child>
           <object class="GtkFlowBox" id="selection_flowbox">

docs/CODING-STYLE

@@ -1,8 +1,8 @@
-GTK Coding Style
+GTK+ Coding Style
 -------------------------------------------------------------------------------
 
 This document is intended to be a short description of the preferred
-coding style to be used for the GTK source code. It was strongly
+coding style to be used for the GTK+ source code. It was strongly
 inspired by Clutter's CODING_STYLE.
 
 Coding style is a matter of consistency, readability and maintainance;
@@ -12,7 +12,7 @@ and consistent answers to common questions regarding the coding style,
 and will also try to identify the allowed exceptions.
 
 The examples will show the preferred coding style; the negative examples
-will be clearly identified. Please, don't submit code to GTK that
+will be clearly identified. Please, don't submit code to GTK+ that
 looks like any of these.
 
 Part of the rationales for these coding style rules are available either
@@ -38,10 +38,10 @@ using tab characters alone, or using a combination of spaces and tabs.
 
 Do not change the editor's configuration to change the meaning of a
 tab character (see below); code using tabs to indent will not be accepted
-into GTK.
+into GTK+.
 
 Even if two spaces for each indentation level allows deeper nesting than
-8 spaces, GTK favours self-documenting function names that can take
+8 spaces, GTK+ favours self-documenting function names that can take
 quite some space. For this reason you should avoid deeply nested code.
 
 + Tab characters
@@ -399,7 +399,7 @@ patch or commit. Never use empty lines at the beginning or at the end of
 a file.
 
 Do enable the default git pre-commit hook that detect trailing
-whitespace for you and help you to avoid corrupting GTK's tree with
+whitespace for you and help you to avoid corrupting GTK+'s tree with
 it. Do that as follows:
 
   chmod a+x .git/hooks/pre-commit
@@ -410,7 +410,7 @@ duplicate blank lines.
 
 + Headers
 
-Headers are special, for GTK, in that they don't have to obey the
+Headers are special, for GTK+, in that they don't have to obey the
 80 characters limit. The only major rule for headers is that the function
 definitions should be vertically aligned in three columns:
 
@@ -479,7 +479,7 @@ Additionally, public headers should use C++ guards around their declarations:
 
 + Includes
 
-GTK source files must never include the global gtk.h header; instead, it
+GTK+ source files must never include the global gtk.h header; instead, it
 should include the individual headers that are needed.
 
 Every source file must include config.h first, followed by the header matching
@@ -658,7 +658,7 @@ after the license header:
    * @Short_Description: Height-for-width geometry management
    * @Title: GtkSizeRequest
    *
-   * The GtkSizeRequest interface is GTK's height-for-width (and
+   * The GtkSizeRequest interface is GTK+'s height-for-width (and
    * width-for-height) geometry management system.
    * ...
    */
@@ -672,8 +672,8 @@ get_type function needs to listed in gtk3.types.
 
 + Old code
 
-New code that is being added to GTK should adhere to the style
-explained above. Existing GTK code does largely follow these
+New code that is being added to GTK+ should adhere to the style
+explained above. Existing GTK+ code does largely follow these
 conventions, but there are some differences, e.g. occurrences
 of tabs, etc.
 

docs/RELEASE-HOWTO.md

@@ -1,5 +1,5 @@
-How to do a GTK release?
-========================
+How to do a GTK+ release?
+=========================
 
 ## Before we begin
 
@@ -91,7 +91,7 @@ $ ninja -C _build gtk40-properties-pot
   12. Tag the release. The git command for doing that looks like:
 
 ```sh
-$ git tag -m "GTK 4.2.0" 4.2.0
+$ git tag -m "GTK+ 4.2.0" 4.2.0
 ```
 
   13. Bump the version number in `meson.build` and commit the change.
@@ -110,8 +110,8 @@ $ git push origin 4.2.0
     this looks like:
 
 ```sh
-$ scp gtk-4.2.0.tar.xz matthiasc@master.gnome.org:
-$ ssh matthiasc@master.gnome.org ftpadmin install gtk-4.2.0.tar.xz
+$ scp gtk+-4.2.0.tar.xz matthiasc@master.gnome.org:
+$ ssh matthiasc@master.gnome.org ftpadmin install gtk+-4.2.0.tar.xz
 ```
 
   16. Go to the gnome-announce list archives, find the last announce message,

docs/developers.txt

@@ -1,5 +1,5 @@
-Things to care about when using/programing for GTK
-==================================================
+Things to care about when using/programing for GTK+
+===================================================
 
 This file is meant to collect some frequently triggered failures when
 programming for/with Gtk, having the spirit of a developers FAQ.

docs/dnd_internals.txt

@@ -57,7 +57,7 @@ The GDK API
 ===========
 
 It is expect that the GDK DND API will never be
-used by anything other than the DND code in GTK.
+used by anything other than the DND code in GTK+.
 
 /* Drag and Drop */
 
@@ -71,7 +71,7 @@ straightforward manner.
 void             gdk_drag_status        (GdkDragContext   *context,
 				         GdkDragAction     action,
 					 guint32           time);
-void             gdk_drag_finish        (GdkDragContext   *context,
+void             gdk_drop_finish        (GdkDragContext   *context,
 					 gboolean          success,
 					 guint32           time);
 GdkAtom          gdk_drag_get_selection (GdkDragContext   *context);
@@ -159,7 +159,7 @@ the taskbar.
 Internally, when the outer drag enters a proxy dest site, a
 new source drag is created, with SourceInfo and
 GdkDragContext. From the GDK side, it looks much like a
-normal source drag; on the GTK side, most of the code is
+normal source drag; on the GTK+ side, most of the code is
 disjoint. The need to pass in a specific target window
 is the reason why the GDK DND API splits
 gdk_drag_find_window() and gdk_drag_motion().

docs/iconcache.txt

@@ -1,4 +1,4 @@
-Information about the icon theme cache format used by GTK
+Information about the icon theme cache format used by GTK+
 for more information, see the mailing list threads at 
 
 http://mail.gnome.org/archives/gtk-devel-list/2004-April/msg00065.html
@@ -30,7 +30,7 @@ We would like to propose the cache file format as an appendix to the
 icon theme specification. One thing which still needs to be investigated
 is caching of the actual image data; the file format is has an
 IMAGE_DATA_OFFSET member to allow adding that compatibly. An
-implementation of the caching scheme for GTK can be found at [2]. The
+implementation of the caching scheme for GTK+ can be found at [2]. The
 cache generator which is included in the patch depends only on glib, and
 it may be a good idea to move it to freedesktop.org as well. 
 

docs/reference/gdk/gdk4-sections.txt

@@ -171,6 +171,7 @@ gdk_rgba_get_type
 <FILE>gdksurface</FILE>
 GdkSurface
 GdkSurfaceType
+GdkSurfaceClass
 GdkSurfaceHints
 GdkGeometry
 GdkGravity
@@ -193,6 +194,7 @@ gdk_surface_is_visible
 gdk_surface_is_viewable
 gdk_surface_is_input_only
 gdk_surface_get_state
+gdk_surface_withdraw
 gdk_surface_iconify
 gdk_surface_deiconify
 gdk_surface_stick
@@ -280,6 +282,8 @@ gdk_surface_get_toplevel
 gdk_surface_get_children
 gdk_surface_get_children_with_user_data
 gdk_surface_peek_children
+gdk_surface_get_events
+gdk_surface_set_events
 gdk_surface_set_icon_name
 gdk_surface_set_transient_for
 gdk_surface_set_role
@@ -297,6 +301,8 @@ gdk_surface_get_support_multidevice
 gdk_surface_set_support_multidevice
 gdk_surface_get_device_cursor
 gdk_surface_set_device_cursor
+gdk_surface_get_device_events
+gdk_surface_set_device_events
 
 <SUBSECTION>
 gdk_surface_coords_from_parent
@@ -621,6 +627,7 @@ GDK_BUTTON_SECONDARY
 <SUBSECTION>
 gdk_event_new
 gdk_event_copy
+gdk_event_free
 gdk_event_get_axes
 gdk_event_get_button
 gdk_event_get_click_count
@@ -646,7 +653,7 @@ gdk_event_get_scancode
 gdk_event_get_pointer_emulated
 gdk_event_get_crossing_detail
 gdk_event_get_crossing_mode
-gdk_event_get_drop
+gdk_event_get_drag_context
 gdk_event_get_focus_in
 gdk_event_get_grab_surface
 gdk_event_get_motion_history
@@ -655,6 +662,7 @@ gdk_event_get_key_is_modifier
 gdk_event_get_pad_axis_value
 gdk_event_get_pad_button
 gdk_event_get_pad_group_mode
+gdk_event_get_string
 gdk_event_get_touch_emulating_pointer
 gdk_event_get_touchpad_angle_delta
 gdk_event_get_touchpad_deltas
@@ -691,7 +699,7 @@ gdk_event_get_type
 
 <SECTION>
 <FILE>gdkpaintable</FILE>
-<TITLE>GdkPaintable</TITLE>
+<TITLE>GdkPaintable/TITLE>
 GdkPaintable
 GdkPaintableFlags
 gdk_paintable_get_current_image
@@ -772,60 +780,38 @@ gdk_cursor_get_type
 <SECTION>
 <TITLE>Drag and Drop</TITLE>
 <FILE>dnd</FILE>
-GdkDrag
-GdkDrop
+GdkDragContext
 GdkDragCancelReason
 gdk_drag_drop_done
 gdk_drag_begin
-GdkDragAction
-GDK_ACTION_ALL
-
-gdk_drag_get_display
-gdk_drag_get_actions
-gdk_drag_get_suggested_action
-gdk_drag_get_selected_action
-gdk_drag_get_formats
-gdk_drag_get_device
-gdk_drag_get_drag_surface
-gdk_drag_set_hotspot
-
-<SUBSECTION>
-gdk_drag_action_is_unique
-
-<SUBSECTION>
-gdk_drop_get_display
-gdk_drop_get_device
-gdk_drop_get_surface
-gdk_drop_get_formats
-gdk_drop_get_actions
-gdk_drop_get_drag
-gdk_drop_status
 gdk_drop_finish
-gdk_drop_read_async
-gdk_drop_read_finish
-gdk_drop_read_value_async
-gdk_drop_read_value_finish
-gdk_drop_read_text_async
-gdk_drop_read_text_finish
+GdkDragAction
+gdk_drag_status
+
+gdk_drag_context_get_display
+gdk_drag_context_get_actions
+gdk_drag_context_get_suggested_action
+gdk_drag_context_get_selected_action
+gdk_drag_context_get_formats
+gdk_drag_context_get_device
+gdk_drag_context_get_source_surface
+gdk_drag_context_get_dest_surface
+gdk_drag_context_get_drag_surface
+gdk_drag_context_set_hotspot
 
 <SUBSECTION Standard>
-GDK_DRAG
-GDK_TYPE_DRAG
-GDK_IS_DRAG
-GDK_DRAG_CLASS
-GDK_DRAG_GET_CLASS
-GDK_IS_DRAG_CLASS
+GDK_DRAG_CONTEXT
+GDK_TYPE_DRAG_CONTEXT
+GDK_IS_DRAG_CONTEXT
+GDK_DRAG_CONTEXT_CLASS
+GDK_DRAG_CONTEXT_GET_CLASS
+GDK_IS_DRAG_CONTEXT_CLASS
 GDK_TYPE_DRAG_ACTION
 GDK_TYPE_DRAG_PROTOCOL
-GDK_TYPE_DROP
-GDK_DROP
-GDK_IS_DROP
 
 <SUBSECTION Private>
-GdkDragClass
-gdk_drag_get_type
-GdkDropClass
-gdk_drop_get_type
+GdkDragContextClass
+gdk_drag_context_get_type
 </SECTION>
 
 <SECTION>
@@ -868,6 +854,7 @@ gdk_x11_screen_lookup_visual
 gdk_x11_screen_supports_net_wm_hint
 gdk_x11_screen_get_number_of_desktops
 gdk_x11_screen_get_current_desktop
+gdk_x11_surface_foreign_new_for_display
 gdk_x11_surface_lookup_for_display
 gdk_x11_surface_get_xid
 gdk_x11_surface_set_theme_variant
@@ -1264,7 +1251,6 @@ gdk_clipboard_get_type
 <SECTION>
 <FILE>gdkcontentprovider</FILE>
 GdkContentProvider
-GdkContentProviderClass
 gdk_content_provider_new_for_value
 gdk_content_provider_new_for_bytes
 gdk_content_provider_ref_formats
@@ -1280,6 +1266,7 @@ GDK_CONTENT_PROVIDER_CLASS
 GDK_CONTENT_PROVIDER_GET_CLASS
 GDK_IS_CONTENT_PROVIDER
 GDK_IS_CONTENT_PROVIDER_CLASS
+GdkContentProviderClass
 gdk_content_provider_get_type
 </SECTION>
 

docs/reference/gdk/gdk4.types

@@ -2,7 +2,6 @@ gdk_app_launch_context_get_type
 gdk_clipboard_get_type
 gdk_content_deserializer_get_type
 gdk_content_formats_get_type
-gdk_content_provider_get_type
 gdk_content_serializer_get_type
 gdk_cursor_get_type
 gdk_device_get_type
@@ -10,8 +9,7 @@ gdk_device_pad_get_type
 gdk_device_tool_get_type
 gdk_display_get_type
 gdk_display_manager_get_type
-gdk_drag_get_type
-gdk_drop_get_type
+gdk_drag_context_get_type
 gdk_event_get_type
 gdk_frame_clock_get_type
 gdk_gl_context_get_type

docs/reference/gdk/meson.build

@@ -33,16 +33,14 @@ private_headers = [
   'gdktextureprivate.h',
   'gdkvulkancontextprivate.h',
   'keyname-table.h',
-  'gdkprivate-x11.h',
+  'x11/gdkprivate-x11.h',
   'x11/gdkeventsource.h',
-  'gtk-primary-selection-client-protocol.h',
-  'gtk-shell-client-protocol.h',
-  'keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h',
-  'pointer-gestures-unstable-v1-client-protocol.h',
-  'server-decoration-client-protocol.h',
-  'tablet-unstable-v2-client-protocol.h',
-  'xdg-foreign-unstable-v1-client-protocol.h',
-  'xdg-shell-unstable-v6-client-protocol.h',
+  'wayland/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h',
+  'wayland/pointer-gestures-unstable-v1-client-protocol.h',
+  'wayland/server-decoration-client-protocol.h',
+  'wayland/tablet-unstable-v2-client-protocol.h',
+  'wayland/xdg-foreign-unstable-v1-client-protocol.h',
+  'wayland/xdg-shell-unstable-v6-client-protocol.h',
   'win32',
   'quartz',
   'broadway',
@@ -87,24 +85,19 @@ images = [
   'images/zoom_out_cursor.png',
 ]
 
-src_dir = [ gdkinc ]
-
-if x11_enabled
-  src_dir += [ gdkx11_inc ]
-endif
-
-if wayland_enabled
-  src_dir += [ gdkwayland_inc ]
-endif
-
 configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
 
 gnome.gtkdoc('gdk4',
              mode: 'none',
              main_xml: 'gdk4-docs.xml',
-             src_dir: src_dir,
+             src_dir: [
+	       join_paths(meson.source_root(), 'gdk'),
+	       join_paths(meson.source_root(), 'gdk', 'x11'),
+	       join_paths(meson.source_root(), 'gdk', 'wayland'),
+	       join_paths(meson.build_root(), 'gdk'),
+	     ],
              dependencies: libgtk_dep,
-             gobject_typesfile: join_paths(meson.current_source_dir(), 'gdk4.types'),
+             gobject_typesfile: join_paths(meson.source_root(), 'docs/reference/gdk/gdk4.types'),
              scan_args: [
                '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
                '--ignore-headers=' + ' '.join(private_headers),

docs/reference/gsk/meson.build

@@ -40,10 +40,11 @@ gnome.gtkdoc('gsk4',
              mode: 'none',
              main_xml: 'gsk4-docs.xml',
              src_dir: [
-               gskinc,
+	       join_paths(meson.source_root(), 'gsk'),
+	       join_paths(meson.build_root(), 'gsk'),
 	     ],
              dependencies: libgtk_dep,
-             gobject_typesfile: join_paths(meson.current_source_dir(), 'gsk4.types'),
+             gobject_typesfile: join_paths(meson.source_root(), 'docs/reference/gsk/gsk4.types'),
              scan_args: [
                '--ignore-decorators=_GDK_EXTERN',
                '--ignore-headers=' + ' '.join(private_headers),

docs/reference/gtk/broadway.xml

@@ -4,23 +4,23 @@
 ]>
 <refentry id="gtk-broadway">
 <refmeta>
-<refentrytitle>Using GTK with Broadway</refentrytitle>
+<refentrytitle>Using GTK+ with Broadway</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>Using GTK with Broadway</refname>
+<refname>Using GTK+ with Broadway</refname>
 <refpurpose>
-HTML-specific aspects of using GTK
+HTML-specific aspects of using GTK+
 </refpurpose>
 </refnamediv>
 
 <refsect1>
-<title>Using GTK with Broadway</title>
+<title>Using GTK+ with Broadway</title>
 
 <para>
-The GDK Broadway backend provides support for displaying GTK
+The GDK Broadway backend provides support for displaying GTK+
 applications in a web browser, using HTML5 and web sockets. To run
 your application in this way, select the Broadway backend by setting
 <literal>GDK_BACKEND=broadway</literal>. Then you can make
@@ -36,9 +36,9 @@ port that you want to use.
 </para>
 
 <para>
-It is also possible to use multiple GTK applications in the same
+It is also possible to use multiple GTK+ applications in the same
 web browser window, by using the Broadway server,
-<command>broadwayd</command>, that ships with GTK.
+<command>broadwayd</command>, that ships with GTK+.
 To use broadwayd, start it like this:
 <programlisting>
 broadwayd :5
@@ -46,7 +46,7 @@ broadwayd :5
 Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
 Start your applications like this:
 <programlisting>
-GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
+GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk3-demo
 </programlisting>
 </para>
 

docs/reference/gtk/building.sgml

@@ -4,31 +4,31 @@
 ]>
 <refentry id="gtk-building">
 <refmeta>
-<refentrytitle>Compiling the GTK libraries</refentrytitle>
+<refentrytitle>Compiling the GTK+ libraries</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>Compiling the GTK Libraries</refname>
+<refname>Compiling the GTK+ Libraries</refname>
 <refpurpose>
-How to compile GTK itself
+How to compile GTK+ itself
 </refpurpose>
 </refnamediv>
   <refsect1 id="overview">
-    <title>Building GTK</title>
+    <title>Building GTK+</title>
     <para>
-      Before we get into the details of how to compile GTK, we should
-      mention that in many cases, binary packages of GTK prebuilt for
+      Before we get into the details of how to compile GTK+, we should
+      mention that in many cases, binary packages of GTK+ prebuilt for
       your operating system will be available, either from your
       operating system vendor or from independent sources. If such a
       set of packages is available, installing it will get you
-      programming with GTK much faster than building it yourself. In
-      fact, you may well already have GTK installed on your system
+      programming with GTK+ much faster than building it yourself. In
+      fact, you may well already have GTK+ installed on your system
       already.
     </para>
     <para>
-      In order to build GTK, you will need <application>meson</application>
+      In order to build GTK+, you will need <application>meson</application>
       installed on your system. On Linux, and other UNIX-like operating
       systems, you will also need <application>ninja</application>. This
       guide does not cover how to install these two requirements, but you
@@ -38,11 +38,11 @@ How to compile GTK itself
       refer to it in the examples.
     </para>
     <para>
-      If you are building GTK from a source distribution or from a Git
+      If you are building GTK+ from a source distribution or from a Git
       clone, you will need to use <application>meson</application> to
       configure the project. The most commonly useful argument is the
       <systemitem>--prefix</systemitem> one, which determines where the
-      files will go once installed. To install GTK under a prefix
+      files will go once installed. To install GTK+ under a prefix
       like <filename>/opt/gtk</filename> you would run Meson as:
     </para>
     <informalexample>
@@ -83,7 +83,7 @@ How to compile GTK itself
       <envar>PKG_CONFIG_PATH</envar> environment variable contains
       a search path that <command>pkg-config</command> (see below)
       uses when looking for files describing how to compile
-      programs using different libraries. If you were installing GTK
+      programs using different libraries. If you were installing GTK+
       and it's dependencies into <filename>/opt/gtk</filename>, you
       might want to set these variables as:
     </para>
@@ -109,26 +109,26 @@ How to compile GTK itself
   <refsect1 id="dependencies">
     <title>Dependencies</title>
     <para>
-      Before you can compile the GTK widget toolkit, you need to have
+      Before you can compile the GTK+ widget toolkit, you need to have
       various other tools and libraries installed on your
-      system. Dependencies of GTK have their own build systems, so
+      system. Dependencies of GTK+ have their own build systems, so
       you will need to refer to their own installation instructions.
     </para>
     <para>
-      A particular important tool used by GTK to find its dependencies
+      A particular important tool used by GTK+ to find its dependencies
       is <application>pkg-config</application>.
     </para>
     <para>
       <ulink url="https://www.freedesktop.org/wiki/Software/pkg-config/">pkg-config</ulink>
       is a tool for tracking the compilation flags needed for
-      libraries that are used by the GTK libraries. (For each
+      libraries that are used by the GTK+ libraries. (For each
       library, a small <literal>.pc</literal> text file is installed
       in a standard location that contains the compilation flags
       needed for that library along with version number information.)
     </para>
     <para>
-      Some of the libraries that GTK depends on are maintained by
-      by the GTK team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection.
+      Some of the libraries that GTK+ depends on are maintained by
+      by the GTK+ team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection.
       Other libraries are maintained separately.
     </para>
     <itemizedlist>
@@ -196,7 +196,7 @@ How to compile GTK itself
       <listitem>
         <para>
           The libraries from the X window system are needed to build
-          Pango and GTK. You should already have these installed on
+          Pango and GTK+. You should already have these installed on
           your system, but it's possible that you'll need to install
           the development environment for these libraries that your
           operating system vendor provides.
@@ -213,14 +213,14 @@ How to compile GTK itself
         <para>
           <ulink url="https://www.cairographics.org">Cairo</ulink>
           is a graphics library that supports vector graphics and image
-          compositing. Both Pango and GTK use Cairo for drawing.
+          compositing. Both Pango and GTK+ use Cairo for drawing.
         </para>
       </listitem>
       <listitem>
         <para>
           <ulink url="https://github.com/anholt/libepoxy">libepoxy</ulink>
           is a library that abstracts the differences between different
-          OpenGL libraries. GTK uses it for cross-platform GL support
+          OpenGL libraries. GTK+ uses it for cross-platform GL support
           and for its own drawing.
         </para>
       </listitem>
@@ -228,20 +228,20 @@ How to compile GTK itself
         <para>
           <ulink url="https://github.com/anholt/libepoxy">Graphene</ulink>
           is a library that provides vector and matrix types for 2D and
-          3D transformations. GTK uses it internally for drawing.
+          3D transformations. GTK+ uses it internally for drawing.
         </para>
       </listitem>
       <listitem>
         <para>
           The <ulink url="https://wayland.freedesktop.org">Wayland</ulink> libraries
-          are needed to build GTK with the Wayland backend.
+          are needed to build GTK+ with the Wayland backend.
         </para>
       </listitem>
       <listitem>
         <para>
           The <ulink url="https://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
-          package is not a hard dependency of GTK, but it contains definitions
-          for mime types that are used by GIO and, indirectly, by GTK.
+          package is not a hard dependency of GTK+, but it contains definitions
+          for mime types that are used by GIO and, indirectly, by GTK+.
           gdk-pixbuf will use GIO for mime type detection if possible. For this
           to work, shared-mime-info needs to be installed and
           <envar>XDG_DATA_DIRS</envar> set accordingly at configure time.
@@ -251,7 +251,7 @@ How to compile GTK itself
     </itemizedlist>
   </refsect1>
   <refsect1 id="building">
-    <title>Building and testing GTK</title>
+    <title>Building and testing GTK+</title>
     <para>
       First make sure that you have the necessary external
       dependencies installed: <command>pkg-config</command>, Meson, Ninja,
@@ -263,16 +263,16 @@ How to compile GTK itself
       accessible through your operating system package repositories.
     </para>
     <para>
-      Then build and install the GTK libraries in the order:
-      GLib, Cairo, Pango, ATK, then GTK. For each library, follow the
+      Then build and install the GTK+ libraries in the order:
+      GLib, Cairo, Pango, ATK, then GTK+. For each library, follow the
       instructions they provide, and make sure to share common settings
-      between them and the GTK build; if you are using a separate prefix
-      for GTK, for instance, you will need to use the same prefix for all
+      between them and the GTK+ build; if you are using a separate prefix
+      for GTK+, for instance, you will need to use the same prefix for all
       its dependencies you build. If you're lucky, this will all go smoothly,
       and you'll be ready to <link linkend="gtk-compiling">start compiling
-      your own GTK applications</link>. You can test your GTK installation
+      your own GTK+ applications</link>. You can test your GTK+ installation
       by running the <command>gtk4-demo</command> program that
-      GTK installs.
+      GTK+ installs.
     </para>
     <para>
       If one of the projects you're configuring or building fails, look
@@ -287,7 +287,7 @@ How to compile GTK itself
       <title>Extra Configuration Options</title>
 
       <para>
-        In addition to the normal options provided by Meson, GTK defines
+        In addition to the normal options provided by Meson, GTK+ defines
         various arguments that modify what should be built.
 
         <cmdsynopsis>
@@ -375,7 +375,7 @@ How to compile GTK itself
         <title><systemitem>xinerama</systemitem></title>
 
         <para>
-          By default GTK will try to link against the Xinerama libraries
+          By default GTK+ will try to link against the Xinerama libraries
           if they are found. This options can be used to explicitly control
           whether Xinerama should be used.
         </para>
@@ -388,16 +388,16 @@ How to compile GTK itself
         <para>
           The <application>gtk-doc</application> package is
           used to generate the reference documentation included
-          with GTK. By default support for <application>gtk-doc</application>
+          with GTK+. By default support for <application>gtk-doc</application>
           is disabled because it requires various extra dependencies
           to be installed. If you have
           <application>gtk-doc</application> installed and
-          are modifying GTK, you may want to enable
+          are modifying GTK+, you may want to enable
           <application>gtk-doc</application> support by passing
           in <systemitem>documentation</systemitem>.
         </para>
         <para>
-          Additionally, some tools provided by GTK have their own
+          Additionally, some tools provided by GTK+ have their own
           manual pages generated using a similar set of dependencies;
           if you have <application>xsltproc</application> then you
           can generate manual pages by passing <systemitem>man-pages</systemitem>
@@ -409,7 +409,7 @@ How to compile GTK itself
         <title><systemitem>print-backends</systemitem></title>
 
         <para>
-          By default, GTK will try to build various print backends if
+          By default, GTK+ will try to build various print backends if
           their dependencies are found. This option can be used to
           explicitly control which print backends should be built.
         </para>
@@ -439,7 +439,7 @@ How to compile GTK itself
         <para>
           Allows to disable building introspection support. This is option
           is mainly useful for shortening turnaround times on developer
-          systems. Installed builds of GTK should always have introspection
+          systems. Installed builds of GTK+ should always have introspection
           support.
         </para>
       </formalpara>
@@ -450,9 +450,9 @@ How to compile GTK itself
                <systemitem>demos</systemitem></title>
 
         <para>
-          By default, GTK will build quite a few tests and demos.
+          By default, GTK+ will build quite a few tests and demos.
           While these are useful on a developer system, they are not
-          needed when GTK is built e.g. for a flatpak runtime. These
+          needed when GTK+ is built e.g. for a flatpak runtime. These
           options allow to disable building tests and demos.
         </para>
       </formalpara>

docs/reference/gtk/compiling.sgml

@@ -4,24 +4,24 @@
 ]>
 <refentry id="gtk-compiling">
 <refmeta>
-<refentrytitle>Compiling GTK Applications</refentrytitle>
+<refentrytitle>Compiling GTK+ Applications</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>Compiling GTK Applications</refname>
+<refname>Compiling GTK+ Applications</refname>
 <refpurpose>
-How to compile your GTK application
+How to compile your GTK+ application
 </refpurpose>
 </refnamediv>
 
 <refsect1>
-<title>Compiling GTK Applications on UNIX</title>
+<title>Compiling GTK+ Applications on UNIX</title>
 
 <para>
-To compile a GTK application, you need to tell the compiler where to
-find the GTK header files and libraries. This is done with the
+To compile a GTK+ application, you need to tell the compiler where to
+find the GTK+ header files and libraries. This is done with the
 <literal>pkg-config</literal> utility.
 </para>
 <para>
@@ -29,9 +29,9 @@ The following interactive shell session demonstrates how
 <literal>pkg-config</literal> is used (the actual output on
 your system may be different):
 <programlisting>
-$ pkg-config --cflags gtk4
+$ pkg-config --cflags gtk+-4.0
  -pthread -I/usr/include/gtk-4.0 -I/usr/lib64/gtk-4.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
-$ pkg-config --libs gtk4
+$ pkg-config --libs gtk+-4.0
  -pthread -lgtk-4 -lgdk-4 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
 </programlisting>
 </para>
@@ -40,14 +40,14 @@ The simplest way to compile a program is to use the "backticks"
 feature of the shell. If you enclose a command in backticks
 (<emphasis>not single quotes</emphasis>), then its output will be
 substituted into the command line before execution. So to compile
-a GTK Hello, World, you would type the following:
+a GTK+ Hello, World, you would type the following:
 <programlisting>
-$ cc `pkg-config --cflags gtk4` hello.c -o hello `pkg-config --libs gtk4`
+$ cc `pkg-config --cflags gtk+-4.0` hello.c -o hello `pkg-config --libs gtk+-4.0`
 </programlisting>
 </para>
 
 <para>
-Deprecated GTK functions are annotated to make the compiler
+Deprecated GTK+ functions are annotated to make the compiler
 emit warnings when they are used (e.g. with gcc, you need to use
 the -Wdeprecated-declarations option). If these warnings are
 problematic, they can be turned off by defining the preprocessor
@@ -56,26 +56,26 @@ option <literal>-DGDK_DISABLE_DEPRECATION_WARNINGS</literal>
 </para>
 
 <para>
-GTK deprecation annotations are versioned; by defining the
+GTK+ deprecation annotations are versioned; by defining the
 macros %GDK_VERSION_MIN_REQUIRED and %GDK_VERSION_MAX_ALLOWED,
-you can specify the range of GTK versions whose API you want
+you can specify the range of GTK+ versions whose API you want
 to use. APIs that were deprecated before or introduced after
 this range will trigger compiler warnings.
 </para>
 
 <para>
 Here is how you would compile hello.c if you want to allow it
-to use symbols that were not deprecated in 4.2:
+to use symbols that were not deprecated in 3.2:
 <programlisting>
-$ cc `pkg-config --cflags gtk4` -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_4_2 hello.c -o hello `pkg-config --libs gtk4`
+$ cc `pkg-config --cflags gtk+-4.0` -DGDK_VERSION_MIN_REQIRED=GDK_VERSION_3_2 hello.c -o hello `pkg-config --libs gtk+-4.0`
 </programlisting>
 </para>
 
 <para>
 And here is how you would compile hello.c if you don't want
-it to use any symbols that were introduced after 4.2:
+it to use any symbols that were introduced after 3.4:
 <programlisting>
-$ cc `pkg-config --cflags gtk4` -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_4_2 hello.c -o hello `pkg-config --libs gtk4`
+$ cc `pkg-config --cflags gtk+-4.0` -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_4 hello.c -o hello `pkg-config --libs gtk+-4.0`
 </programlisting>
 </para>
 

docs/reference/gtk/css-overview.xml

@@ -4,15 +4,15 @@
 ]>
 <refentry id="chap-css-overview">
 <refmeta>
-<refentrytitle>GTK CSS Overview</refentrytitle>
+<refentrytitle>GTK+ CSS Overview</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>GTK CSS Overview</refname>
+<refname>GTK+ CSS Overview</refname>
 <refpurpose>
-Overview of CSS in GTK
+Overview of CSS in GTK+
 </refpurpose>
 </refnamediv>
 
@@ -31,10 +31,10 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
 -->
 
 <refsect1 id="css-overview">
-  <title>Overview of CSS in GTK</title>
+  <title>Overview of CSS in GTK+</title>
 
   <para>
-    This chapter describes in detail how GTK uses CSS for styling
+    This chapter describes in detail how GTK+ uses CSS for styling
     and layout.
   </para>
 
@@ -61,7 +61,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
     <title>CSS nodes</title>
 
     <para>
-      GTK applies the style information found in style sheets by matching
+      GTK+ applies the style information found in style sheets by matching
       the selectors against a tree of nodes. Each node in the tree has a
       name, a state and possibly style classes. The children of each node
       are linearly ordered.
@@ -99,7 +99,7 @@ scale[.fine-tune]
     <title>Style sheets</title>
 
     <para>
-      The basic structure of the style sheets understood by GTK is
+      The basic structure of the style sheets understood by GTK+ is
       a series of statements, which are either rule sets or “@-rules”,
       separated by whitespace.
     </para>
@@ -128,7 +128,7 @@ button, entry {
     <title>Importing style sheets</title>
 
     <para>
-      GTK supports the CSS @import rule, in order to load another
+      GTK+ supports the CSS @import rule, in order to load another
       style sheet in addition to the currently parsed one.
     </para>
 
@@ -339,8 +339,8 @@ checkbutton:indeterminate {
     </para>
 
     <para>
-      The full syntax for selectors understood by GTK can be found in the
-      table below. The main difference to CSS is that GTK does not currently
+      The full syntax for selectors understood by GTK+ can be found in the
+      table below. The main difference to CSS is that GTK+ does not currently
       support attribute selectors.
     </para>
 
@@ -373,7 +373,7 @@ checkbutton:indeterminate {
             <entry><phrase role="nowrap">E#id</phrase></entry>
             <entry>any E node with the given ID</entry>
             <entry><ulink url="https://www.w3.org/TR/css3-selectors/#id-selectors">CSS</ulink></entry>
-            <entry>GTK uses the widget name as ID</entry>
+            <entry>GTK+ uses the widget name as ID</entry>
           </row>
           <row>
             <entry><phrase role="nowrap">E:nth-child(〈nth-child〉)</phrase></entry>
@@ -543,7 +543,7 @@ checkbutton:indeterminate {
     </example>
 
     <para>
-      GTK adds several additional ways to specify colors.
+      GTK+ adds several additional ways to specify colors.
     </para>
 
 <literallayout><code>〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉 | 〈win32 color〉</code>
@@ -576,7 +576,7 @@ checkbutton:indeterminate {
     </example>
 
     <para>
-      GTK also supports color expressions, which allow colors to be transformed
+      GTK+ also supports color expressions, which allow colors to be transformed
       to new ones and can be nested, providing a rich language to define colors.
       Color expressions resemble functions, taking 1 or more colors and in some
       cases a number as arguments.
@@ -595,7 +595,7 @@ checkbutton:indeterminate {
 </literallayout>
 
     <para>
-      On Windows, GTK allows to refer to system colors, as follows:
+      On Windows, GTK+ allows to refer to system colors, as follows:
     </para>
 
 <literallayout><code>〈win32 color〉 = -gtk-win32-color( 〈name〉, 〈integer〉 )</code>
@@ -632,7 +632,7 @@ checkbutton:indeterminate {
     <para>
       The simplest way to specify an image in CSS is to load an image
       file from a URL. CSS does not specify anything about supported file
-      formats; within GTK, you can expect at least PNG, JPEG and SVG to
+      formats; within GTK+, you can expect at least PNG, JPEG and SVG to
       work. The full list of supported image formats is determined by the
       available gdk-pixbuf image loaders and may vary between systems.
     </para>
@@ -734,14 +734,14 @@ label {
     </para>
 
     <para>
-      GTK extends the CSS syntax for images and also uses it for specifying icons.
+      GTK+ extends the CSS syntax for images and also uses it for specifying icons.
     </para>
 
 <literallayout><code>〈gtk image〉 = 〈themed icon〉 | 〈scaled image〉 | 〈recolored image〉 | 〈win32 theme part〉</code>
 </literallayout>
 
     <para>
-      GTK has extensive support for loading icons from icon themes. It is
+      GTK+ has extensive support for loading icons from icon themes. It is
       accessible from CSS with the -gtk-icontheme syntax.
     </para>
 
@@ -770,7 +770,7 @@ arrow.fancy {
     </example>
 
     <para>
-      GTK supports scaled rendering on hi-resolution displays. This works
+      GTK+ supports scaled rendering on hi-resolution displays. This works
       best if images can specify normal and hi-resolution variants. From
       CSS, this can be done with the -gtk-scaled syntax.
     </para>
@@ -816,7 +816,7 @@ arrow {
 ]]></programlisting>
     </example>
     <para>
-      On Windows, GTK allows to refer to system theme parts as images, as follows:
+      On Windows, GTK+ allows to refer to system theme parts as images, as follows:
     </para>
 
 <literallayout><code>〈win32 theme part〉 = -gtk-win32-theme-part( 〈name〉, 〈integer〉 〈integer〉</code>
@@ -830,7 +830,7 @@ arrow {
 
     <para>
       CSS defines a mechanism by which changes in CSS property values can
-      be made to take effect gradually, instead of all at once. GTK supports
+      be made to take effect gradually, instead of all at once. GTK+ supports
       these transitions as well.
     </para>
 
@@ -911,7 +911,7 @@ spinner {
 
     <para>
       In order to extend key bindings affecting different widgets,
-      GTK supports the @binding-set rule to parse a set of bind/unbind
+      GTK+ supports the @binding-set rule to parse a set of bind/unbind
       directives. Note that in order to take effect, the binding sets
       defined in this way must be associated with rule sets by setting
       the -gtk-key-bindings property.

docs/reference/gtk/css-properties.xml

@@ -4,15 +4,15 @@
 ]>
 <refentry id="chap-css-properties">
 <refmeta>
-<refentrytitle>GTK CSS Properties</refentrytitle>
+<refentrytitle>GTK+ CSS Properties</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>GTK CSS Properties</refname>
+<refname>GTK+ CSS Properties</refname>
 <refpurpose>
-CSS Properties in GTK
+CSS Properties in GTK+
 </refpurpose>
 </refnamediv>
 
@@ -34,9 +34,9 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
   <title>Supported CSS Properties</title>
 
     <para>
-      GTK supports CSS properties and shorthands as far as they can be applied
+      GTK+ supports CSS properties and shorthands as far as they can be applied
       in the context of widgets, and adds its own properties only when needed.
-      All GTK-specific properties have a -gtk prefix.
+      All GTK+-specific properties have a -gtk prefix.
     </para>
 
     <para>
@@ -66,7 +66,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
     </para>
 
     <para>
-      Whereever a number is allowed, GTK also accepts a Windows-specific
+      Whereever a number is allowed, GTK+ also accepts a Windows-specific
       theme size:
     </para>
 
@@ -1159,7 +1159,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
       </table>
 
       <para>
-        GTK uses the CSS outline properties to render the 'focus rectangle'.
+        GTK+ uses the CSS outline properties to render the 'focus rectangle'.
       </para>
 
       <table pgwide="1">

docs/reference/gtk/drawing-model.xml

@@ -4,15 +4,15 @@
 ]>
 <refentry id="chap-drawing-model">
 <refmeta>
-<refentrytitle>The GTK Drawing Model</refentrytitle>
+<refentrytitle>The GTK+ Drawing Model</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>
 
 <refnamediv>
-<refname>The GTK Drawing Model</refname>
+<refname>The GTK+ Drawing Model</refname>
 <refpurpose>
-    The GTK drawing model in detail
+    The GTK+ drawing model in detail
 </refpurpose>
 </refnamediv>
 
@@ -21,12 +21,12 @@
     <title>Overview of the drawing model</title>
 
     <para>
-      This chapter describes the GTK drawing model in detail.  If you
-      are interested in the procedure which GTK follows to draw its
+      This chapter describes the GTK+ drawing model in detail.  If you
+      are interested in the procedure which GTK+ follows to draw its
       widgets and windows, you should read this chapter; this will be
       useful to know if you decide to implement your own widgets.  This
       chapter will also clarify the reasons behind the ways certain
-      things are done in GTK; for example, why you cannot change the
+      things are done in GTK+; for example, why you cannot change the
       background color of all widgets with the same method.
     </para>
 
@@ -52,7 +52,7 @@
         clipping", instead of "toplevel application windows".  Most
         windowing systems support nested windows, where the contents of
         child windows get clipped by the boundaries of their parents.
-        Although GTK and GDK in particular may run on a windowing
+        Although GTK+ and GDK in particular may run on a windowing
         system with no such notion of nested windows, GDK presents the
         illusion of being under such a system.  A toplevel window may
         contain many subwindows and sub-subwindows, for example, one for
@@ -63,16 +63,16 @@
       </para>
 
       <para>
-        In practice, most windows in modern GTK application are client-side
+        In practice, most windows in modern GTK+ application are client-side
         constructs. Only few windows (in particular toplevel windows) are
         <emphasis>native</emphasis>, which means that they represent a
-        window from the underlying windowing system on which GTK is running.
+        window from the underlying windowing system on which GTK+ is running.
         For example, on X11 it corresponds to a <type>Window</type>; on Win32,
         it corresponds to a <type>HANDLE</type>.
       </para>
 
       <para>
-        Generally, the drawing cycle begins when GTK receives an
+        Generally, the drawing cycle begins when GTK+ receives an
         exposure event from the underlying windowing system:  if the
         user drags a window over another one, the windowing system will
         tell the underlying window that it needs to repaint itself.  The
@@ -80,7 +80,7 @@
         that it needs to update its display.  For example, when the user
         types a character in a <link
         linkend="GtkEntry"><classname>GtkEntry</classname></link>
-        widget, the entry asks GTK to queue a redraw operation for
+        widget, the entry asks GTK+ to queue a redraw operation for
         itself.
       </para>
 
@@ -95,7 +95,7 @@
       </para>
 
       <para>
-        The following sections describe how GTK decides which widgets
+        The following sections describe how GTK+ decides which widgets
         need to be repainted in response to such events, and how widgets
         work internally in terms of the resources they use from the
         windowing system.
@@ -106,10 +106,10 @@
       <title>The frame clock</title>
 
       <para>
-        All GTK applications are mainloop-driven, which means that most
+        All GTK+ applications are mainloop-driven, which means that most
         of the time the app is idle inside a loop that just waits for
         something to happen and then calls out to the right place when
-        it does. On top of this GTK has a frame clock that gives a
+        it does. On top of this GTK+ has a frame clock that gives a
         “pulse” to the application. This clock beats at a steady rate,
         which is tied to the framerate of the output (this is synced to
         the monitor via the window manager/compositor). The clock has
@@ -215,7 +215,7 @@
       <para>
         Most widgets, including those that create their own GdkSurfaces have
         a transparent background, so they draw on top of whatever widgets
-        are below them. This was not the case in GTK 2 where the theme set
+        are below them. This was not the case in GTK+ 2 where the theme set
         the background of most widgets to the default background color. (In
         fact, transparent GdkSurfaces used to be impossible.)
       </para>
@@ -233,7 +233,7 @@
       <title>Scrolling</title>
 
       <para>
-        Traditionally, GTK has used self-copy operations to implement
+        Traditionally, GTK+ has used self-copy operations to implement
         scrolling with native windows. With transparent backgrounds, this
         no longer works. Instead, we just mark the entire affected area for
         repainting when these operations are used. This allows (partially)
@@ -253,7 +253,7 @@
       <literal>draw</literal> handler were sent directly to the
       windowing system, flicker could result.  This is because areas may get
       redrawn repeatedly:  the background, then decorative frames, then text
-      labels, etc.  To avoid flicker, GTK employs a <firstterm>double
+      labels, etc.  To avoid flicker, GTK+ employs a <firstterm>double
 	buffering</firstterm> system at the GDK level.  Widgets normally don't
       know that they are drawing to an off-screen buffer; they just issue their
       normal drawing commands, and the buffer gets sent to the windowing system
@@ -284,7 +284,7 @@
       </para>
 
       <para>
-	To make this easier, GTK normally calls
+	To make this easier, GTK+ normally calls
         <function>gdk_surface_begin_paint_region()</function>
         before emitting the #GtkWidget::draw signal, and
 	then it calls <function>gdk_surface_end_paint()</function>

docs/reference/gtk/getting_started.xml

@@ -3,11 +3,11 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 ]>
 <chapter id="gtk-getting-started" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <title>Getting Started with GTK</title>
+  <title>Getting Started with GTK+</title>
 
-  <para>GTK is a <ulink url="http://en.wikipedia.org/wiki/Widget_toolkit">
+  <para>GTK+ is a <ulink url="http://en.wikipedia.org/wiki/Widget_toolkit">
   widget toolkit</ulink>. Each user interface created by 
-  GTK consists of widgets. This is implemented in C using 
+  GTK+ consists of widgets. This is implemented in C using 
   <link linkend="gobject">GObject</link>, an object-oriented framework for C.
   Widgets are organized in a hierachy. The window widget is the main container.
   The user interface is then built by adding buttons, drop-down menus, input 
@@ -17,14 +17,14 @@
   assembling the interface manually. You can also use a visual user interface
   editor, like <ulink url="https://glade.gnome.org/">Glade</ulink>.</para>
   
-  <para>GTK is event-driven. The toolkit listens for events such as
+  <para>GTK+ is event-driven. The toolkit listens for events such as
   a click on a button, and passes the event to your application.</para>
 
   <para>This chapter contains some tutorial information to get you
-  started with GTK programming. It assumes that you have GTK, its
+  started with GTK+ programming. It assumes that you have GTK+, its
   dependencies and a C compiler installed and ready to use. If you
-  need to build GTK itself first, refer to the
-  <link linkend="gtk-compiling">Compiling the GTK libraries</link>
+  need to build GTK+ itself first, refer to the
+  <link linkend="gtk-compiling">Compiling the GTK+ libraries</link>
   section in this reference.</para>
 
   <section>
@@ -44,30 +44,30 @@
 
     <informalexample>
       <para>Create a new file with the following content named <filename>example-0.c.</filename></para>
-      <programlisting><xi:include href="@SRC_DIR@/examples/window-default.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="../../../../examples/window-default.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </informalexample>
 
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk4` -o example-0 example-0.c `pkg-config --libs gtk4`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-0 example-0.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
 
-    <note><para>For more information on how to compile a GTK application, please
-    refer to the <link linkend="gtk-compiling">Compiling GTK Applications</link>
+    <note><para>For more information on how to compile a GTK+ application, please
+    refer to the <link linkend="gtk-compiling">Compiling GTK+ Applications</link>
     section in this reference.</para></note>
 
-    <para>All GTK applications will, of course, include
+    <para>All GTK+ applications will, of course, include
     <filename>gtk/gtk.h</filename>, which declares functions, types and
-    macros required by GTK applications.</para>
+    macros required by GTK+ applications.</para>
 
-    <warning><para>Even if GTK installs multiple header files, only the
+    <warning><para>Even if GTK+ installs multiple header files, only the
     top-level <filename>gtk/gtk.h</filename> header can be directly included
     by third party code. The compiler will abort with an error if any other
     header is directly included.</para></warning>
 
-    <para>In a GTK application, the purpose of the main() function is to
+    <para>In a GTK+ application, the purpose of the main() function is to
     create a #GtkApplication object and run it. In this example a
     #GtkApplication pointer named <varname>app</varname> is called and then
     initialized using gtk_application_new().</para>
@@ -89,8 +89,8 @@
     when your application is launched with
     g_application_run() on the line below.
     The gtk_application_run() also takes as arguments the pointers to the command line arguments
-    counter and string array; this allows GTK to parse specific command line
-    arguments that control the behavior of GTK itself. The parsed arguments
+    counter and string array; this allows GTK+ to parse specific command line
+    arguments that control the behavior of GTK+ itself. The parsed arguments
     will be removed from the array, leaving the unrecognized ones for your
     application to parse.
     </para>
@@ -120,7 +120,7 @@
     here</ulink>.</para>
 
     <para>Finally the window size is set using gtk_window_set_default_size and
-    the window is then shown by GTK via gtk_widget_show().</para>
+    the window is then shown by GTK via gtk_widget_show_all().</para>
 
     <para>When you exit the window, by for example pressing the X,
     the g_application_run() in the main loop returns with a number
@@ -128,16 +128,16 @@
     #GtkApplication object is freed from memory with g_object_unref().
     Finally the status integer is returned and the GTK application exits.</para>
 
-    <para>While the program is running, GTK is receiving
+    <para>While the program is running, GTK+ is receiving
     <firstterm>events</firstterm>. These are typically input events caused by
     the user interacting with your program, but also things like messages from
-    the window manager or other applications. GTK processes these and as a
+    the window manager or other applications. GTK+ processes these and as a
     result, <firstterm>signals</firstterm> may be emitted on your widgets.
     Connecting handlers for these signals is how you normally make your
     program do something in response to user input.</para>
 
     <para>The following example is slightly more complex, and tries to
-    showcase some of the capabilities of GTK.</para>
+    showcase some of the capabilities of GTK+.</para>
 
     <para>In the long tradition of programming languages and libraries,
     it is called <emphasis>Hello, World</emphasis>.</para>
@@ -151,16 +151,16 @@
     </informalfigure>
 
     <example id="gtk-getting-started-hello-world">
-      <title>Hello World in GTK</title>
+      <title>Hello World in GTK+</title>
       <para>Create a new file with the following content named example-1.c.</para>
-      <programlisting><xi:include href="@SRC_DIR@/examples/hello-world.c" parse="text">
+      <programlisting><xi:include href="../../../../examples/hello-world.c" parse="text">
           <xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
 
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk4` -o example-1 example-1.c `pkg-config --libs gtk4`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-1 example-1.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
   </section>
@@ -169,8 +169,8 @@
   button to our window, with the label "Hello World". Two new GtkWidget pointers
   are declared to accomplish this, <varname>button</varname> and
   <varname>button_box</varname>. The button_box variable is created to store a
-  #GtkBox which is GTK's way of controlling the size and layout of buttons.
-  The #GtkBox is created and assigned to gtk_box_new() which takes a
+  #GtkButtonBox which is GTK+'s way of controlling the size and layout of buttons.
+  The #GtkButtonBox is created and assigned to gtk_button_box_new() which takes a
   #GtkOrientation enum as parameter. The buttons which this box will contain can
   either be stored horizontally or vertically but this does not matter in this
   particular case as we are dealing with only one button. After initializing
@@ -215,7 +215,7 @@
     it becomes important to control how each widget is positioned and sized.
     This is where packing comes in.</para>
 
-    <para>GTK comes with a large variety of <firstterm>layout containers</firstterm>
+    <para>GTK+ comes with a large variety of <firstterm>layout containers</firstterm>
     whose purpose it is to control the layout of the child widgets that are
     added to them. See <xref linkend="LayoutContainers"/> for an overview.</para>
 
@@ -233,12 +233,12 @@
     <example id="gtk-getting-started-grid-packing">
       <title>Packing buttons</title>
       <para>Create a new file with the following content named example-2.c.</para>
-      <programlisting><xi:include href="@SRC_DIR@/examples/grid-packing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="../../../../examples/grid-packing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk4` -o example-2 example-2.c `pkg-config --libs gtk4`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-2 example-2.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
   </section>
@@ -250,21 +250,21 @@
     or hundreds of widgets, doing all the setup work in C code is
     cumbersome, and making changes becomes next to impossible.</para>
 
-    <para>Thankfully, GTK supports the separation of user interface
+    <para>Thankfully, GTK+ supports the separation of user interface
     layout from your business logic, by using UI descriptions in an
     XML format that can be parsed by the #GtkBuilder class.</para>
 
     <example>
       <title>Packing buttons with GtkBuilder</title>
       <para>Create a new file with the following content named example-3.c.</para>
-      <programlisting><xi:include href="@SRC_DIR@/examples/builder.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="../../../../examples/builder.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       <para>Create a new file with the following content named builder.ui.</para>
-      <programlisting><xi:include href="@SRC_DIR@/examples/builder.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="../../../../examples/builder.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk4` -o example-3 example-3.c `pkg-config --libs gtk4`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-3 example-3.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
 
@@ -324,7 +324,7 @@
     </variablelist>
     </para>
 
-    <para>GTK includes application support that is built on top of
+    <para>GTK+ includes application support that is built on top of
     #GApplication. In this tutorial we'll build a simple application by
     starting from scratch, adding more and more pieces over time. Along
     the way, we'll learn about #GtkApplication, templates, resources,
@@ -332,8 +332,8 @@
     #GtkListBox, and more.</para>
 
     <para>The full, buildable sources for these examples can be found
-    in the examples/ directory of the GTK source distribution, or
-    <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples">online</ulink> in the GTK git repository.
+    in the examples/ directory of the GTK+ source distribution, or
+    <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/master/examples">online</ulink> in the GTK+ git repository.
     You can build each example separately by using make with the <filename>Makefile.example</filename>
     file. For more information, see the <filename>README</filename> included in the
     examples directory.</para>
@@ -346,7 +346,7 @@
       of our application class.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application1/main.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application1/main.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>All the application logic is in the application class, which
@@ -364,16 +364,16 @@
       GIO <ulink url="https://developer.gnome.org/gio/2.36/GApplication.html#GApplication.description">documentation</ulink>.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application1/exampleapp.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application1/exampleapp.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Another important class that is part of the application support
-      in GTK is #GtkApplicationWindow. It is typically subclassed as well.
+      in GTK+ is #GtkApplicationWindow. It is typically subclassed as well.
       Our subclass does not do anything yet, so we will just get an empty
       window.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application1/exampleappwin.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application1/exampleappwin.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>As part of the initial setup of our application, we also
@@ -388,7 +388,7 @@
       </informalfigure>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application1/org.gtk.exampleapp.desktop" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application1/exampleapp.desktop" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Note that <replaceable>@<!-- -->bindir@</replaceable> needs to be replaced
@@ -420,7 +420,7 @@
       </para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application2/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application2/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>To make use of this file in our application, we revisit
@@ -460,7 +460,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
       </para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application2/exampleapp.gresource.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application2/exampleapp.gresource.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>This file has to be converted into a C source file that will be
@@ -488,28 +488,23 @@ example_app_window_class_init (ExampleAppWindowClass *class)
       <para>In this step, we make our application show the content of
       all the files that it is given on the commandline.</para>
 
-      <para>To this end, we add a member to the struct in application
+      <para>To this end, we add a private struct to our application
       window subclass and keep a reference to the #GtkStack there.
-      The first member of the struct should be the parent type from
-      which the class is derived. Here, ExampleAppWindow is derived
-      from GtkApplicationWindow.
-      The gtk_widget_class_bind_template_child() function
+      The gtk_widget_class_bind_template_child_private() function
       arranges things so that after instantiating the template, the
-      @stack member of the struct will point to the widget of
+      @stack member of the private struct will point to the widget of
       the same name from the template.</para>
 
       <informalexample>
         <programlisting><![CDATA[
 ...
 
-struct _ExampleAppWindow
+struct _ExampleAppWindowPrivate
 {
-  GtkApplicationWindow parent;
-
   GtkWidget *stack;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 ...
 
@@ -518,7 +513,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 {
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
 }
 
 ...
@@ -538,21 +533,25 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
   gsize length;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
     {
@@ -599,7 +598,7 @@ example_app_window_open (ExampleAppWindow *win,
       in a ui file, and add it as a resource to our binary.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application4/app-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application4/app-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>To associate the app menu with the application, we have to call
@@ -698,7 +697,7 @@ example_app_class_init (ExampleAppClass *class)
       GSettings requires a schema that describes our settings:</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application5/org.gtk.exampleapp.gschema.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application5/org.gtk.exampleapp.gschema.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Before we can make use of this schema in our application,
@@ -719,11 +718,14 @@ example_app_class_init (ExampleAppClass *class)
 static void
 example_app_window_init (ExampleAppWindow *win)
 {
-  gtk_widget_init_template (GTK_WIDGET (win));
-  win->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppWindowPrivate *priv;
 
-  g_settings_bind (win->settings, "transition",
-                   win->stack, "transition-type",
+  priv = example_app_window_get_instance_private (win);
+  gtk_widget_init_template (GTK_WIDGET (win));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "transition",
+                   priv->stack, "transition-type",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
@@ -747,13 +749,13 @@ example_app_window_init (ExampleAppWindow *win)
       <para>Lets start with the template.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application6/prefs.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application6/prefs.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Next comes the dialog subclass.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application6/exampleappprefs.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application6/exampleappprefs.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Now we revisit the <literal>preferences_activated(<!-- -->)</literal> function in our
@@ -797,7 +799,7 @@ preferences_activated (GSimpleAction *action,
       <title>Adding a search bar</title>
 
       <para>We continue to flesh out the functionality of our application.
-      For now, we add search. GTK supports this with #GtkSearchEntry and
+      For now, we add search. GTK+ supports this with #GtkSearchEntry and
       #GtkSearchBar. The search bar is a widget that can slide in from the
       top to present a search entry.</para>
 
@@ -805,7 +807,7 @@ preferences_activated (GSimpleAction *action,
       to slide out the search bar below the header bar.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application7/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application7/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>Implementing the search needs quite a few code changes that
@@ -821,6 +823,7 @@ static void
 search_text_changed (GtkEntry         *entry,
                      ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -832,7 +835,9 @@ search_text_changed (GtkEntry         *entry,
   if (text[0] == '\0')
     return;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -882,7 +887,7 @@ example_app_window_init (ExampleAppWindow *win)
       which demonstrates #GtkMenuButton, #GtkRevealer and #GtkListBox.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application8/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application8/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>The code to populate the sidebar with buttons for the words
@@ -893,7 +898,7 @@ example_app_window_init (ExampleAppWindow *win)
       ui file.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application8/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application8/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>To connect the menuitem to the show-words setting, we use
@@ -952,7 +957,7 @@ example_app_window_init (ExampleAppWindow *win)
       triggers the show-lines action:</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application9/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application9/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>To make this menu item do something, we create a property
@@ -973,12 +978,12 @@ example_app_window_init (ExampleAppWindow *win)
 {
   ...
 
-  action = (GAction*) g_property_action_new ("show-lines", win->lines, "visible");
+  action = (GAction*) g_property_action_new ("show-lines", priv->lines, "visible");
   g_action_map_add_action (G_ACTION_MAP (win), action);
   g_object_unref (action);
 
-  g_object_bind_property (win->lines, "visible",
-                          win->lines_label, "visible",
+  g_object_bind_property (priv->lines, "visible",
+                          priv->lines_label, "visible",
                           G_BINDING_DEFAULT);
 }
 
@@ -1007,12 +1012,12 @@ example_app_window_init (ExampleAppWindow *win)
 
       <para>Our application already uses a GtkHeaderBar, but so far it
       still gets a 'normal' window titlebar on top of that. This is a
-      bit redundant, and we will now tell GTK to use the header bar
+      bit redundant, and we will now tell GTK+ to use the header bar
       as replacement for the titlebar. To do so, we move it around to
       be a direct child of the window, and set its type to be titlebar.</para>
 
       <informalexample>
-        <programlisting><xi:include href="@SRC_DIR@/examples/application10/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application10/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
       </informalexample>
 
       <para>A small extra bonus of using a header bar is that we get
@@ -1048,7 +1053,7 @@ example_app_window_init (ExampleAppWindow *win)
     e.g. when another window is moved and uncovers part of the widget, or
     when the window containing it is resized. It is also possible to explicitly
     cause part or all of the widget to be redrawn, by calling
-    gtk_widget_queue_draw() or its variants. GTK takes care of most of the
+    gtk_widget_queue_draw() or its variants. GTK+ takes care of most of the
     details by providing a ready-to-use cairo context to the ::draw signal
     handler.</para>
 
@@ -1068,12 +1073,12 @@ example_app_window_init (ExampleAppWindow *win)
     <example id="gtk-getting-started-drawing">
       <title>Drawing in response to input</title>
       <para>Create a new file with the following content named example-4.c.</para>
-      <programlisting><xi:include href="@SRC_DIR@/examples/drawing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="../../../../examples/drawing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
     </example>
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk4` -o example-4 example-4.c `pkg-config --libs gtk4`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-4 example-4.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
   </section>

docs/reference/gtk/glossary.xml

@@ -51,11 +51,11 @@
     <glossterm>column</glossterm>
     <glossdef>
       <para>
-	GTK contains several widgets which display data in columns,
+	GTK+ contains several widgets which display data in columns,
         e.g. the #GtkTreeView. 
         These <glossterm linkend="view-column">view columns</glossterm> in 
         the tree view are represented by #GtkTreeViewColumn
-        objects inside GTK. They should not be confused with 
+        objects inside GTK+. They should not be confused with 
         <glossterm linkend="model-column">model columns</glossterm> which
         are used to organize the data in tree models.
       </para>
@@ -114,7 +114,7 @@
     <glossterm>event</glossterm>
     <glossdef>
       <para>
-        Events are the way in which GDK informs GTK about external events
+        Events are the way in which GDK informs GTK+ about external events
         like pointer motion, button clicks, key presses, etc. 
       </para>
     </glossdef>
@@ -177,7 +177,7 @@
       <para>
         These widgets follow the well-known model-view pattern, which separates
         the data (the model) to be displayed from the component which does the 
-        actual visualization (the view). Examples of this pattern in GTK are 
+        actual visualization (the view). Examples of this pattern in GTK+ are 
         the #GtkTreeView/#GtkTreeModel and #GtkTextView/#GtkTextBuffer
       </para>
       <para>
@@ -281,7 +281,7 @@
     <glossterm>style</glossterm>
     <glossdef>
       <para>
-        A style encapsulates what GTK needs to know in order to draw
+        A style encapsulates what GTK+ needs to know in order to draw
         a widget. Styles can be modified with 
         <link linkend="gtk3-Resource-Files">resource files</link>.
       </para>
@@ -294,7 +294,7 @@
       <para>
 	A <glossterm linkend="widget">widget</glossterm> that does not
 	require a <glossterm linkend="parent">parent</glossterm> container.  
-        The only toplevel widgets in GTK are #GtkWindow and widgets derived from it.
+        The only toplevel widgets in GTK+ are #GtkWindow and widgets derived from it.
       </para>
       <glossseealso>
 	<glossterm linkend="container">container</glossterm>

docs/reference/gtk/gtk4-broadwayd.xml

@@ -6,7 +6,7 @@
 
 <refentryinfo>
   <title>gtk4-broadwayd</title>
-  <productname>GTK</productname>
+  <productname>GTK+</productname>
   <authorgroup>
     <author>
       <contrib>Developer</contrib>
@@ -40,7 +40,7 @@
 <refsect1><title>Description</title>
 <para>
 <command>gtk4-broadwayd</command> is a display server for the Broadway
-GDK backend. It allows multiple GTK applications to display their
+GDK backend. It allows multiple GTK+ applications to display their
 windows in the same web browser, by connecting to gtk4-broadwayd.
 </para>
 <para>
@@ -52,7 +52,7 @@ gtk4-broadwayd :5
 Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
 Start your applications like this:
 <programlisting>
-GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
+GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk3-demo
 </programlisting>
 
 You can add password protection for your session by creating a file in

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

@@ -6,7 +6,7 @@
 
 <refentryinfo>
   <title>gtk4-builder-tool</title>
-  <productname>GTK</productname>
+  <productname>GTK+</productname>
   <authorgroup>
     <author>
       <contrib>Developer</contrib>

docs/reference/gtk/gtk4-demo-application.xml

@@ -6,7 +6,7 @@
 
 <refentryinfo>
   <title>gtk4-demo-application</title>
-  <productname>GTK</productname>
+  <productname>GTK+</productname>
   <authorgroup>
     <author>
       <contrib>Developer</contrib>