macos: Use shadow size from GdkToplevelSize

This is the new way of communicating shadow size.

.gitlab-ci.yml

@@ -16,11 +16,11 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
+  COMMON_MESON_FLAGS: "--fatal-meson-warnings -Dgtk:werror=true"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
   FEATURE_FLAGS: "-Dcloudproviders=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v20"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v22"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
   DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"
 
@@ -68,9 +68,11 @@ style-check-diff:
 fedora-x86_64:
   extends: .build-fedora-default
   stage: build
+  needs: []
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
+    - meson subprojects update
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             -Dprofiler=true
             _build
@@ -82,14 +84,38 @@ fedora-x86_64:
 release-build:
   extends: .build-fedora-default
   stage: build
+  needs: []
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
+    - meson subprojects update
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11
 
+installed-tests:
+  extends: .build-fedora-default
+  stage: build
+  needs: []
+  variables:
+    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
+  script:
+    - meson subprojects update
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+            _build
+    - ninja -C _build
+    - sudo ninja -C _build install
+    - dbus-run-session xvfb-run -a -s "-screen 0 1024x768x24"
+            gnome-desktop-testing-runner
+                   --report-directory=_build/installed-tests-report/failed/
+                   --parallel=0
+                   gtk-4.0
+  artifacts:
+    paths:
+      - "_build/installed-tests-report/"
+
+
 .mingw-defaults:
   stage: build
   tags:
@@ -109,6 +135,7 @@ release-build:
 
 msys2-mingw64:
   extends: .mingw-defaults
+  needs: []
   variables:
     MSYSTEM: "MINGW64"
     CHERE_INVOKING: "yes"
@@ -139,37 +166,44 @@ msys2-mingw64:
 
 flatpak-manual:demo:
   extends: .flatpak-manual
+  needs: []
   variables:
     APPID: org.gtk.Demo4
 
 flatpak-master:demo:
   extends: .flatpak-master
+  needs: []
   variables:
     APPID: org.gtk.Demo4
 
 flatpak-manual:widget-factory:
   extends: .flatpak-manual
+  needs: []
   variables:
     APPID: org.gtk.WidgetFactory4
 
 flatpak-master:widget-factory:
   extends: .flatpak-master
+  needs: []
   variables:
     APPID: org.gtk.WidgetFactory4
 
 flatpak-manual:icon-browser:
   extends: .flatpak-manual
+  needs: []
   variables:
     APPID: org.gtk.IconBrowser4
 
 flatpak-master:icon-browser:
   extends: .flatpak-master
+  needs: []
   variables:
     APPID: org.gtk.IconBrowser4
 
 static-scan:
   image: $FEDORA_IMAGE
   stage: analysis
+  needs: []
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
   script:
@@ -186,6 +220,7 @@ asan-build:
   image: $FEDORA_IMAGE
   tags: [ asan ]
   stage: analysis
+  needs: []
   variables:
   script:
     - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
@@ -199,6 +234,7 @@ asan-build:
 reference:
   image: $DOCS_IMAGE
   stage: docs
+  needs: []
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
@@ -214,6 +250,7 @@ reference:
 
 pages:
   stage: deploy
+  needs: ['reference']
   script:
     - mv _reference/ public/
   artifacts:

.gitlab-ci/fedora-base.Dockerfile

@@ -29,6 +29,7 @@ RUN dnf -y install \
     glib2-static \
     glibc-devel \
     glibc-headers \
+    gnome-desktop-testing \
     gobject-introspection-devel \
     graphene-devel \
     gstreamer1-devel \
@@ -75,7 +76,6 @@ RUN dnf -y install \
     python3-wheel \
     redhat-rpm-config \
     sassc \
-    sysprof-devel \
     systemtap-sdt-devel \
     vulkan-devel \
     wayland-devel \

.gitlab-ci/fedora.Dockerfile

@@ -1,8 +1,11 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v20
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v21
+
+# Enable sudo for wheel users
+RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user
 
 USER user
 WORKDIR /home/user

.gitlab-ci/run-tests.sh

@@ -12,13 +12,12 @@ export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp
 
 case "${backend}" in
   x11)
-    xvfb-run -a -s "-screen 0 1024x768x24" \
+    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
                 --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=gtk:a11y \
                 --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
@@ -38,7 +37,6 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=gtk:a11y \
                 --no-suite=gsk-compare-broadway
 
     exit_code=$?
@@ -57,7 +55,6 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=gtk:a11y \
                 --no-suite=gsk-compare-opengl
 
     # don't let Broadway failures fail the run, for now

.gitlab-ci/test-msys2.sh

@@ -33,17 +33,29 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
     mingw-w64-$MSYS2_ARCH-shared-mime-info
 
-# https://gitlab.gnome.org/GNOME/gtk/issues/2243
-wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst"
-pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst"
-
-# https://github.com/msys2/MINGW-packages/pull/6465
-pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli
-
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002
+
+if ! pkg-config --atleast-version=2.65.0 glib-2.0; then
+    git clone https://gitlab.gnome.org/GNOME/glib.git _glib
+    meson setup _glib_build _glib
+    meson compile -C _glib_build
+    meson install -C _glib_build
+fi
+pkg-config --modversion glib-2.0
+
+if ! pkg-config --atleast-version=1.45.4 pango; then
+    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
+    meson setup _pango_build _pango
+    meson compile -C _pango_build
+    meson install -C _pango_build
+fi
+pkg-config --modversion pango
+
 # Build
 ccache --zero-stats
 ccache --show-stats
@@ -56,7 +68,7 @@ meson \
     -Dwin32-backend=true \
     -Dvulkan=no \
     -Dintrospection=false \
-    --werror \
+    -Dgtk:werror=true \
     _build
 unset CCACHE_DISABLE
 

NEWS

@@ -1,6 +1,53 @@
+Overview of Changes in GTK 3.99.1
+=================================
+
+* GtkGridLayout: Rename left-/top-attach to column/row
+
+* Drop GtkAccelLabel - it is no longer used
+
+* GtkTextView:
+ - Fix redraw issues with selections
+ - Make insert-emoji replace the selection
+
+* GtkTreeView:
+ - Fix selection handling in cell editables
+
+* CSS:
+ - Hexadecimal colors can now specify alpha
+
+* Documentation:
+ - Refresh the widget gallery
+ - Add images for new widgets to the gallery
+ - Fix many cross-references
+
+* Demos:
+ - Numerous crash- and bug fixes
+
+* Fix build with cups < 2.3
+
+* win32:
+ - Default to the GL renderer when we can
+
+* Translation updates:
+  Catalan
+  Polish
+  Romanian
+  Spanish
+  Ukrainian
+
+
 Overview of Changes in GTK 3.99.0
 =================================
 
+* Remove the old accessibility implementation and
+  add the foundations for a new one that is based
+  on ARIA. The relevant widget api is GtkAccessible,
+  the backend implementations will use GtkATContext.
+  Currently, there is just a nascent test backend.
+
+* Update the GTK headers to use char *, int, float and
+  double instead of the corresponding GLib types.
+
 * Add GtkEditableLabel, a label that can be edited
 
 * Add GtkBookmarkList, a list model for bookmarks
@@ -35,6 +82,7 @@ Overview of Changes in GTK 3.99.0
 
 * GtkFilterListModel:
  - Add incremental filtering
+ - Add a boolean filter, GtkBoolFilter
 
 * GtkSortListModel:
  - Use timsort
@@ -51,13 +99,18 @@ Overview of Changes in GTK 3.99.0
 * Inspector:
  - Improve list model support
  - Add direct navigation between objects
+ - Show accessibility information
 
 * GDK:
  - Compress scroll events
  - Keep a scroll history
  - Clean up GdkDevice api
+ - Drop the master/slave device split
+ - Move axes to GdkDeviceTool
+ - Change monitor workarea to be per-backend API
  - Improve frame clock accuracy
  - Add a new macOS backend
+ - Add an ANGLE-based GLES renderer for Windows
 
 * GSK:
  - Use GL_ARB_framebuffer_object

README.md

@@ -56,7 +56,6 @@ building for:
   - [Pango](https://download.gnome.org/sources/pango)
   - [Epoxy](https://github.com/anholt/libepoxy)
   - [Graphene](https://github.com/ebassi/graphene)
-  - [ATK](https://download.gnome.org/sources/atk)
   - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)
 
 If you are building the X11 backend, you will also need:
@@ -70,7 +69,6 @@ If you are building the X11 backend, you will also need:
     - xcursor
     - xdamage
     - xcomposite
-  - [atk-bridge-2.0](https://download.gnome.org/sources/at-spi2-atk)
 
 If you are building the Wayland backend, you will also need:
 

demos/constraint-editor/constraint-editor.ui

@@ -13,8 +13,8 @@
           <object class="GtkLabel">
             <property name="label">Target</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -23,8 +23,8 @@
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <signal name="changed" handler="update_button" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -32,8 +32,8 @@
           <object class="GtkComboBoxText" id="target_attr">
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -41,8 +41,8 @@
           <object class="GtkLabel">
             <property name="label">Relation</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -50,8 +50,8 @@
           <object class="GtkComboBoxText" id="relation">
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -59,8 +59,8 @@
           <object class="GtkLabel">
             <property name="label">Source</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -69,8 +69,8 @@
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <signal name="changed" handler="update_button" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -79,8 +79,8 @@
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <signal name="changed" handler="source_attr_changed" swapped="yes"/>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -88,8 +88,8 @@
           <object class="GtkLabel">
             <property name="label">Multiplier</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -97,8 +97,8 @@
           <object class="GtkEntry" id="multiplier">
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -106,8 +106,8 @@
           <object class="GtkLabel">
             <property name="label">Constant</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -115,8 +115,8 @@
           <object class="GtkEntry" id="constant">
             <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>
@@ -124,16 +124,16 @@
           <object class="GtkLabel">
             <property name="label">Strength</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkComboBoxText" id="strength">
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
             </layout>
           </object>
         </child>
@@ -141,8 +141,8 @@
           <object class="GtkLabel" id="preview">
             <property name="xalign">0</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
               <property name="column-span">2</property>
             </layout>
             <attributes>
@@ -155,8 +155,8 @@
             <property name="label">Create</property>
             <signal name="clicked" handler="create_constraint"/>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
             </layout>
           </object>
         </child>

demos/constraint-editor/constraint-view.c

@@ -174,28 +174,25 @@ constraint_view_init (ConstraintView *self)
   manager = gtk_constraint_layout_new ();
   gtk_widget_set_layout_manager (GTK_WIDGET (self), manager);
 
-  all_children = gtk_widget_observe_children (GTK_WIDGET (self));
-  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
   guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
+
+  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
   filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
   constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, filter);
-  g_object_unref (filter);
+
+  all_children = gtk_widget_observe_children (GTK_WIDGET (self));
   filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
   children = (GListModel *)gtk_filter_list_model_new (all_children, filter);
-  g_object_unref (filter);
 
   list = g_list_store_new (G_TYPE_LIST_MODEL);
   g_list_store_append (list, children);
   g_list_store_append (list, guides);
   g_list_store_append (list, constraints);
-  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (list)));
   g_object_unref (children);
   g_object_unref (guides);
   g_object_unref (constraints);
-  g_object_unref (all_children);
-  g_object_unref (all_constraints);
-  g_object_unref (list);
 
+  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (list)));
 
   controller = (GtkEventController *)gtk_gesture_drag_new ();
   g_signal_connect (controller, "drag-begin", G_CALLBACK (drag_begin), self);

demos/constraint-editor/guide-editor.ui

@@ -55,8 +55,8 @@
           <object class="GtkLabel">
             <property name="label">Name</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -64,8 +64,8 @@
           <object class="GtkEntry" id="name">
             <property name="max-width-chars">20</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -74,8 +74,8 @@
           <object class="GtkLabel">
             <property name="label">Min Size</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -84,8 +84,8 @@
             <property name="adjustment">min_width_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -94,8 +94,8 @@
             <property name="adjustment">min_height_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -103,8 +103,8 @@
           <object class="GtkLabel">
             <property name="label">Nat Size</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -113,8 +113,8 @@
             <property name="adjustment">nat_width_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -123,8 +123,8 @@
             <property name="adjustment">nat_height_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -132,8 +132,8 @@
           <object class="GtkLabel">
             <property name="label">Max Size</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -142,8 +142,8 @@
             <property name="adjustment">max_width_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -152,8 +152,8 @@
             <property name="adjustment">max_height_adj</property>
             <property name="max-width-chars">5</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -161,16 +161,16 @@
           <object class="GtkLabel">
             <property name="label">Strength</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkComboBoxText" id="strength">
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -180,8 +180,8 @@
             <property name="label">Create</property>
             <signal name="clicked" handler="create_guide"/>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
             </layout>
           </object>
         </child>

demos/gtk-demo/application.ui

@@ -31,8 +31,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -54,8 +54,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -70,8 +70,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -79,8 +79,8 @@
           <object class="GtkStatusbar" id="status">
             <property name="hexpand">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>

demos/gtk-demo/blendmodes.ui

@@ -18,8 +18,8 @@
               <class name="dim-label"/>
             </style>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -29,8 +29,8 @@
             <property name="has-frame">1</property>
             <property name="min-content-width">150</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -40,8 +40,8 @@
             <property name="hexpand">1</property>
             <property name="stack">stack</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -67,8 +67,8 @@
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Duck</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -76,8 +76,8 @@
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Background</property>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -87,8 +87,8 @@
                           <class name="duck"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -98,8 +98,8 @@
                           <class name="gradient"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -108,8 +108,8 @@
                         <property name="label" translatable="yes">
 Blended picture</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -121,8 +121,8 @@ Blended picture</property>
                           <class name="blend0"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -146,8 +146,8 @@ Blended picture</property>
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Red</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -155,8 +155,8 @@ Blended picture</property>
                       <object class="GtkLabel">
                         <property name="label" translatable="yes">Blue</property>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -166,8 +166,8 @@ Blended picture</property>
                           <class name="red"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -177,8 +177,8 @@ Blended picture</property>
                           <class name="blue"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -187,8 +187,8 @@ Blended picture</property>
                         <property name="label" translatable="yes">
 Blended picture</property>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -200,8 +200,8 @@ Blended picture</property>
                           <class name="blend1"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                           <property name="column-span">2</property>
                         </layout>
                       </object>
@@ -228,8 +228,8 @@ Blended picture</property>
                           <class name="cyan"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -239,8 +239,8 @@ Blended picture</property>
                           <class name="magenta"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                         </layout>
                       </object>
                     </child>
@@ -250,8 +250,8 @@ Blended picture</property>
                           <class name="yellow"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                         </layout>
                       </object>
                     </child>
@@ -262,8 +262,8 @@ Blended picture</property>
                           <class name="blend2"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">1</property>
+                          <property name="row">3</property>
                         </layout>
                       </object>
                     </child>
@@ -275,8 +275,8 @@ Blended picture</property>
                           <class name="dim-label"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -288,8 +288,8 @@ Blended picture</property>
                           <class name="dim-label"/>
                         </style>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                         </layout>
                       </object>
                     </child>
@@ -301,8 +301,8 @@ Blended picture</property>
                           <class name="dim-label"/>
                         </style>
                         <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                         </layout>
                       </object>
                     </child>
@@ -314,8 +314,8 @@ Blended picture</property>
                           <attribute name="weight" value="bold"></attribute>
                         </attributes>
                         <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">1</property>
+                          <property name="row">2</property>
                         </layout>
                       </object>
                     </child>
@@ -324,8 +324,8 @@ Blended picture</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>

demos/gtk-demo/demo.ui

@@ -95,9 +95,6 @@
     <property name="program-name" translatable="yes">Builder demo</property>
     <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
     <property name="modal">True</property>
-    <accessibility>
-      <relation target="window1" type="subwindow-of"/>
-    </accessibility>
   </object>
   <object class="GtkWindow" id="window1">
     <property name="default-height">250</property>
@@ -113,11 +110,6 @@
         </child>
         <child>
           <object class="GtkBox" id="toolbar1">
-            <child internal-child="accessible">
-              <object class="AtkObject" id="a11y-toolbar">
-                <property name="AtkObject::accessible-name">The toolbar</property>
-              </object>
-            </child>
             <child>
               <object class="GtkButton">
                 <property name="label" translatable="yes">New</property>
@@ -174,14 +166,6 @@
               <object class="GtkTreeView" id="treeview1">
                 <property name="model">liststore1</property>
                 <property name="tooltip-column">3</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="a11y-treeview">
-                    <property name="AtkObject::accessible-name">Name list</property>
-                    <property name="AtkObject::accessible-description">
-                                    A list of person with name, surname and age columns
-                                  </property>
-                  </object>
-                </child>
                 <child>
                   <object class="GtkTreeViewColumn" id="column1">
                     <property name="title">Name</property>

demos/gtk-demo/demotaggedentry.c

@@ -23,14 +23,12 @@
 #include "demotaggedentry.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtk-a11y.h>
 
 struct _DemoTaggedEntry
 {
   GtkWidget parent_instance;
 
-  GtkWidget *box;
-  GtkWidget *entry;
+  GtkWidget *text;
 };
 
 struct _DemoTaggedEntryClass
@@ -46,15 +44,10 @@ G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
 static void
 demo_tagged_entry_init (DemoTaggedEntry *entry)
 {
-  entry->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (entry->box, GTK_WIDGET (entry));
-
-  entry->entry = gtk_text_new ();
-  gtk_widget_set_hexpand (entry->entry, TRUE);
-  gtk_widget_set_vexpand (entry->entry, TRUE);
-  gtk_widget_set_hexpand (entry->box, FALSE);
-  gtk_widget_set_vexpand (entry->box, FALSE);
-  gtk_box_append (GTK_BOX (entry->box), entry->entry);
+  entry->text = gtk_text_new ();
+  gtk_widget_set_hexpand (entry->text, TRUE);
+  gtk_widget_set_vexpand (entry->text, TRUE);
+  gtk_widget_set_parent (entry->text, GTK_WIDGET (entry));
   gtk_editable_init_delegate (GTK_EDITABLE (entry));
 }
 
@@ -62,12 +55,15 @@ static void
 demo_tagged_entry_dispose (GObject *object)
 {
   DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (object);
+  GtkWidget *child;
 
-  if (entry->entry)
+  if (entry->text)
     gtk_editable_finish_delegate (GTK_EDITABLE (entry));
 
-  g_clear_pointer (&entry->entry, gtk_widget_unparent);
-  g_clear_pointer (&entry->box, gtk_widget_unparent);
+  while ((child = gtk_widget_get_first_child (GTK_WIDGET (entry))))
+    gtk_widget_unparent (child);
+
+  entry->text = NULL;
 
   G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object);
 }
@@ -101,7 +97,7 @@ demo_tagged_entry_grab_focus (GtkWidget *widget)
 {
   DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);
 
-  return gtk_widget_grab_focus (entry->entry);
+  return gtk_widget_grab_focus (entry->text);
 }
 
 static void
@@ -118,15 +114,14 @@ demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)
 
   gtk_editable_install_properties (object_class, 1);
 
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
   gtk_widget_class_set_css_name (widget_class, "entry");
 }
 
 static GtkEditable *
 demo_tagged_entry_get_delegate (GtkEditable *editable)
 {
-  return GTK_EDITABLE (DEMO_TAGGED_ENTRY (editable)->entry);
+  return GTK_EDITABLE (DEMO_TAGGED_ENTRY (editable)->text);
 }
 
 static void
@@ -147,7 +142,7 @@ demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
 {
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  gtk_box_append (GTK_BOX (entry->box), tag);
+  gtk_widget_set_parent (tag, GTK_WIDGET (entry));
 }
 
 void
@@ -157,10 +152,7 @@ demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
 {
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  if (sibling == NULL)
-    gtk_box_append (GTK_BOX (entry->box), tag);
-  else
-    gtk_box_insert_child_after (GTK_BOX (entry->box), tag, sibling);
+  gtk_widget_insert_after (tag, GTK_WIDGET (entry), sibling);
 }
 
 void
@@ -169,7 +161,7 @@ demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
 {
   g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));
 
-  gtk_box_remove (GTK_BOX (entry->box), tag);
+  gtk_widget_unparent (tag);
 }
 
 struct _DemoTaggedEntryTag

demos/gtk-demo/dropdown.c

@@ -254,7 +254,7 @@ do_dropdown (GtkWidget *do_widget)
       gtk_widget_set_margin_bottom (box, 10);
       gtk_window_set_child (GTK_WINDOW (window), box);
 
-      button = gtk_drop_down_new ();
+      button = gtk_drop_down_new (NULL, NULL);
 
       model = G_LIST_MODEL (pango_cairo_font_map_get_default ());
       gtk_drop_down_set_model (GTK_DROP_DOWN (button), model);

demos/gtk-demo/filtermodel.ui

@@ -45,12 +45,9 @@
             <attributes>
               <attribute name="weight" value="bold"></attribute>
             </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview1"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -83,12 +80,9 @@
                 </child>
               </object>
             </child>
-            <accessibility>
-              <relation type="labelled-by" target="label1"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -133,12 +127,9 @@
                 </child>
               </object>
             </child>
-            <accessibility>
-              <relation type="labelled-by" target="label2"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -149,12 +140,9 @@
             <attributes>
               <attribute name="weight" value="bold"></attribute>
             </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview2"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -165,12 +153,9 @@
             <attributes>
               <attribute name="weight" value="bold"></attribute>
             </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview3"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -197,12 +182,9 @@
                 </child>
               </object>
             </child>
-            <accessibility>
-              <relation type="labelled-by" target="label3"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>

demos/gtk-demo/fishbowl.c

@@ -209,7 +209,7 @@ set_widget_type (GtkFishbowl *fishbowl,
                         widget_types[selected_widget_type].name);
 }
 
-void
+G_MODULE_EXPORT void
 fishbowl_next_button_clicked_cb (GtkButton *source,
                                  gpointer   user_data)
 {
@@ -224,7 +224,7 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
   set_widget_type (fishbowl, new_index);
 }
 
-void
+G_MODULE_EXPORT void
 fishbowl_prev_button_clicked_cb (GtkButton *source,
                                  gpointer   user_data)
 {
@@ -239,7 +239,7 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
   set_widget_type (fishbowl, new_index);
 }
 
-void
+G_MODULE_EXPORT void
 fishbowl_changes_toggled_cb (GtkToggleButton *button,
                              gpointer         user_data)
 {
@@ -249,7 +249,7 @@ fishbowl_changes_toggled_cb (GtkToggleButton *button,
     gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow");
 }
 
-char *
+G_MODULE_EXPORT char *
 format_header_cb (GObject *object,
                   guint    count,
                   double   fps)

demos/gtk-demo/font_features.c

@@ -130,6 +130,10 @@ static const char *
 get_feature_display_name (unsigned int tag)
 {
   int i;
+  static char buf[5] = { 0, };
+
+  if (tag == MAKE_TAG ('x', 'x', 'x', 'x'))
+    return _("Default");
 
   for (i = 0; i < G_N_ELEMENTS (open_type_layout_features); i++)
     {
@@ -137,7 +141,10 @@ get_feature_display_name (unsigned int tag)
         return g_dpgettext2 (NULL, "OpenType layout", open_type_layout_features[i].name);
     }
 
-  return NULL;
+  hb_tag_to_string (tag, buf);
+  g_warning ("unknown OpenType layout feature tag: %s", buf);
+
+  return buf;
 }
 
 static void update_display (void);
@@ -1285,8 +1292,7 @@ do_font_features (GtkWidget *do_widget)
                                                                             "palt",
                                                                             "twid",
                                                                             "qwid", NULL });
-      add_check_group (feature_list, _("Alternative Stylistic Sets"), (const char *[]){ "ss00",
-                                                                                        "ss01",
+      add_check_group (feature_list, _("Alternative Stylistic Sets"), (const char *[]){ "ss01",
                                                                                         "ss02",
                                                                                         "ss03",
                                                                                         "ss04",

demos/gtk-demo/fontrendering.c

@@ -21,12 +21,6 @@ static PangoContext *context;
 
 static int scale = 10;
 
-static void
-on_destroy (gpointer data)
-{
-  window = NULL;
-}
-
 static void
 update_image (void)
 {
@@ -251,9 +245,7 @@ do_fontrendering (GtkWidget *do_widget)
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (on_destroy), NULL);
-      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
       font_button = GTK_WIDGET (gtk_builder_get_object (builder, "font_button"));
       up_button = GTK_WIDGET (gtk_builder_get_object (builder, "up_button"));
       down_button = GTK_WIDGET (gtk_builder_get_object (builder, "down_button"));
@@ -276,6 +268,8 @@ do_fontrendering (GtkWidget *do_widget)
       g_signal_connect (show_extents, "notify::active", G_CALLBACK (update_image), NULL);
 
       update_image ();
+
+      g_object_unref (builder);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/fontrendering.ui

@@ -28,7 +28,7 @@
           <object class="GtkEntry" id="entry">
             <property name="text">Fonts render</property>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
             </layout>
           </object>
         </child>
@@ -41,16 +41,16 @@
               <class name="dim-label"/>
             </style>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkFontButton" id="font_button">
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -62,7 +62,7 @@
               <class name="dim-label"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
+              <property name="column">2</property>
             </layout>
           </object>
         </child>
@@ -77,7 +77,7 @@
               <item translatable="yes" id="full">Full</item>
             </items>
             <layout>
-              <property name="left-attach">3</property>
+              <property name="column">3</property>
             </layout>
           </object>
         </child>
@@ -92,8 +92,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">3</property>
-              <property name="top-attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -109,8 +109,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -126,8 +126,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -138,8 +138,8 @@
               <class name="circular"/>
             </style>
             <layout>
-              <property name="left-attach">5</property>
-              <property name="top-attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -150,8 +150,8 @@
               <class name="circular"/>
             </style>
             <layout>
-              <property name="left-attach">5</property>
-              <property name="top-attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -159,7 +159,7 @@
           <object class="GtkLabel">
             <property name="hexpand">1</property>
             <layout>
-              <property name="left-attach">6</property>
+              <property name="column">6</property>
             </layout>
           </object>
         </child>
@@ -184,8 +184,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
               <property name="column-span">7</property>
             </layout>
           </object>
@@ -204,8 +204,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
               <property name="column-span">7</property>
             </layout>
           </object>

demos/gtk-demo/glarea-gles.fs.glsl

@@ -1,7 +1,7 @@
 precision highp float;
 
 void main() {
-  float lerpVal = gl_FragCoord.y / 500.0f;
+  float lerpVal = gl_FragCoord.y / 500.0;
 
-  gl_FragColor = mix(vec4(1.0f, 0.85f, 0.35f, 1.0f), vec4(0.2f, 0.2f, 0.2f, 1.0f), lerpVal);
+  gl_FragColor = mix(vec4(1.0, 0.85, 0.35, 1.0), vec4(0.2, 0.2, 0.2, 1.0), lerpVal);
 }

demos/gtk-demo/iconscroll.c

@@ -220,7 +220,7 @@ set_widget_type (int type)
   tick_cb = gtk_widget_add_tick_callback (window, scroll_cb, NULL, NULL);
 }
 
-void
+G_MODULE_EXPORT void
 iconscroll_next_clicked_cb (GtkButton *source,
                             gpointer   user_data)
 {
@@ -235,7 +235,7 @@ iconscroll_next_clicked_cb (GtkButton *source,
   set_widget_type (new_index);
 }
 
-void
+G_MODULE_EXPORT void
 iconscroll_prev_clicked_cb (GtkButton *source,
                             gpointer   user_data)
 {
@@ -249,7 +249,7 @@ iconscroll_prev_clicked_cb (GtkButton *source,
   set_widget_type (new_index);
 }
 
-GtkWidget *
+G_MODULE_EXPORT GtkWidget *
 do_iconscroll (GtkWidget *do_widget)
 {
   if (!window)

demos/gtk-demo/listbox.ui

@@ -26,8 +26,8 @@
             <property name="margin-end">8</property>
             <property name="icon-name">image-missing</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
               <property name="row-span">5</property>
             </layout>
           </object>
@@ -71,8 +71,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -84,12 +84,9 @@
             <property name="yalign">0</property>
             <property name="label" translatable="0">Message</property>
             <property name="wrap">1</property>
-            <accessibility>
-              <role type="static"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -114,8 +111,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -168,8 +165,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -184,27 +181,17 @@
                     <property name="margin-bottom">2</property>
                     <property name="spacing">8</property>
                     <child>
-                      <object class="GtkFrame" id="frame1">
-                        <child>
-                          <object class="GtkLabel" id="n_reshares_label">
-                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
+                      <object class="GtkLabel" id="n_reshares_label">
+                        <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 Reshares</property>
-                            <property name="use-markup">1</property>
-                          </object>
-                        </child>
-                        <child type="label_item"/>
+                        <property name="use-markup">1</property>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkFrame" id="frame2">
-                        <child>
-                          <object class="GtkLabel" id="n_favorites_label">
-                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
+                      <object class="GtkLabel" id="n_favorites_label">
+                        <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 FAVORITES</property>
-                            <property name="use-markup">1</property>
-                          </object>
-                        </child>
-                        <child type="label_item"/>
+                        <property name="use-markup">1</property>
                       </object>
                     </child>
                   </object>
@@ -234,8 +221,8 @@ FAVORITES</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>

demos/gtk-demo/listview_applauncher.c

@@ -166,14 +166,6 @@ do_listview_applauncher (GtkWidget *do_widget)
       g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
       g_signal_connect (factory, "bind", G_CALLBACK (bind_listitem_cb), NULL);
 
-      /* Create the list widget here.
-       */
-      list = gtk_list_view_new_with_factory (factory);
-      /* We connect the activate signal here. It's the function we defined
-       * above for launching the selected application.
-       */
-      g_signal_connect (list, "activate", G_CALLBACK (activate_cb), NULL);
-
       /* And of course we need to set the data model. Here we call the function
        * we wrote above that gives us the list of applications. Then we set
        * it on the list widget.
@@ -181,8 +173,15 @@ do_listview_applauncher (GtkWidget *do_widget)
        * to create as many listitems as it needs to show itself to the user.
        */
       model = create_application_list ();
-      gtk_list_view_set_model (GTK_LIST_VIEW (list), model);
-      g_object_unref (model);
+
+      /* Create the list widget here.
+       */
+      list = gtk_list_view_new_with_factory (model, factory);
+
+      /* We connect the activate signal here. It's the function we defined
+       * above for launching the selected application.
+       */
+      g_signal_connect (list, "activate", G_CALLBACK (activate_cb), NULL);
 
       /* List widgets should always be contained in a #GtkScrolledWindow,
        * because otherwise they might get too large or they might not

demos/gtk-demo/listview_clocks.c

@@ -463,7 +463,6 @@ do_listview_clocks (GtkWidget *do_widget)
       GtkWidget *gridview, *sw;
       GtkListItemFactory *factory;
       GListModel *model;
-      GtkNoSelection *selection;
 
       /* This is the normal window setup code every demo does */
       window = gtk_window_new ();
@@ -485,16 +484,12 @@ do_listview_clocks (GtkWidget *do_widget)
       factory = gtk_signal_list_item_factory_new ();
       g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
 
-      gridview = gtk_grid_view_new_with_factory (factory);
+      model = G_LIST_MODEL (gtk_no_selection_new (create_clocks_model ()));
+      gridview = gtk_grid_view_new_with_factory (model, factory);
       gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
       gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
 
-      model = create_clocks_model ();
-      selection = gtk_no_selection_new (model);
-      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
-      g_object_unref (selection);
-      g_object_unref (model);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/listview_colors.c

@@ -226,7 +226,7 @@ gtk_color_set_property (GObject      *object,
       break;
 
     case PROP_COLOR:
-      self->color = *(GdkRGBA *) g_value_dup_boxed (value);
+      self->color = *(GdkRGBA *) g_value_get_boxed (value);
       rgb_to_hsv (&self->color, &h, &s, &v);
       self->h = round (360 * h);
       self->s = round (100 * s);
@@ -663,7 +663,7 @@ create_color_grid (void)
   GtkWidget *gridview;
   GtkListItemFactory *factory;
 
-  gridview = gtk_grid_view_new ();
+  gridview = gtk_grid_view_new (NULL);
   gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
   gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
 
@@ -884,7 +884,7 @@ do_listview_colors (GtkWidget *do_widget)
 
       sort_model = gtk_sort_list_model_new (gtk_color_list_new (0), NULL);
       gtk_sort_list_model_set_incremental (sort_model, TRUE);
-      selection = GTK_MULTI_SELECTION (gtk_multi_selection_new (G_LIST_MODEL (sort_model)));
+      selection = gtk_multi_selection_new (G_LIST_MODEL (sort_model));
 
       window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Colors");
@@ -950,7 +950,7 @@ do_listview_colors (GtkWidget *do_widget)
 
       factory = gtk_signal_list_item_factory_new ();
       g_signal_connect (factory, "setup", G_CALLBACK (setup_selection_listitem_cb), NULL);
-      selection_view = gtk_grid_view_new_with_factory (factory);
+      selection_view = gtk_grid_view_new_with_factory (NULL, factory);
       gtk_widget_add_css_class (selection_view, "compact");
       gtk_grid_view_set_max_columns (GTK_GRID_VIEW (selection_view), 200);
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), selection_view);
@@ -970,7 +970,6 @@ do_listview_colors (GtkWidget *do_widget)
 
       no_selection = G_LIST_MODEL (gtk_no_selection_new (selection_filter));
       gtk_grid_view_set_model (GTK_GRID_VIEW (selection_view), no_selection);
-      g_object_unref (selection_filter);
       g_object_unref (no_selection);
 
       selection_info_toggle = gtk_toggle_button_new ();
@@ -1003,8 +1002,7 @@ do_listview_colors (GtkWidget *do_widget)
       g_signal_connect (selection, "items-changed", G_CALLBACK (items_changed_cb), label);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), label);
 
-      dropdown = gtk_drop_down_new ();
-      gtk_drop_down_set_from_strings (GTK_DROP_DOWN (dropdown), (const char *[]) { "8", "64", "512", "4096", "32768", "262144", "2097152", "16777216", NULL });
+      dropdown = gtk_drop_down_new_from_strings  ((const char * const[]) { "8", "64", "512", "4096", "32768", "262144", "2097152", "16777216", NULL });
       g_signal_connect (dropdown, "notify::selected",
                         G_CALLBACK (limit_changed_cb), 
                         gtk_sort_list_model_get_model (sort_model));
@@ -1082,22 +1080,17 @@ do_listview_colors (GtkWidget *do_widget)
       g_list_store_append (sorters, multi_sorter);
       g_object_unref (multi_sorter);
 
-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (box), gtk_label_new ("Sort by:"));
-      gtk_box_append (GTK_BOX (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
       expression = gtk_cclosure_expression_new (G_TYPE_STRING,
                                                 NULL,
                                                 0, NULL,
                                                 (GCallback)get_title,
                                                 NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
 
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (sorters));
-      g_object_unref (sorters);
+      dropdown = gtk_drop_down_new (G_LIST_MODEL (sorters), expression);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+      gtk_box_append (GTK_BOX (box), gtk_label_new ("Sort by:"));
+      gtk_box_append (GTK_BOX (box), dropdown);
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
 
       g_object_bind_property (dropdown, "selected-item", sort_model, "sorter", G_BINDING_SYNC_CREATE);
 
@@ -1113,24 +1106,20 @@ do_listview_colors (GtkWidget *do_widget)
       set_title (factory, "Everything");
       g_list_store_append (factories, factory);
 
-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (box), gtk_label_new ("Show:"));
-      gtk_box_append (GTK_BOX (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
       expression = gtk_cclosure_expression_new (G_TYPE_STRING,
                                                 NULL,
                                                 0, NULL,
                                                 (GCallback)get_title,
                                                 NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
-
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (factories));
-      g_object_unref (factories);
+      dropdown = gtk_drop_down_new (G_LIST_MODEL (factories), expression);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+      gtk_box_append (GTK_BOX (box), gtk_label_new ("Show:"));
+      gtk_box_append (GTK_BOX (box), dropdown);
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
 
       g_object_bind_property (dropdown, "selected-item", gridview, "factory", G_BINDING_SYNC_CREATE);
+
+      g_object_unref (selection);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/listview_settings.c

@@ -214,7 +214,6 @@ transform_settings_to_keys (GBinding     *binding,
   GtkSortListModel *sort_model;
   GtkFilterListModel *filter_model;
   GtkFilter *filter;
-  GtkNoSelection *selection_model;
   char **keys;
   guint i;
 
@@ -242,21 +241,13 @@ transform_settings_to_keys (GBinding     *binding,
   g_object_unref (settings);
 
   sort_model = gtk_sort_list_model_new (G_LIST_MODEL (store),
-                                        gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data)));
-  g_object_unref (store);
+                                        g_object_ref (gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data))));
 
   filter = gtk_string_filter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
-  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
-  g_object_unref (sort_model);
-
   g_set_object (&current_filter, filter);
+  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
 
-  g_object_unref (filter);
-
-  selection_model = gtk_no_selection_new (G_LIST_MODEL (filter_model));
-  g_object_unref (filter_model);
-
-  g_value_take_object (to_value, selection_model);
+  g_value_take_object (to_value, gtk_no_selection_new (G_LIST_MODEL (filter_model)));
 
   return TRUE;
 }
@@ -367,6 +358,8 @@ do_listview_settings (GtkWidget *do_widget)
 
       builder = gtk_builder_new ();
       gtk_builder_set_scope (builder, scope);
+      g_object_unref (scope);
+
       gtk_builder_add_from_resource (builder, "/listview_settings/listview_settings.ui", NULL);
 
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
@@ -403,8 +396,8 @@ do_listview_settings (GtkWidget *do_widget)
       g_object_unref (actions);
 
       model = create_settings_model (NULL, NULL);
-      treemodel = gtk_tree_list_model_new (FALSE,
-                                           model,
+      treemodel = gtk_tree_list_model_new (model,
+                                           FALSE,
                                            TRUE,
                                            create_settings_model,
                                            NULL,
@@ -418,8 +411,6 @@ do_listview_settings (GtkWidget *do_widget)
                                    columnview, NULL);
       gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
       g_object_unref (selection);
-      g_object_unref (treemodel);
-      g_object_unref (model);
 
       name_column = GTK_COLUMN_VIEW_COLUMN (gtk_builder_get_object (builder, "name_column"));
       sorter = gtk_string_sorter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));

demos/gtk-demo/listview_weather.c

@@ -281,20 +281,16 @@ GtkWidget *
 create_weather_view (void)
 {
   GtkWidget *listview;
-  GListModel *model, *selection;
+  GListModel *model;
   GtkListItemFactory *factory;
 
   factory = gtk_signal_list_item_factory_new ();
   g_signal_connect (factory, "setup", G_CALLBACK (setup_widget), NULL);
   g_signal_connect (factory, "bind", G_CALLBACK (bind_widget), NULL);
-  listview = gtk_list_view_new_with_factory (factory);
+  model = G_LIST_MODEL (gtk_no_selection_new (create_weather_model ()));
+  listview = gtk_list_view_new_with_factory (model, factory);
   gtk_orientable_set_orientation (GTK_ORIENTABLE (listview), GTK_ORIENTATION_HORIZONTAL);
   gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
-  model = create_weather_model ();
-  selection = G_LIST_MODEL (gtk_no_selection_new (model));
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
-  g_object_unref (selection);
-  g_object_unref (model);
 
   return listview;
 }

demos/gtk-demo/listview_words.c

@@ -65,6 +65,7 @@ read_lines_cb (GObject      *object,
     {
       g_print ("Could not read data: %s\n", error->message);
       g_clear_error (&error);
+      g_object_unref (stringlist);
       return;
     }
 
@@ -74,6 +75,7 @@ read_lines_cb (GObject      *object,
     {
       if (size)
         gtk_string_list_take (stringlist, g_utf8_make_valid (buffer, size));
+      g_object_unref (stringlist);
       return;
     }
 
@@ -121,6 +123,7 @@ file_is_open_cb (GObject      *file,
     {
       g_print ("Could not open file: %s\n", error->message);
       g_error_free (error);
+      g_object_unref (data);
       return;
     }
 
@@ -134,7 +137,7 @@ load_file (GtkStringList *list,
            GFile         *file)
 {
   gtk_string_list_splice (list, 0, g_list_model_get_n_items (G_LIST_MODEL (list)), NULL);
-  g_file_read_async (file, G_PRIORITY_HIGH_IDLE, NULL, file_is_open_cb, list);
+  g_file_read_async (file, G_PRIORITY_HIGH_IDLE, NULL, file_is_open_cb, g_object_ref (list));
 }
 
 static void
@@ -157,7 +160,6 @@ do_listview_words (GtkWidget *do_widget)
     {
       GtkWidget *header, *listview, *sw, *vbox, *search_entry, *open_button, *overlay;
       GtkFilterListModel *filter_model;
-      GtkNoSelection *selection;
       GtkStringList *stringlist;
       GtkFilter *filter;
       GFile *file;
@@ -175,6 +177,7 @@ do_listview_words (GtkWidget *do_widget)
           stringlist = gtk_string_list_new ((const char **) words);
           g_strfreev (words);
         }
+      g_object_unref (file);
 
       filter = gtk_string_filter_new (gtk_property_expression_new (GTK_TYPE_STRING_OBJECT, NULL, "string"));
       filter_model = gtk_filter_list_model_new (G_LIST_MODEL (stringlist), filter);
@@ -215,18 +218,15 @@ do_listview_words (GtkWidget *do_widget)
       gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);
 
       listview = gtk_list_view_new_with_factory (
+          G_LIST_MODEL (gtk_no_selection_new (G_LIST_MODEL (filter_model))),
           gtk_builder_list_item_factory_new_from_bytes (NULL,
               g_bytes_new_static (factory_text, strlen (factory_text))));
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
-      selection = gtk_no_selection_new (G_LIST_MODEL (filter_model));
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
-      g_object_unref (selection);
 
       g_signal_connect (filter_model, "items-changed", G_CALLBACK (update_title_cb), progress);
       g_signal_connect (filter_model, "notify::pending", G_CALLBACK (update_title_cb), progress);
       update_title_cb (filter_model);
 
-      g_object_unref (filter_model);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/main.c

@@ -146,10 +146,16 @@ activate_about (GSimpleAction *action,
     NULL
   };
   char *version;
+  char *os_name;
+  char *os_version;
   GString *s;
 
   s = g_string_new ("");
 
+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  if (os_name && os_version)
+    g_string_append_printf (s, "OS\t%s %s\n\n", os_name, os_version);
   g_string_append (s, "System libraries\n");
   g_string_append_printf (s, "\tGLib\t%d.%d.%d\n",
                           glib_major_version,
@@ -184,6 +190,8 @@ activate_about (GSimpleAction *action,
 
   g_string_free (s, TRUE);
   g_free (version);
+  g_free (os_name);
+  g_free (os_version);
 }
 
 static void
@@ -226,373 +234,113 @@ activate_run (GSimpleAction *action,
   gtk_demo_run (demo, window);
 }
 
-/* Stupid syntax highlighting.
- *
- * No regex was used in the making of this highlighting.
- * It should only work for simple cases.  This is good, as
- * that's all we should have in the demos.
- */
-/* This code should not be used elsewhere, except perhaps as an example of how
- * to iterate through a text buffer.
- */
-enum {
-  STATE_NORMAL,
-  STATE_IN_COMMENT
-};
-
-static const char *tokens[] =
+static GBytes *
+fontify_text (const char *format,
+              const char *text)
 {
-  "/*",
-  "\"",
-  NULL
-};
+  GSubprocess *subprocess;
+  GBytes *stdin_buf;
+  GBytes *stdout_buf = NULL;
+  GBytes *stderr_buf = NULL;
+  GError *error = NULL;
+  char *format_arg;
 
-static const char *types[] =
-{
-  "static",
-  "const ",
-  "void",
-  " int ",
-  " char ",
-  "char ",
-  "float",
-  "double",
-  "gint8",
-  "gint16",
-  "gint32",
-  "guint",
-  "guint8",
-  "guint16",
-  "guint32",
-  "guchar",
-  "glong",
-  "gboolean" ,
-  "gshort",
-  "gushort",
-  "gulong",
-  "gpointer",
-  "NULL",
-  "GList",
-  "GSList",
-  "FALSE",
-  "TRUE",
-  "FILE ",
-  "GtkColorSelection ",
-  "GtkWidget ",
-  "GtkButton ",
-  "GdkColor ",
-  "GdkRectangle ",
-  "GdkEventExpose ",
-  "GdkGC ",
-  "GdkPixbufLoader ",
-  "GdkPixbuf ",
-  "GError",
-  "size_t",
-  "GtkAboutDialog ",
-  "GtkAction ",
-  "GtkActionEntry ",
-  "GtkRadioActionEntry ",
-  "GtkIconFactory ",
-  "GtkTextBuffer ",
-  "GtkStatusbar ",
-  "GtkTextIter ",
-  "GtkTextMark ",
-  "GdkEventWindowState ",
-  "GtkActionGroup ",
-  "GtkUIManager ",
-  "GtkRadioAction ",
-  "GtkActionClass ",
-  "GtkToggleActionEntry ",
-  "GtkAssistant ",
-  "GtkBuilder ",
-  "GtkSizeGroup ",
-  "GtkTreeModel ",
-  "GtkTreeSelection ",
-  "GdkDisplay ",
-  "GdkScreen ",
-  "GdkSurface ",
-  "GdkEventButton ",
-  "GdkCursor ",
-  "GtkTreeIter ",
-  "GtkTreeViewColumn ",
-  "GdkDisplayManager ",
-  "GdkClipboard ",
-  "GtkIconSize ",
-  "GtkImage ",
-  "GdkDragContext ",
-  "GtkSelectionData ",
-  "GtkDialog ",
-  "GtkMenuItem ",
-  "GtkListStore ",
-  "GtkCellLayout ",
-  "GtkCellRenderer ",
-  "GtkTreePath ",
-  "GtkTreeStore ",
-  "GtkEntry ",
-  "GtkEditable ",
-  "GtkEditableInterface ",
-  "GdkPixmap ",
-  "GdkEventConfigure ",
-  "GdkEventMotion ",
-  "GdkModifierType ",
-  "GtkEntryCompletion ",
-  "GtkToolItem ",
-  "GDir ",
-  "GtkIconView ",
-  "GtkCellRendererText ",
-  "GtkContainer ",
-  "GtkPaned ",
-  "GtkPrintOperation ",
-  "GtkPrintContext ",
-  "cairo_t ",
-  "PangoLayout "
-  "PangoFontDescription ",
-  "PangoRenderer ",
-  "PangoMatrix ",
-  "PangoContext ",
-  "PangoLayout ",
-  "GtkToggleButton ",
-  "GString ",
-  "GtkIconSize ",
-  "GtkTreeView ",
-  "GtkTextTag ",
-  "GdkEvent ",
-  "GdkEventKey ",
-  "GtkTextView ",
-  "GdkBitmap ",
-  "GtkTextChildAnchor ",
-  "GArray ",
-  "GtkCellEditable ",
-  "GtkCellRendererToggle ",
-  NULL
-};
+  format_arg = g_strconcat ("--syntax=", format, NULL);
+  subprocess = g_subprocess_new (G_SUBPROCESS_FLAGS_STDIN_PIPE |
+                                 G_SUBPROCESS_FLAGS_STDOUT_PIPE |
+                                 G_SUBPROCESS_FLAGS_STDERR_PIPE,
+                                 &error,
+                                 "highlight",
+                                 format_arg,
+                                 "--out-format=pango",
+                                 NULL);
+  g_free (format_arg);
 
-static const char *control[] =
-{
-  " if ",
-  " while ",
-  " else",
-  " do ",
-  " for ",
-  "?",
-  ":",
-  "return ",
-  "goto ",
-  NULL
-};
-void
-parse_chars (char        *text,
-             char       **end_ptr,
-             int         *state,
-             const char **tag,
-             gboolean     start)
-{
-  int i;
-  char *next_token;
-
-  /* Handle comments first */
-  if (*state == STATE_IN_COMMENT)
+  if (!subprocess)
     {
-      *end_ptr = strstr (text, "*/");
-      if (*end_ptr)
+      if (g_error_matches (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT))
         {
-          *end_ptr += 2;
-          *state = STATE_NORMAL;
-          *tag = "comment";
-        }
-      return;
-    }
+          static gboolean warned = FALSE;
 
-  *tag = NULL;
-  *end_ptr = NULL;
-
-  /* check for comment */
-  if (!strncmp (text, "/*", 2))
-    {
-      *end_ptr = strstr (text, "*/");
-      if (*end_ptr)
-        *end_ptr += 2;
-      else
-        *state = STATE_IN_COMMENT;
-      *tag = "comment";
-      return;
-    }
-
-  /* check for preprocessor defines */
-  if (*text == '#' && start)
-    {
-      *end_ptr = NULL;
-      *tag = "preprocessor";
-      return;
-    }
-
-  /* functions */
-  if (start && * text != '\t' && *text != ' ' && *text != '{' && *text != '}')
-    {
-      if (strstr (text, "("))
-        {
-          *end_ptr = strstr (text, "(");
-          *tag = "function";
-          return;
-        }
-    }
-  /* check for types */
-  for (i = 0; types[i] != NULL; i++)
-    if (!strncmp (text, types[i], strlen (types[i])) ||
-        (start && types[i][0] == ' ' && !strncmp (text, types[i] + 1, strlen (types[i]) - 1)))
-      {
-        *end_ptr = text + strlen (types[i]);
-        *tag = "type";
-        return;
-      }
-
-  /* check for control */
-  for (i = 0; control[i] != NULL; i++)
-    if (!strncmp (text, control[i], strlen (control[i])))
-      {
-        *end_ptr = text + strlen (control[i]);
-        *tag = "control";
-        return;
-      }
-
-  /* check for string */
-  if (text[0] == '"')
-    {
-      int maybe_escape = FALSE;
-
-      *end_ptr = text + 1;
-      *tag = "string";
-      while (**end_ptr != '\000')
-        {
-          if (**end_ptr == '\"' && !maybe_escape)
+          if (!warned)
             {
-              *end_ptr += 1;
-              return;
+              warned = TRUE;
+              g_message ("For syntax highlighting, install the “highlight” program");
             }
-          if (**end_ptr == '\\')
-            maybe_escape = TRUE;
-          else
-            maybe_escape = FALSE;
-          *end_ptr += 1;
         }
-      return;
+      else
+        g_warning ("%s", error->message);
+
+      g_clear_error (&error);
+
+      return NULL;
     }
 
-  /* not at the start of a tag.  Find the next one. */
-  for (i = 0; tokens[i] != NULL; i++)
+  stdin_buf = g_bytes_new_static (text, strlen (text));
+
+  if (!g_subprocess_communicate (subprocess,
+                                 stdin_buf,
+                                 NULL,
+                                 &stdout_buf,
+                                 &stderr_buf,
+                                 &error))
     {
-      next_token = strstr (text, tokens[i]);
-      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+      g_clear_pointer (&stdin_buf, g_bytes_unref);
+      g_clear_pointer (&stdout_buf, g_bytes_unref);
+      g_clear_pointer (&stderr_buf, g_bytes_unref);
+
+      g_warning ("%s", error->message);
+      g_clear_error (&error);
+
+      return NULL;
     }
 
-  for (i = 0; types[i] != NULL; i++)
+  g_bytes_unref (stdin_buf);
+
+  if (g_subprocess_get_exit_status (subprocess) != 0)
     {
-      next_token = strstr (text, types[i]);
-      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+      if (stderr_buf)
+        g_warning ("%s", (char *)g_bytes_get_data (stderr_buf, NULL));
+
+      g_clear_pointer (&stdout_buf, g_bytes_unref);
     }
 
-  for (i = 0; control[i] != NULL; i++)
-    {
-      next_token = strstr (text, control[i]);
-      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
-    }
+  g_clear_pointer (&stderr_buf, g_bytes_unref);
+
+  g_object_unref (subprocess);
+
+  return stdout_buf;
 }
 
-/* While not as cool as c-mode, this will do as a quick attempt at highlighting */
 void
-fontify (GtkTextBuffer *source_buffer)
+fontify (const char    *format,
+         GtkTextBuffer *source_buffer)
 {
-  GtkTextIter start_iter, next_iter, tmp_iter;
-  int state;
+  GtkTextIter start, end;
   char *text;
-  char *start_ptr, *end_ptr;
-  const char *tag;
+  GBytes *bytes;
 
-  gtk_text_buffer_create_tag (source_buffer, "source",
-                              "font", "monospace",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "comment",
-                              "foreground", "DodgerBlue",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "type",
-                              "foreground", "ForestGreen",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "string",
-                              "foreground", "RosyBrown",
-                              "weight", PANGO_WEIGHT_BOLD,
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "control",
-                              "foreground", "purple",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "preprocessor",
-                              "style", PANGO_STYLE_OBLIQUE,
-                              "foreground", "burlywood4",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "function",
-                              "weight", PANGO_WEIGHT_BOLD,
-                              "foreground", "DarkGoldenrod4",
-                              NULL);
+  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
+  text = gtk_text_buffer_get_text (source_buffer, &start, &end, TRUE);
 
-  gtk_text_buffer_get_bounds (source_buffer, &start_iter, &tmp_iter);
-  gtk_text_buffer_apply_tag_by_name (source_buffer, "source", &start_iter, &tmp_iter);
-
-  state = STATE_NORMAL;
-
-  gtk_text_buffer_get_iter_at_offset (source_buffer, &start_iter, 0);
-
-  next_iter = start_iter;
-  while (gtk_text_iter_forward_line (&next_iter))
+  bytes = fontify_text (format, text);
+  if (bytes)
     {
-      gboolean start = TRUE;
-      start_ptr = text = gtk_text_iter_get_text (&start_iter, &next_iter);
+      char *markup;
+      gsize len;
 
-      do
-        {
-          parse_chars (start_ptr, &end_ptr, &state, &tag, start);
-
-          start = FALSE;
-          if (end_ptr)
-            {
-              tmp_iter = start_iter;
-              gtk_text_iter_forward_chars (&tmp_iter, end_ptr - start_ptr);
-            }
-          else
-            {
-              tmp_iter = next_iter;
-            }
-          if (tag)
-            gtk_text_buffer_apply_tag_by_name (source_buffer, tag, &start_iter, &tmp_iter);
-
-          start_iter = tmp_iter;
-          start_ptr = end_ptr;
-        }
-      while (end_ptr);
-
-      g_free (text);
-      start_iter = next_iter;
+      markup = g_bytes_unref_to_data (bytes, &len);
+      gtk_text_buffer_delete (source_buffer, &start, &end);
+      gtk_text_buffer_insert_markup (source_buffer, &start, markup, len);
+      g_free (markup);
     }
+
+  g_free (text);
 }
 
 static GtkWidget *
-display_image (const char *resource)
+display_image (const char *format,
+               const char *resource)
 {
   GtkWidget *sw, *image;
 
@@ -606,7 +354,8 @@ display_image (const char *resource)
 }
 
 static GtkWidget *
-display_text (const char *resource)
+display_text (const char *format,
+              const char *resource)
 {
   GtkTextBuffer *buffer;
   GtkWidget *textview, *sw;
@@ -633,8 +382,10 @@ display_text (const char *resource)
 
   buffer = gtk_text_buffer_new (NULL);
   gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-  if (g_str_has_suffix (resource, ".c"))
-    fontify (buffer);
+
+  if (format)
+    fontify (format, buffer);
+
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
 
   g_bytes_unref (bytes);
@@ -649,7 +400,8 @@ display_text (const char *resource)
 }
 
 static GtkWidget *
-display_video (const char *resource)
+display_video (const char *format,
+               const char *resource)
 {
   GtkWidget *video;
 
@@ -676,18 +428,20 @@ display_nothing (const char *resource)
 
 static struct {
   const char *extension;
-  GtkWidget * (* display_func) (const char *resource);
+  const char *format;
+  GtkWidget * (* display_func) (const char *format,
+                                const char *resource);
 } display_funcs[] = {
-  { ".gif", display_image },
-  { ".jpg", display_image },
-  { ".png", display_image },
-  { ".c", display_text },
-  { ".css", display_text },
-  { ".glsl", display_text },
-  { ".h", display_text },
-  { ".txt", display_text },
-  { ".ui", display_text },
-  { ".webm", display_video }
+  { ".gif", NULL, display_image },
+  { ".jpg", NULL, display_image },
+  { ".png", NULL, display_image },
+  { ".c", "c", display_text },
+  { ".css", "css", display_text },
+  { ".glsl", NULL, display_text },
+  { ".h", "c", display_text },
+  { ".txt", NULL, display_text },
+  { ".ui", "xml", display_text },
+  { ".webm", NULL, display_video }
 };
 
 static void
@@ -717,7 +471,7 @@ add_data_tab (const char *demoname)
         }
 
       if (j < G_N_ELEMENTS(display_funcs))
-        widget = display_funcs[j].display_func (resource_name);
+        widget = display_funcs[j].display_func (display_funcs[j].format, resource_name);
       else
         widget = display_nothing (resource_name);
 
@@ -912,7 +666,7 @@ load_file (const char *demoname,
 
   g_strfreev (lines);
 
-  fontify (source_buffer);
+  fontify ("c", source_buffer);
 
   gtk_text_buffer_end_irreversible_action (source_buffer);
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (source_view), source_buffer);
@@ -1136,8 +890,8 @@ activate (GApplication *app)
   g_signal_connect (search_bar, "notify::search-mode-enabled", G_CALLBACK (clear_search), NULL);
 
   listmodel = create_demo_model ();
-  treemodel = gtk_tree_list_model_new (FALSE,
-                                       G_LIST_MODEL (listmodel),
+  treemodel = gtk_tree_list_model_new (G_LIST_MODEL (listmodel),
+                                       FALSE,
                                        TRUE,
                                        get_child_model,
                                        NULL,
@@ -1145,6 +899,7 @@ activate (GApplication *app)
   filter_model = gtk_filter_list_model_new (G_LIST_MODEL (treemodel), NULL);
   filter = gtk_custom_filter_new ((GtkCustomFilterFunc)demo_filter_by_name, filter_model, NULL);
   gtk_filter_list_model_set_filter (filter_model, filter);
+  g_object_unref (filter);
   search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
   g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);
 

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

@@ -31,6 +31,11 @@
   <update_contact>matthias.clasen_at_gmail.com</update_contact>
   <developer_name>Matthias Clasen and others</developer_name>
   <releases>
+    <release version="3.99.0" date="2020-07-30">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
     <release version="3.94.0" date="2018-06-25">
       <description>
         <p>A new developers snapshot towards GTK 4.0.</p>

demos/gtk-demo/paintable_mediastream.c

@@ -293,6 +293,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Nuclear MediaStream");
       gtk_window_set_default_size (GTK_WINDOW (window), 300, 200);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       nuclear = gtk_nuclear_media_stream_new ();
       gtk_media_stream_set_loop (GTK_MEDIA_STREAM (nuclear), TRUE);

demos/gtk-demo/revealer.ui

@@ -19,8 +19,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -35,8 +35,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -51,8 +51,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">3</property>
-              <property name="top-attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -66,8 +66,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -82,8 +82,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -98,8 +98,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -114,8 +114,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -129,8 +129,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>
@@ -145,8 +145,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>

demos/gtk-demo/scale.ui

@@ -33,12 +33,9 @@
           <object class="GtkLabel" id="label_plain">
             <property name="label">Plain</property>
             <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_plain"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -48,12 +45,9 @@
             <property name="draw-value">0</property>
             <property name="adjustment">adjustment1</property>
             <property name="hexpand">1</property>
-            <accessibility>
-              <relation type="labelled-by" target="label_plain"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -61,12 +55,9 @@
           <object class="GtkLabel" id="label_marks">
             <property name="label">Marks</property>
             <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_marks"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -83,12 +74,9 @@
               <mark value="3" position="bottom"></mark>
               <mark value="4" position="bottom"></mark>
             </marks>
-            <accessibility>
-              <relation type="labelled-by" target="label_marks"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -96,12 +84,9 @@
           <object class="GtkLabel" id="label_discrete">
             <property name="label">Discrete</property>
             <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_discrete"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -112,9 +97,6 @@
             <property name="draw-value">0</property>
             <property name="adjustment">adjustment3</property>
             <property name="hexpand">1</property>
-            <accessibility>
-              <relation type="labelled-by" target="label_discrete"/>
-            </accessibility>
             <marks>
               <mark value="0" position="bottom"></mark>
               <mark value="1" position="bottom"></mark>
@@ -123,8 +105,8 @@
               <mark value="4" position="bottom"></mark>
             </marks>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>

demos/gtk-demo/search_entry.c

@@ -37,6 +37,7 @@ static void
 search_progress_done (GtkEntry *entry)
 {
   gtk_entry_set_progress_fraction (entry, 0.0);
+  g_object_unref (entry);
 }
 
 static gboolean
@@ -54,9 +55,11 @@ finish_search (GtkButton *button)
 static gboolean
 start_search_feedback (gpointer data)
 {
+  gtk_entry_set_progress_fraction (GTK_ENTRY (data), 0.1);
   search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100,
-                                           (GSourceFunc)search_progress, data,
+                                           (GSourceFunc)search_progress, g_object_ref (data),
                                            (GDestroyNotify)search_progress_done);
+
   return G_SOURCE_REMOVE;
 }
 
@@ -162,7 +165,8 @@ activate_cb (GtkEntry  *entry,
 }
 
 static void
-search_entry_destroyed (GtkWidget *widget)
+search_entry_destroyed (gpointer  data,
+                        GObject  *widget)
 {
   if (finish_search_id != 0)
     {
@@ -261,8 +265,8 @@ do_search_entry (GtkWidget *do_widget)
       gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Search Entry");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (search_entry_destroyed), &window);
+
+      g_object_weak_ref (G_OBJECT (window), search_entry_destroyed, &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_widget_set_margin_start (vbox, 5);

demos/gtk-demo/sliding_puzzle.c

@@ -272,7 +272,7 @@ start_puzzle (GdkPaintable *paintable)
 
   /* Create a new grid */
   grid = gtk_grid_new ();
-  gtk_widget_set_can_focus (grid, TRUE);
+  gtk_widget_set_focusable (grid, TRUE);
   gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (frame), grid);
   aspect_ratio = gdk_paintable_get_intrinsic_aspect_ratio (paintable);
   if (aspect_ratio == 0.0)
@@ -284,7 +284,7 @@ start_puzzle (GdkPaintable *paintable)
    * keys to move the puzzle */
   controller = gtk_shortcut_controller_new ();
   gtk_shortcut_controller_set_scope (GTK_SHORTCUT_CONTROLLER (controller),
-                                     GTK_SHORTCUT_SCOPE_GLOBAL);
+                                     GTK_SHORTCUT_SCOPE_LOCAL);
   add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
                     GDK_KEY_Left, GDK_KEY_KP_Left,
                     -1, 0);

demos/gtk-demo/spinbutton.ui

@@ -40,8 +40,8 @@
             <property name="mnemonic-widget">basic_spin</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -54,8 +54,8 @@
             <property name="digits">2</property>
             <property name="numeric">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -64,8 +64,8 @@
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -76,8 +76,8 @@
             <property name="mnemonic-widget">hex_spin</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -90,8 +90,8 @@
             <signal name="output" handler="spinbutton_hex_spin_output"/>
             <property name="wrap">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -100,8 +100,8 @@
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -112,8 +112,8 @@
             <property name="mnemonic-widget">time_spin</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -126,8 +126,8 @@
             <signal name="output" handler="spinbutton_time_spin_output"/>
             <property name="wrap">1</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -136,8 +136,8 @@
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
             </layout>
           </object>
         </child>
@@ -148,8 +148,8 @@
             <property name="mnemonic-widget">month_spin</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -163,8 +163,8 @@
             <property name="wrap">1</property>
             <property name="update-policy">if-valid</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -173,8 +173,8 @@
             <property name="width-chars">10</property>
             <property name="xalign">1</property>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>

demos/gtk-demo/stack.ui

@@ -10,8 +10,8 @@
             <property name="stack">stack</property>
             <property name="halign">center</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -59,8 +59,8 @@
               </object>
             </child>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>

demos/icon-browser/iconbrowserapp.c

@@ -50,6 +50,8 @@ about_activated (GSimpleAction *action,
   char *icon_theme;
   char *version;
   GString *s;
+  char *os_name;
+  char *os_version;
 
   g_object_get (gtk_settings_get_default (),
                 "gtk-icon-theme-name", &icon_theme,
@@ -57,6 +59,10 @@ about_activated (GSimpleAction *action,
 
   s = g_string_new ("");
 
+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  if (os_name && os_version)
+    g_string_append_printf (s, "OS\t%s %s\n\n", os_name, os_version);
   g_string_append (s, "System libraries\n");
   g_string_append_printf (s, "\tGLib\t%d.%d.%d\n",
                           glib_major_version,
@@ -91,6 +97,8 @@ about_activated (GSimpleAction *action,
   g_string_free (s, TRUE);
   g_free (version);
   g_free (icon_theme);
+  g_free (os_name);
+  g_free (os_version);
 }
 
 static GActionEntry app_entries[] =

demos/icon-browser/meson.build

@@ -18,3 +18,19 @@ executable('gtk4-icon-browser',
            gui_app: true,
            link_args: extra_demo_ldflags,
            install: true)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach
+
+# desktop file
+install_data('org.gtk.IconBrowser4.desktop', install_dir: gtk_applicationsdir)
+
+# appdata
+install_data('org.gtk.IconBrowser4.appdata.xml', install_dir: gtk_appdatadir)
+

demos/icon-browser/org.gtk.IconBrowser4.appdata.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.gtk.IconBrowser4.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>LGPL-2.0+</project_license>
+  <name>GTK Icon Browser</name>
+  <summary>Program to browse themed icons</summary>
+  <description>
+    <p>
+      GTK Icon Browser is a simple application to show themed icons that
+      are available on the system.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot>
+      <image>https://static.gnome.org/appdata/gtk4-icon-browser/gtk-icon-browser1.png</image>
+      <caption>Icon Browser</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://static.gnome.org/appdata/gtk4-icon-browser/gtk-icon-browser2.png</image>
+      <caption>Search</caption>
+    </screenshot>
+  </screenshots>
+  <kudos>
+    <kudo>HiDpiIcon</kudo>
+    <kudo>ModernToolkit</kudo>
+  </kudos>
+  <url type="homepage">https://www.gtk.org</url>
+  <translation type="gettext">gtk-4.0</translation>
+  <update_contact>matthias.clasen_at_gmail.com</update_contact>
+  <developer_name>Matthias Clasen and others</developer_name>
+  <releases>
+    <release version="3.99.0" date="2020-07-30">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
+    <release version="3.94.0" date="2018-06-25">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
+  </releases>
+</component>

demos/icon-browser/window.ui

@@ -245,12 +245,9 @@
               <object class="GtkImage" id="image1">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label1"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -258,12 +255,9 @@
              <object class="GtkImage" id="image2">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label2"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -271,12 +265,9 @@
               <object class="GtkImage" id="image3">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label3"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">2</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -284,12 +275,9 @@
               <object class="GtkImage" id="image4">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label4"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">3</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">3</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -297,12 +285,9 @@
               <object class="GtkImage" id="image5">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label5"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">4</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">4</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -310,12 +295,9 @@
               <object class="GtkImage" id="image6">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label5"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">5</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">5</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -323,12 +305,9 @@
               <object class="GtkImage" id="image7">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label5"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">6</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">6</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -336,12 +315,9 @@
               <object class="GtkImage" id="image8">
                 <property name="halign">center</property>
                 <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label6"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">7</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">7</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -353,12 +329,9 @@
                 <style>
                   <class name="dim-label"/>
                 </style>
-                <accessibility>
-                  <relation type="label-for" target="image1"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -370,12 +343,9 @@
                 <style>
                   <class name="dim-label"/>
                 </style>
-                <accessibility>
-                  <relation type="label-for" target="image2"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -387,12 +357,9 @@
                 <style>
                   <class name="dim-label"/>
                 </style>
-                <accessibility>
-                  <relation type="label-for" target="image3"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">2</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -404,12 +371,9 @@
                 <style>
                   <class name="dim-label"/>
                 </style>
-                <accessibility>
-                  <relation type="label-for" target="image4"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">3</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">3</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -421,12 +385,9 @@
                 <style>
                   <class name="dim-label"/>
                 </style>
-                <accessibility>
-                  <relation type="label-for" target="image5"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">4</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">4</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -438,12 +399,9 @@
                 <style>
                   <class name="dim-label"/>
                 </style>
-                <accessibility>
-                  <relation type="label-for" target="image6"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">5</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">5</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -455,12 +413,9 @@
                 <style>
                   <class name="dim-label"/>
                 </style>
-                <accessibility>
-                  <relation type="label-for" target="image7"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">6</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">6</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -472,12 +427,9 @@
                 <style>
                   <class name="dim-label"/>
                 </style>
-                <accessibility>
-                  <relation type="label-for" target="image8"/>
-                </accessibility>
                 <layout>
-                  <property name="left-attach">7</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">7</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>

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

@@ -38,8 +38,8 @@
           <object class="GtkCheckButton" id="testcase_cairo_checkbutton">
             <property name="label">Render using Cairo renderer</property>
             <layout>
-              <property name="top-attach">1</property>
-              <property name="left-attach">0</property>
+              <property name="row">1</property>
+              <property name="column">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -52,8 +52,8 @@
             <property name="use-markup">1</property>
             <property name="max-width-chars">50</property>
             <layout>
-              <property name="top-attach">2</property>
-              <property name="left-attach">0</property>
+              <property name="row">2</property>
+              <property name="column">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -64,8 +64,8 @@
             <property name="wrap">1</property>
             <property name="xalign">0</property>
             <layout>
-              <property name="top-attach">3</property>
-              <property name="left-attach">0</property>
+              <property name="row">3</property>
+              <property name="column">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -83,8 +83,8 @@
               <class name="suggested-action" />
             </style>
             <layout>
-              <property name="top-attach">4</property>
-              <property name="left-attach">0</property>
+              <property name="row">4</property>
+              <property name="column">0</property>
               <property name="column-span">2</property>
             </layout>
           </object>

demos/print-editor/org.gtk.PrintEditor4.appdata.xml

@@ -25,7 +25,7 @@
   <update_contact>matthias.clasen_at_gmail.com</update_contact>
   <developer_name>Matthias Clasen and others</developer_name>
   <releases>
-    <release version="3.99.0" date="2020">
+    <release version="3.99.0" date="2020-07-30">
       <description>
         <p>A new developers snapshot towards GTK 4.0.</p>
       </description>

demos/print-editor/print-editor.c

@@ -1,6 +1,7 @@
 #include <config.h>
 #include <math.h>
 #include <pango/pangocairo.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 static GtkWidget *main_window;
@@ -597,8 +598,24 @@ activate_about (GSimpleAction *action,
   char *setting;
   char **backends;
   int i;
+  char *os_name;
+  char *os_version;
+  const char *authors[] = {
+    "Alexander Larsson",
+    NULL
+  };
+  const char *maintainers[] = {
+    "The GTK Team",
+    NULL
+  };
+  GtkWidget *dialog;
 
-  sysinfo = g_string_new ("System libraries\n");
+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  sysinfo = g_string_new ("");
+  if (os_name && os_version)
+    g_string_append_printf (sysinfo, "OS\t%s %s\n\n", os_name, os_version);
+  g_string_append (sysinfo, "System libraries\n");
   g_string_append_printf (sysinfo, "\tGLib\t%d.%d.%d\n",
                           glib_major_version,
                           glib_minor_version,
@@ -614,8 +631,9 @@ activate_about (GSimpleAction *action,
 
   g_object_get (gtk_settings_get_default (), "gtk-print-backends", &setting, NULL);
   backends = g_strsplit (setting, ",", -1);
+  g_string_append (sysinfo, "\t");
   for (i = 0; backends[i]; i++)
-    g_string_append_printf (sysinfo, "\t%s\n", backends[i]);
+    g_string_append_printf (sysinfo, "%s ", backends[i]);
   g_strfreev (backends);
   g_free (setting);
 
@@ -625,18 +643,23 @@ activate_about (GSimpleAction *action,
                              gtk_get_minor_version (),
                              gtk_get_micro_version ());
 
-  gtk_show_about_dialog (GTK_WINDOW (main_window),
+  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                         "transient-for", main_window,
                          "program-name", "GTK Print Editor",
                          "version", version,
                          "copyright", "© 2006-2020 Red Hat, Inc",
                          "license-type", GTK_LICENSE_LGPL_2_1,
                          "website", "http://www.gtk.org",
                          "comments", "Program to demonstrate GTK printing",
-                         "authors", (const char *[]){ "Alexander Larsson", NULL },
+                         "authors", authors,
                          "logo-icon-name", "org.gtk.PrintEditor4.Devel",
                          "title", "About GTK Print Editor",
                          "system-information", sysinfo->str,
                          NULL);
+  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
+                                       _("Maintained by"), maintainers);
+
+  gtk_window_present (GTK_WINDOW (dialog));
 
   g_string_free (sysinfo, TRUE);
   g_free (version);

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

@@ -32,6 +32,11 @@
   <update_contact>matthias.clasen_at_gmail.com</update_contact>
   <developer_name>Matthias Clasen and others</developer_name>
   <releases>
+    <release version="3.99.0" date="2020-07-30">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
     <release version="3.94.0" date="2018-06-25">
       <description>
         <p>A new developers snapshot towards GTK 4.0.</p>

demos/widget-factory/widget-factory.c

@@ -255,11 +255,22 @@ activate_about (GSimpleAction *action,
     "Cosimo Cecchi",
     NULL
   };
+  const char *maintainers[] = {
+    "The GTK Team",
+    NULL
+  };
   char *version;
+  char *os_name;
+  char *os_version;
   GString *s;
+  GtkWidget *dialog;
 
   s = g_string_new ("");
 
+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  if (os_name && os_version)
+    g_string_append_printf (s, "OS\t%s %s\n\n", os_name, os_version);
   g_string_append (s, "System libraries\n");
   g_string_append_printf (s, "\tGLib\t%d.%d.%d\n",
                           glib_major_version,
@@ -279,7 +290,8 @@ activate_about (GSimpleAction *action,
                              gtk_get_minor_version (),
                              gtk_get_micro_version ());
 
-  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
+  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                         "transient-for", gtk_application_get_active_window (app),
                          "program-name", "GTK Widget Factory",
                          "version", version,
                          "copyright", "© 1997—2020 The GTK Team",
@@ -292,8 +304,15 @@ activate_about (GSimpleAction *action,
                          "system-information", s->str,
                          NULL);
 
+  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
+                                       _("Maintained by"), maintainers);
+
+  gtk_window_present (GTK_WINDOW (dialog));
+
   g_string_free (s, TRUE);
   g_free (version);
+  g_free (os_name);
+  g_free (os_version);
 }
 
 static void
@@ -565,7 +584,6 @@ on_scale_button_value_changed (GtkScaleButton *button,
     }
 
   gtk_widget_set_tooltip_text (GTK_WIDGET (button), str);
-  atk_object_set_description (gtk_widget_get_accessible (GTK_WIDGET (button)), str);
 
   g_free (str);
 }

demos/widget-factory/widget-factory.ui

@@ -35,7 +35,7 @@
             <attribute name="target">highcontrast-inverse</attribute>
           </item>
         </section>
-      </submenu> 
+      </submenu>
       <item>
         <attribute name="label" translatable="yes">Transition Pages</attribute>
         <attribute name="action">win.transition</attribute>
@@ -639,8 +639,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkCheckButton" id="checkbutton2">
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -649,8 +649,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -660,8 +660,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -670,8 +670,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">checkbutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -681,8 +681,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="inconsistent">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -691,8 +691,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="active">1</property>
                                     <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -701,8 +701,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -712,8 +712,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton1</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -722,8 +722,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="label" translatable="yes">radiobutton</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -733,8 +733,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="sensitive">0</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -745,8 +745,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="inconsistent">1</property>
                                     <property name="group">radiobutton3</property>
                                     <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -754,15 +754,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner1">
                                     <property name="spinning">1</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                     </layout>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkSpinner" id="spinner2">
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -771,8 +771,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="spinning">1</property>
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -780,8 +780,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   <object class="GtkSpinner" id="spinner4">
                                     <property name="sensitive">0</property>
                                     <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                     </layout>
                                   </object>
                                 </child>
@@ -789,11 +789,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator1">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkBox" id="box19">
                             <property name="orientation">vertical</property>
@@ -889,11 +884,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator2">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkBox" id="box20">
                             <property name="orientation">vertical</property>
@@ -1042,11 +1032,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator3">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkBox" id="box26">
                             <property name="orientation">vertical</property>
@@ -1145,11 +1130,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator4">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkBox" id="box4">
                             <property name="orientation">vertical</property>
@@ -1249,9 +1229,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkSeparator" id="separator5"/>
-                    </child>
                     <child>
                       <object class="GtkBox" id="box5">
                         <property name="spacing">10</property>
@@ -1542,8 +1519,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                         <property name="value">.5</property>
                                         <property name="halign">center</property>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1559,8 +1536,8 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="halign">center</property>
                                         <signal name="value-changed" handler="on_scale_button_value_changed" swapped="no"/>
                                         <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                         </layout>
                                       </object>
                                     </child>
@@ -1568,9 +1545,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                               </object>
                             </child>
-                            <child>
-                              <object class="GtkSeparator"/>
-                            </child>
                             <child>
                               <object class="GtkFrame" id="page2frame1">
                                 <child>
@@ -1639,9 +1613,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                               </object>
                             </child>
-                            <child>
-                              <object class="GtkSeparator"/>
-                            </child>
                             <child>
                               <object class="GtkScrolledWindow">
                                 <property name="has-frame">1</property>
@@ -1898,11 +1869,6 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkBox">
                             <property name="orientation">vertical</property>
@@ -1979,9 +1945,6 @@ microphone-sensitivity-medium-symbolic</property>
                                         </child>
                                       </object>
                                     </child>
-                                    <child>
-                                      <object class="GtkSeparator"/>
-                                    </child>
                                     <child>
                                       <object class="GtkScrolledWindow">
                                         <property name="vexpand">1</property>
@@ -2006,9 +1969,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                               </object>
                             </child>
-                            <child>
-                              <object class="GtkSeparator"/>
-                            </child>
                             <child>
                               <object class="GtkBox">
                                 <child>
@@ -2069,11 +2029,6 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkBox" id="filler2">
                             <property name="orientation">vertical</property>
@@ -2083,9 +2038,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 <property name="halign">center</property>
                               </object>
                             </child>
-                            <child>
-                              <object class="GtkSeparator"/>
-                            </child>
                             <child>
                               <object class="GtkExpander" id="expander1">
                                 <property name="expanded">1</property>
@@ -2260,9 +2212,6 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
                         <child>
                           <object class="GtkScrolledWindow">
                             <property name="hscrollbar-policy">never</property>
@@ -2278,11 +2227,6 @@ microphone-sensitivity-medium-symbolic</property>
                         </child>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkBox">
                         <property name="orientation">vertical</property>
@@ -2372,9 +2316,6 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
                         <child>
                           <object class="GtkFrame">
                             <child>
@@ -2852,11 +2793,6 @@ microphone-sensitivity-medium-symbolic</property>
                         </child>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkBox">
                         <property name="orientation">vertical</property>
@@ -2883,9 +2819,6 @@ microphone-sensitivity-medium-symbolic</property>
                             </style>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
                         <child>
                           <object class="GtkNotebook">
                             <property name="scrollable">1</property>
@@ -3029,9 +2962,6 @@ bad things might happen.</property>
             <property name="margin-top">20</property>
             <property name="margin-bottom">20</property>
             <property name="label" translatable="yes">To free the princess, you have to slay the dragon.</property>
-            <accessibility>
-              <role type="static"/>
-            </accessibility>
           </object>
         </child>
       </object>
@@ -3081,8 +3011,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -3090,8 +3020,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -3106,8 +3036,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3115,8 +3045,8 @@ bad things might happen.</property>
               <object class="GtkEntry" id="more_details_entry">
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -3131,8 +3061,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3142,8 +3072,8 @@ bad things might happen.</property>
                 <property name="draw-value">0</property>
                 <property name="adjustment">adjustment1</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                 </layout>
               </object>
             </child>
@@ -3158,8 +3088,8 @@ bad things might happen.</property>
                   <class name="dim-label"/>
                 </style>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3168,8 +3098,8 @@ bad things might happen.</property>
                 <property name="halign">start</property>
                 <property name="valign">baseline</property>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                 </layout>
               </object>
             </child>
@@ -3231,9 +3161,6 @@ bad things might happen.</property>
           <object class="GtkLabel" id="title_label">
             <property name="label">Title:</property>
             <property name="xalign">1</property>
-            <accessibility>
-              <relation type="label-for" target="open_popover_entry"/>
-            </accessibility>
           </object>
         </child>
         <child>
@@ -3241,11 +3168,8 @@ bad things might happen.</property>
             <property name="valign">start</property>
             <property name="label">Description:</property>
             <property name="xalign">1</property>
-            <accessibility>
-              <relation type="label-for" target="open_popover_textview"/>
-            </accessibility>
             <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
             </layout>
           </object>
         </child>
@@ -3259,14 +3183,11 @@ bad things might happen.</property>
             <property name="max-content-width">100</property>
             <child>
               <object class="GtkTextView" id="open_popover_textview">
-                <accessibility>
-                  <relation type="labelled-by" target="description_label"/>
-                </accessibility>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3274,11 +3195,8 @@ bad things might happen.</property>
         <child>
           <object class="GtkEntry" id="open_popover_entry">
             <property name="activates-default">1</property>
-            <accessibility>
-              <relation type="labelled-by" target="title_label"/>
-            </accessibility>
             <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3297,8 +3215,8 @@ bad things might happen.</property>
               </object>
             </child>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -3310,8 +3228,8 @@ bad things might happen.</property>
             <property name="menu-model">gear_menu</property>
             <property name="tooltip-text">This is a menu button</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3324,8 +3242,8 @@ bad things might happen.</property>
               <class name="suggested-action"/>
             </style>
             <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
             </layout>
           </object>
         </child>
@@ -3357,9 +3275,6 @@ bad things might happen.</property>
     <child>
       <object class="GtkLabel">
         <property name="label">No updates at this time</property>
-        <accessibility>
-          <role type="static"/>
-        </accessibility>
       </object>
     </child>
   </object>
@@ -3368,9 +3283,6 @@ bad things might happen.</property>
     <child>
       <object class="GtkLabel">
         <property name="label">You&apos;re in too deep!</property>
-        <accessibility>
-          <role type="static"/>
-        </accessibility>
       </object>
     </child>
   </object>

docs/reference/gdk/gdk4-docs.xml

@@ -33,6 +33,7 @@
     <xi:include href="xml/gdksurface.xml" />
     <xi:include href="xml/gdktoplevel.xml" />
     <xi:include href="xml/gdktoplevellayout.xml" />
+    <xi:include href="xml/gdktoplevelsize.xml" />
     <xi:include href="xml/gdkpopup.xml" />
     <xi:include href="xml/gdkpopuplayout.xml" />
     <xi:include href="xml/gdkframeclock.xml" />

docs/reference/gdk/gdk4-sections.txt

@@ -81,7 +81,6 @@ gdk_display_close
 gdk_display_is_closed
 gdk_display_is_rgba
 gdk_display_is_composited
-gdk_display_get_default_group
 gdk_display_supports_input_shapes
 gdk_display_get_app_launch_context
 gdk_display_notify_startup_complete
@@ -190,9 +189,7 @@ gdk_surface_create_vulkan_context
 gdk_surface_create_cairo_context
 
 <SUBSECTION>
-gdk_surface_queue_expose
-gdk_surface_freeze_updates
-gdk_surface_thaw_updates
+gdk_surface_queue_render
 gdk_surface_get_frame_clock
 
 <SUBSECTION>
@@ -348,21 +345,14 @@ GdkAxisUse
 GdkAxisFlags
 GdkDeviceTool
 GdkDeviceToolType
-GdkDeviceType
 
 <SUBSECTION>
 gdk_device_get_name
 gdk_device_get_vendor_id
 gdk_device_get_product_id
 gdk_device_get_source
-gdk_device_get_axis_use
-gdk_device_get_associated_device
-gdk_device_list_physical_devices
-gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
-gdk_device_get_n_axes
-gdk_device_get_axes
 gdk_device_get_seat
 gdk_device_get_num_touches
 gdk_device_get_device_tool
@@ -374,15 +364,14 @@ gdk_device_get_scroll_lock_state
 gdk_device_has_bidi_layouts
 
 <SUBSECTION>
-gdk_device_get_state
 gdk_device_get_surface_at_position
 GdkTimeCoord
-gdk_device_get_axis
 
 <SUBSECTION>
 gdk_device_tool_get_serial
 gdk_device_tool_get_tool_type
 gdk_device_tool_get_hardware_id
+gdk_device_tool_get_axes
 
 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
@@ -438,7 +427,8 @@ gdk_seat_get_display
 gdk_seat_get_capabilities
 gdk_seat_get_pointer
 gdk_seat_get_keyboard
-gdk_seat_get_physical_devices
+gdk_seat_get_devices
+gdk_seat_get_tools
 
 <SUBSECTION Standard>
 GDK_SEAT
@@ -478,7 +468,6 @@ gdk_event_unref
 gdk_event_get_event_type
 gdk_event_get_surface
 gdk_event_get_device
-gdk_event_get_source_device
 gdk_event_get_device_tool
 gdk_event_get_time
 gdk_event_get_display
@@ -643,8 +632,6 @@ gdk_toplevel_layout_get_maximized
 gdk_toplevel_layout_set_fullscreen
 gdk_toplevel_layout_get_fullscreen
 gdk_toplevel_layout_get_fullscreen_monitor
-gdk_toplevel_layout_get_min_width
-gdk_toplevel_layout_get_min_height
 gdk_toplevel_layout_set_resizable
 gdk_toplevel_layout_get_resizable
 <SUBSECTION Standard>
@@ -652,6 +639,18 @@ GDK_TYPE_TOPLEVEL_LAYOUT
 gdk_toplevel_layout_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gdktoplevelsize</FILE>
+<TITLE>GdkToplevelSize</TITLE>
+GdkToplevelSize
+gdk_toplevel_size_get_bounds
+gdk_toplevel_size_set_size
+gdk_toplevel_size_set_min_size
+<SUBSECTION Standard>
+GDK_TYPE_TOPLEVEL_SIZE
+gdk_toplevel_size_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gdktoplevel</FILE>
 <TITLE>GdkToplevel</TITLE>
@@ -684,6 +683,8 @@ gdk_toplevel_get_type
 <TITLE>Textures</TITLE>
 <FILE>textures</FILE>
 GdkTexture
+GdkMemoryTexture
+GdkGLTexture
 gdk_texture_new_for_pixbuf
 gdk_texture_new_from_resource
 gdk_texture_new_from_file
@@ -823,6 +824,7 @@ gdk_x11_display_get_xrootwindow
 gdk_x11_display_get_xcursor
 gdk_x11_display_grab
 gdk_x11_display_ungrab
+gdk_x11_display_get_default_group
 gdk_x11_display_error_trap_push
 gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
@@ -846,6 +848,8 @@ gdk_x11_surface_move_to_desktop
 gdk_x11_surface_get_desktop
 gdk_x11_surface_set_utf8_property
 gdk_x11_surface_set_frame_sync_enabled
+gdk_x11_surface_set_group
+gdk_x11_surface_get_group
 gdk_x11_keymap_get_group_for_state
 gdk_x11_keymap_key_is_modifier
 gdk_x11_visual_get_xvisual
@@ -1130,7 +1134,6 @@ GDK_TYPE_GL_PROFILE
 GdkMonitor
 gdk_monitor_get_display
 gdk_monitor_get_geometry
-gdk_monitor_get_workarea
 gdk_monitor_get_width_mm
 gdk_monitor_get_height_mm
 gdk_monitor_get_manufacturer
@@ -1290,4 +1293,3 @@ GDK_CONTENT_DESERIALIZER
 GDK_IS_CONTENT_DESERIALIZER
 gdk_content_deserializer_get_type
 </SECTION>
-

docs/reference/gtk/actions.md

@@ -185,10 +185,9 @@ is to create a menu using a GMenu menu model. GMenu provides an
 abstract way to describe typical menus: nested groups of items
 where each item can have a label, and icon, and an action.
 
-Typical uses of GMenu inside GTK are to set up an application
-menu or menubar with gtk_application_set_app_menu() or
-gtk_application_set_menubar(). Another, maybe more common use
-is to create a popover for a menubutton, using
+A typical use of GMenu inside GTK is to set up an application
+menubar with gtk_application_set_menubar(). Another, maybe more
+common use is to create a popover for a menubutton, using
 gtk_menu_button_set_menu_model().
 
 Unlike traditional menus, those created from menu models don't

docs/reference/gtk/building.md

@@ -127,7 +127,7 @@ compilation flags needed for that library along with version number
 information.)
 
 Some of the libraries that GTK depends on are maintained by the
-GTK team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection.
+GTK team: GLib, GdkPixbuf, Pango, and GObject Introspection.
 Other libraries are maintained separately.
 
 - The GLib library provides core non-graphical functionality
@@ -139,10 +139,6 @@ Other libraries are maintained separately.
   file formats. It is available [here](ttps://download.gnome.org/sources/gdk-pixbuf/).
 - [Pango](http://www.pango.org) is a library for internationalized
   text handling. It is available [here](https://download.gnome.org/sources/pango/).
-- ATK is the Accessibility Toolkit. It provides a set of generic
-  interfaces allowing accessibility technologies such as
-  screen readers to interact with a graphical user interface.
-  It is available [here](https://download.gnome.org/sources/atk/).
 - [GObject Introspection](https://wiki.gnome.org/Projects/GObjectIntrospection)
   is a framework for making introspection data available to language
   bindings. It is available [here](https://download.gnome.org/sources/gobject-introspection/).
@@ -192,7 +188,7 @@ you'll have all of these installed already, or they will be easily
 accessible through your operating system package repositories.
 
 Then build and install the GTK libraries in the order:
-GLib, Cairo, Pango, ATK, then GTK. For each library, follow the
+GLib, Cairo, Pango, 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

docs/reference/gtk/compiling.md

@@ -9,9 +9,9 @@ is used (the actual output on your system may be different):
 
 ```
 $ pkg-config --cflags gtk4
- -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
+ -pthread -I/usr/include/gtk-4.0 -I/usr/lib64/gtk-4.0/include -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
- -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
+ -pthread -lgtk-4 -lgdk-4 -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
 ```
 The simplest way to compile a program is to use the "backticks"
 feature of the shell. If you enclose a command in backticks

docs/reference/gtk/getting_started.md

@@ -649,8 +649,8 @@ Create a new file with the following content named `builder.ui`.
           <object id="button1" class="GtkButton">
             <property name="label">Button 1</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -658,8 +658,8 @@ Create a new file with the following content named `builder.ui`.
           <object id="button2" class="GtkButton">
             <property name="label">Button 2</property>
             <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
             </layout>
           </object>
         </child>
@@ -667,8 +667,8 @@ Create a new file with the following content named `builder.ui`.
           <object id="quit" class="GtkButton">
             <property name="label">Quit</property>
             <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
               <property name="column-span">2</property>
             </layout>
           </object>
@@ -1266,16 +1266,16 @@ Lets start with the template.
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
             <child>
               <object class="GtkFontButton" id="font">
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                 </layout>
               </object>
             </child>
@@ -1286,8 +1286,8 @@ Lets start with the template.
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
                 <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>
@@ -1299,8 +1299,8 @@ Lets start with the template.
                   <item translatable="yes" id="slide-left-right">Slide</item>
                 </items>
                 <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                 </layout>
               </object>
             </child>

docs/reference/gtk/gtk-markdown-to-docbook

@@ -12,6 +12,13 @@ import subprocess
 # The following code is taken from gtk-doc
 
 def ExpandAbbreviations(symbol, text):
+    # Hack!
+    # Strip xlink namespace from hrefs since pandoc insists on
+    # inserting them, and namespace setup doesn't transfer across
+    # xi:include.
+    # Yay for XML!
+    text = re.sub('xlink:href', 'href', text)
+
     # Convert '@param()'
     text = re.sub(r'(\A|[^\\])\@(\w+((\.|->)\w+)*)\s*\(\)', r'\1<parameter>\2()</parameter>', text)
 
@@ -173,11 +180,10 @@ def ConvertToDocbook(infile, outfile):
     else:
         division='chapter'
     input_format = "markdown" + "".join(MarkdownExtensions)
-    output_format = "docbook"
+    output_format = "docbook4"
     subprocess.check_call(["pandoc", infile, "-o", outfile,
                            "--from=" + input_format,
                            "--to=" + output_format,
-                           "--standalone",
                            "--top-level-division=" + division])
 
 def ExpandGtkDocAbbreviations(infile, outfile):

docs/reference/gtk/gtk4-docs.xml

@@ -55,6 +55,7 @@
         <xi:include href="xml/gtkfilter.xml" />
         <xi:include href="xml/gtkcustomfilter.xml" />
         <xi:include href="xml/gtkmultifilter.xml" />
+        <xi:include href="xml/gtkboolfilter.xml" />
         <xi:include href="xml/gtkstringfilter.xml" />
         <xi:include href="xml/gtkfilefilter.xml" />
       </section>
@@ -337,6 +338,13 @@
       <xi:include href="xml/gtkshortcutlabel.xml" />
     </chapter>
 
+    <chapter id="Accessibility">
+      <title>Accessibility</title>
+      <xi:include href="section-accessibility.xml"/>
+      <xi:include href="xml/gtkaccessible.xml" />
+      <xi:include href="xml/gtkatcontext.xml" />
+    </chapter>
+
     <chapter id="MiscObjects">
       <title>Miscellaneous</title>
       <xi:include href="xml/gtkadjustment.xml" />

docs/reference/gtk/gtk4-sections.txt

@@ -88,25 +88,6 @@ GtkAccelLabelPrivate
 gtk_accel_label_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkaccessible</FILE>
-<TITLE>GtkAccessible</TITLE>
-GtkAccessible
-gtk_accessible_get_widget
-gtk_accessible_set_widget
-
-<SUBSECTION Standard>
-GTK_ACCESSIBLE
-GTK_TYPE_ACCESSIBLE
-GTK_ACCESSIBLE_CLASS
-GTK_ACCESSIBLE_GET_CLASS
-GTK_IS_ACCESSIBLE
-GTK_IS_ACCESSIBLE_CLASS
-<SUBSECTION Private>
-GtkAccessiblePrivate
-gtk_accessible_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkadjustment</FILE>
 <TITLE>GtkAdjustment</TITLE>
@@ -276,6 +257,7 @@ GtkListBoxUpdateHeaderFunc
 
 gtk_list_box_new
 gtk_list_box_prepend
+gtk_list_box_append
 gtk_list_box_insert
 gtk_list_box_remove
 gtk_list_box_select_row
@@ -449,7 +431,7 @@ gtk_single_selection_get_type
 
 <SECTION>
 <FILE>gtkmultiselection</FILE>
-<TITLE>GtkMultiSeledction</TITLE>
+<TITLE>GtkMultiSelection</TITLE>
 GtkMultiSelection
 gtk_multi_selection_new
 gtk_multi_selection_get_model
@@ -662,6 +644,7 @@ gtk_grid_view_get_type
 <FILE>gtkbuildable</FILE>
 GtkBuildable
 GtkBuildableIface
+GtkBuildableParser
 gtk_buildable_set_name
 gtk_buildable_get_name
 gtk_buildable_add_child
@@ -684,6 +667,10 @@ GTK_BUILDABLE_GET_IFACE
 <SECTION>
 <FILE>gtkbuilderscope</FILE>
 <TITLE>GtkBuilderScope</TITLE>
+GtkBuilderScope
+GtkBuilderClosureFlags
+GtkBuilderScopeInterface
+GtkBuilderCScope
 gtk_builder_cscope_new
 gtk_builder_cscope_add_callback_symbol
 gtk_builder_cscope_add_callback_symbols
@@ -881,7 +868,6 @@ gtk_combo_box_set_active_id
 gtk_combo_box_get_model
 gtk_combo_box_set_model
 gtk_combo_box_popdown
-gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_row_separator_func
 gtk_combo_box_set_row_separator_func
 GtkSensitivityType
@@ -1223,9 +1209,6 @@ gtk_entry_completion_compute_prefix
 gtk_entry_completion_complete
 gtk_entry_completion_get_completion_prefix
 gtk_entry_completion_insert_prefix
-gtk_entry_completion_insert_action_text
-gtk_entry_completion_insert_action_markup
-gtk_entry_completion_delete_action
 gtk_entry_completion_set_text_column
 gtk_entry_completion_get_text_column
 gtk_entry_completion_set_inline_completion
@@ -2832,7 +2815,7 @@ gtk_sort_list_model_set_model
 gtk_sort_list_model_get_model
 gtk_sort_list_model_set_incremental
 gtk_sort_list_model_get_incremental
-gtk_sort_list_model_get_peanding
+gtk_sort_list_model_get_pending
 <SUBSECTION Standard>
 GTK_SORT_LIST_MODEL
 GTK_IS_SORT_LIST_MODEL
@@ -4074,7 +4057,6 @@ GtkCellRendererState
 GtkCellRendererMode
 GtkCellRenderer
 GtkCellRendererClass
-gtk_cell_renderer_class_set_accessible_type
 gtk_cell_renderer_get_aligned_area
 gtk_cell_renderer_snapshot
 gtk_cell_renderer_activate
@@ -4429,7 +4411,6 @@ gtk_widget_paintable_get_type
 <TITLE>GtkWidget</TITLE>
 GtkWidget
 GtkWidgetClass
-GtkCallback
 GtkRequisition
 GtkAllocation
 gtk_widget_new
@@ -4487,9 +4468,7 @@ gtk_widget_get_cursor
 gtk_widget_set_cursor
 gtk_widget_set_cursor_from_name
 gtk_widget_mnemonic_activate
-gtk_widget_class_set_accessible_type
 gtk_widget_class_set_accessible_role
-gtk_widget_get_accessible
 gtk_widget_child_focus
 gtk_widget_get_child_visible
 gtk_widget_get_parent
@@ -6291,6 +6270,8 @@ gtk_popover_set_autohide
 gtk_popover_get_autohide
 gtk_popover_set_has_arrow
 gtk_popover_get_has_arrow
+gtk_popover_set_offset
+gtk_popover_get_offset
 gtk_popover_set_default_widget
 <SUBSECTION Standard>
 GTK_TYPE_POPOVER
@@ -7272,10 +7253,10 @@ gtk_grid_layout_get_baseline_row
 <SUBSECTION>
 GtkGridLayoutChild
 
-gtk_grid_layout_child_set_top_attach
-gtk_grid_layout_child_get_top_attach
-gtk_grid_layout_child_set_left_attach
-gtk_grid_layout_child_get_left_attach
+gtk_grid_layout_child_set_column
+gtk_grid_layout_child_get_column
+gtk_grid_layout_child_set_row
+gtk_grid_layout_child_get_row
 gtk_grid_layout_child_set_column_span
 gtk_grid_layout_child_get_column_span
 gtk_grid_layout_child_set_row_span
@@ -7571,6 +7552,19 @@ GTK_TYPE_EXPRESSION
 gtk_expression_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkboolfilter</FILE>
+GtkBoolFilter
+gtk_bool_filter_new
+gtk_bool_filter_get_expression
+gtk_bool_filter_set_expression
+gtk_bool_filter_get_invert
+gtk_bool_filter_set_invert
+
+<SUBSECTION Private>
+gtk_bool_filter_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkstringfilter</FILE>
 GtkStringFilter
@@ -7594,7 +7588,7 @@ gtk_string_filter_get_type
 <TITLE>GtkDropDown</TITLE>
 GtkDropDown
 gtk_drop_down_new
-gtk_drop_down_set_from_strings
+gtk_drop_down_new_from_strings
 gtk_drop_down_set_model
 gtk_drop_down_get_model
 gtk_drop_down_set_selected
@@ -7635,7 +7629,59 @@ gtk_string_object_get_string
 <TITLE>GtkSelectionFilterModel</TITLE>
 GtkSelectionFilterModel
 gtk_selection_filter_model_new
-gtk_selection_filter_model_new_for_type
 gtk_selection_filter_model_set_model
 gtk_selection_filter_model_get_model
 </SECTION>
+
+<SECTION>
+<FILE>gtkaccessible</FILE>
+GtkAccessible
+GtkAccessibleRole
+GtkAccessibleState
+GtkAccessibleProperty
+GtkAccessibleRelation
+GtkAccessibleTristate
+GtkAccessibleInvalidState
+GtkAccessibleAutocomplete
+GtkAccessibleSort
+gtk_accessible_get_accessible_role
+gtk_accessible_update_state
+gtk_accessible_update_state_value
+gtk_accessible_reset_state
+gtk_accessible_update_property
+gtk_accessible_update_property_value
+gtk_accessible_reset_property
+gtk_accessible_update_relation
+gtk_accessible_update_relation_value
+gtk_accessible_reset_relation
+
+<SUBSECTION Standard>
+GTK_TYPE_ACCESSIBLE
+GTK_TYPE_ACCESSIBLE_PROPERTY
+GTK_TYPE_ACCESSIBLE_ROLE
+GTK_TYPE_ACCESSIBLE_STATE
+GTK_ACCESSIBLE
+GTK_ACCESSIBLE_GET_IFACE
+GTK_IS_ACCESSIBLE
+<SUBSECTION Private>
+gtk_accessible_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkatcontext</FILE>
+GtkATContext
+gtk_at_context_get_accessible
+gtk_at_context_get_accessible_role
+<SUBSECTION>
+gtk_at_context_create
+<SUBSECTION Standard>
+GTK_TYPE_AT_CONTEXT
+GTK_AT_CONTEXT
+GTK_AT_CONTEXT_CLASS
+GTK_AT_CONTEXT_GET_CLASS
+GTK_IS_AT_CONTEXT
+GTK_IS_AT_CONTEXT_CLASS
+<SUBSECTION Private>
+GtkATContextClass
+gtk_at_context_get_type
+</SECTION>

docs/reference/gtk/gtk4.types.in

@@ -2,7 +2,6 @@
 #include <gtk/gtkunixprint.h>
 
 gtk_about_dialog_get_type
-gtk_accel_label_get_type
 gtk_accessible_get_type
 gtk_actionable_get_type
 gtk_action_bar_get_type
@@ -17,6 +16,7 @@ gtk_application_window_get_type
 gtk_aspect_frame_get_type
 gtk_assistant_get_type
 gtk_assistant_page_get_type
+gtk_at_context_get_type
 gtk_bin_layout_get_type
 gtk_bitset_get_type
 gtk_expression_get_type
@@ -90,6 +90,7 @@ gtk_expander_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
+gtk_file_chooser_native_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
 gtk_filter_get_type