gridview: Avoid a critical

The code can hit this path with heights->len
being 0, and it does not seem to have any ill
effects, apart from this critical warning.

Fixes: #5836

.flake8

@@ -1,2 +0,0 @@
-[flake8]
-ignore = E501

.gitlab-ci.yml

@@ -24,9 +24,9 @@ stages:
 variables:
   COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false -Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false -Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false -Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false -Dharfbuzz:werror=false -Dfreetype2:werror=false -Dfontconfig:werror=false -Dfribidi:werror=false -Dlibffi:werror=false -Dlibjpeg-turbo:werror=false -Dmutest:werror=false -Dpixman:werror=false -Dproxy-libintl:werror=false"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true -Dintrospection=enabled"
+  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dbuild-testsuite=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v48"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v46"
 
 workflow:
   rules:
@@ -123,26 +123,6 @@ release-build:
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
     - .gitlab-ci/run-tests.sh _build x11
 
-fedora-clang:
-  extends: .build-fedora-default
-  stage: build
-  needs: []
-  variables:
-    EXTRA_MESON_FLAGS: "--buildtype=release"
-  script:
-    - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
-    - export CC=clang
-    - meson subprojects download
-    - meson subprojects update --reset
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
-            _build
-    - meson compile -C _build
-
 fedora-mingw64:
   extends: .build-fedora-default
   stage: build
@@ -222,7 +202,7 @@ macos:
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled
-            -Dbuild-demos=false
+            -Ddemos=false
             -Dbuild-tests=false
             -Dbuild-examples=false
             -Dbuild-testsuite=false
@@ -385,27 +365,17 @@ asan-build:
   tags: [ asan ]
   stage: analysis
   needs: []
+  when: manual
   variables:
   script:
     - export PATH="$HOME/.local/bin:$PATH"
-    - CC=clang meson setup
-            --buildtype=debugoptimized
-            -Db_sanitize=address
-            -Db_lundef=false
-            -Dbuild-demos=false
-            -Dbuild-tests=false
-            -Dbuild-examples=false
-            -Dintrospection=disabled
-            -Df16c=disabled
-            _build
+    - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled -Df16c=disabled _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build wayland_gles
-    - .gitlab-ci/run-tests.sh _build x11
   artifacts:
-    when: always
     paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
+      - _build/meson-logs
+  allow_failure: true
 
 reference:
   image: $FEDORA_IMAGE

.gitlab-ci/fedora.Dockerfile

@@ -32,7 +32,6 @@ RUN dnf -y install \
     glib2-static \
     glibc-devel \
     glibc-headers \
-    glslc \
     gnupg2 \
     gobject-introspection-devel \
     graphene-devel \

.gitlab-ci/flatpak-build.sh

@@ -23,8 +23,8 @@ flatpak build ${builddir} meson \
                 -Dbuild-testsuite=false \
                 -Dbuild-examples=false \
                 -Dintrospection=disabled \
-                -Dbuild-demos=true \
-                -Ddemo-profile=devel \
+                -Ddemos=true \
+                -Dprofile=devel \
                 _flatpak_build
 
 flatpak build ${builddir} ninja -C _flatpak_build install

.gitlab-ci/run-single-test.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/sh
-#
-builddir=$1
-suite=$2
-unit=$3
-
-echo "** builddir: ${builddir}"
-echo "**    suite: ${suite}"
-echo "**     unit: ${unit}"
-
-export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-compositor=$!
-
-export WAYLAND_DISPLAY=wayland-5
-
-meson test -C ${builddir} \
-            --print-errorlogs \
-            --setup=wayland \
-            --suite=${suite} \
-            --no-suite=failing \
-            --no-suite=flaky \
-            --no-suite=wayland_failing \
-            --no-suite=gsk-compare-broadway \
-            --verbose \
-            "${unit}"
-
-exit_code=$?
-kill ${compositor}
-
-exit ${exit_code}

.gitlab-ci/run-tests.sh

@@ -9,7 +9,7 @@ backend=$2
 multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 
 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_leaks=0:allocator_may_return_null=1
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:verbosity=1:log_threads=1
 export G_SLICE=always-malloc
 
 case "${backend}" in

.gitlab-ci/test-msys2.sh

@@ -32,8 +32,7 @@ pacman --noconfirm -S --needed \
     mingw-w64-$MSYS2_ARCH-fribidi \
     mingw-w64-$MSYS2_ARCH-gst-plugins-bad-libs \
     mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-python-gobject \
-    mingw-w64-$MSYS2_ARCH-shaderc
+    mingw-w64-$MSYS2_ARCH-python-gobject
 
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"

AUTHORS

@@ -7,7 +7,7 @@ Peter Mattis      <petm@xcf.berkeley.edu>
 Spencer Kimball   <spencer@xcf.berkeley.edu>
 Josh MacDonald    <jmacd@xcf.berkeley.edu>
 
-The team that build GTK 2 (in alphabetical order)
+The Team that build GTK 2 (in alphabetical order)
 -------------------------------------------------
 Shawn T. Amundson <amundson@gtk.org>
 Jerome Bolliet    <bolliet@gtk.org>
@@ -28,8 +28,9 @@ Jay Painter       <jpaint@gtk.org>
 Manish Singh      <manish@gtk.org>
 Owen Taylor       <otaylor@gtk.org>
 
-The team that built GTK 3
--------------------------
+The current team (GTK 3 and 4)
+------------------------------
+
 Jonas Ådahl       <jadahl@gmail.com>
 Tim Bäder         <mail@baedert.org>
 Emmanuele Bassi   <ebassi@gnome.org>
@@ -39,16 +40,6 @@ Carlos Garnacho   <mrgarnacho@gmail.com>
 Alexander Larsson <alexl@redhat.com>
 Benjamin Otte     <otte@gnome.org>
 
-The current team (GTK 4)
-------------------------
-Jonas Ådahl       <jadahl@gmail.com>
-Emmanuele Bassi   <ebassi@gnome.org>
-Christian Hergert <chergert@gnome.org>
-Chun-wei Fan      <fanchunwei@src.gnome.org>
-Matthias Clasen   <mclasen@redhat.com>
-Carlos Garnacho   <mrgarnacho@gmail.com>
-Benjamin Otte     <otte@gnome.org>
-
 
 There are many others who have contributed patches; we thank them,
 GTK is much better because of them.
@@ -58,15 +49,35 @@ Over time, GTK has incorporated some pieces of software which
 started as independent projects. We list the original authors here:
 
 
+MS-Windows theme engine
+-----------------------
+Raymond Penners
+Dom Lachowicz
+
+
+Pixbuf theme engine
+-------------------
+Owen Taylor
+
+
 IME input method
 ----------------
 Takuro Ashie
 Kazuki IWAMOTO
 
-MacOS backend
--------------
+
+Mac OS X backend
+----------------
 Anders Carlsson
 
-GtkInspector (originally gtkparasite)
--------------------------------------
+
+DirectFB backend
+----------------
+Denis Oliver Kropp
+Sven Neumann
+Mike Emmel
+
+
+gtkparasite
+-----------
 Christian Hammond

NEWS

@@ -1,173 +1,6 @@
-Overview of Changes in 4.11.5, xx-xx-xxxx
+Overview of Changes in 4.11.3, xx-xx-xxxx
 =========================================
 
-Overview of Changes in 4.11.4, 03-07-2023
-=========================================
-
-* GtkFileChooser:
- - Default to sorting folders first
- - Fix a crash when visiting recent files
-
-* GtkTextView:
- - Fix corner cases in word navigation
-
-* GtkMenuButton:
- - Normalize label layout
-
-* GtkDropDown:
- - Add support for sections
-
-* GtkVideo:
- - Make the overlay icon clickable
-
-* GtkWindow:
- - Clear the resize cursors to avoid artifacts
-
-* GtkFileDialog:
- - Always set initial-folder
-
-* GtkDropDown:
- - Update on expression changes
-
-* GtkMapListModel:
- - Implement GtkSectionModel
-
-* Accessibility:
- - Improvements all over the place: GtkButton, GtkPasswordEntry,
-   GtkFontChooserDialog, GtkColorChooserDialog, GtkShortcutsWindow,
-   GtkMenuButton, GtkAboutDialog, GtkFileChooserDialog, GtkStackSidebar,
-   GtkStackSwitcher, GtkMediaControls, GtkColorDialogButton, GtkDropDown,
-   GtkInfoBar, GtkNotebook, GtkPrintUnixDialog, GtkModelButton
- - Make name computation follow the ARIA spec more closely
- - Adapt name computation for the common 'nested button' scenario
- - Change many containers to use `generic` instead of `group`
- - Use `generic` as the default role
- - Use `application` instead of `window` for windows
- - Add properties for accessible names of not directly exposed
-   widgets in GtkListView, GtkGridView and GtkColumnView
-
-* DND:
- - Fix criticals when drops are rejected
-
-* X11:
- - Fix regressions in GLX setup
-
-* Windows:
- - Center newly created transient windows
-
-* Vulkan:
- - Add antialising for gradients
- - Do less work on clipped away nodes
- - Redo image uploading
- - Support different image depths and formats
- - Add a pipeline cache
-
-* Demos:
- - gtk4-demo: Improve window sizing
- - gtk4-demo: Improve focus behavior
- - gtk4-demo: Add many missing a11y properties
-
-* Tools:
- - gtk4-builder-tool: Make render an alias screenshot
-
-* Inspector:
- - Show more information in the a11y tab
- - Add an accessibility overlay with warnings and recommendations
- - Limit the width of the a11y tab
-
-* Build:
- - Require GLib 2.76
- - Make asan builds work again
- - Fix the build if ld is not ld.bdf
-
-* Translation updates:
- Brazilian Portuguese
- Catalan
- Czech
- Georgian
-
-
-Overview of Changes in 4.11.3, 05-06-2023
-=========================================
-
-* GtkGridView:
- - Respect css border-spacing
- - Don't leak the factories
-
-* GtkListView:
- - Don't leak the factories
-
-* GtkColumnView:
- - Support displaying sections
-
-* GtkNotebook:
- - Make the pages model implement GtkSelectionModel
-
-* GtkScrolledWindow:
- - Propagate child measure size whenever possible
-
-* GtkPopoverMenu:
- - Avoid unnecessary left padding
-
-* GtkSearchEntry:
- - Improve size allocation for the clear icon
-
-* GtkBoxLayout:
- - Fix a regression from recent baseline work
-
-* CSS:
- - Add new binding-friendly css provider apis
-
-* Theme:
- - Show focus in the shortcuts window
-
-* GDK:
- - Support grayscale and alpha texture formats for loading
-   and saving to png and tiff, and in GL
- - Fix some regressions in GL context initialization
-
-* GSK:
- - Support grayscale and alpha texture formats in the GL renderer
- - Support straight alpha textures in the GL renderer
- - Many improvements to the experimental Vulkan renderer
-
-* Wayland:
- - Make exporting surface handles more flexible
-
-* X11:
- - Trap XRandr errors
- - Stop using passive grabs during DND
-
-* Windows:
- - Many cleanups and simplifications
-
-* Tests:
- - Improve test coverage
-
-* Build:
- - Some build options have been renamed:
-     demos -> build-demos
-     profile -> demo-profile
-   The old names still work
-
-* Deprecations:
- - gtk_css_provider_load_from_data
- - gdk_wayland_toplevel_unexport_handle
- - gdk_pixbuf_get_from_surface
- - gdk_pixbuf_get_from_texture
- - gtk_image_new_from_pixbuf
- - gtk_image_set_from_pixbuf
- - gtk_picture_new_for_pixbuf
- - gtk_picture_set_pixbuf
-
-* Translation updates:
- Basque
- Catalan
- Georgian
- Russian
- Turkish
-
-
 Overview of Changes in 4.11.2, 09-05-2023
 =========================================
 

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

@@ -483,8 +483,6 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 
-  g_type_ensure (CONSTRAINT_VIEW_TYPE);
-
   object_class->dispose = constraint_editor_window_dispose;
 
   gtk_widget_class_set_template_from_resource (widget_class,

demos/constraint-editor/constraint-editor.c

@@ -20,7 +20,8 @@
 #include "config.h"
 
 #include "constraint-editor.h"
-#include "constraint-view.h"
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
 struct _ConstraintEditor
 {
@@ -65,7 +66,7 @@ static const char *
 get_target_name (GtkConstraintTarget *target)
 {
   if (target == NULL)
-    return "Super";
+    return "super";
   else if (GTK_IS_WIDGET (target))
     return gtk_widget_get_name (GTK_WIDGET (target));
   else if (GTK_IS_CONSTRAINT_GUIDE (target))
@@ -79,29 +80,62 @@ constraint_target_combo (GListModel *model,
                          GtkWidget  *combo,
                          gboolean    is_source)
 {
-  GtkStringList *targets;
   int i;
 
-  targets = gtk_string_list_new (NULL);
-
-  gtk_string_list_append (targets, "Super");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "super", "Super");
 
   if (model)
     {
       for (i = 0; i < g_list_model_get_n_items (model); i++)
         {
           GObject *item = g_list_model_get_object (model, i);
+          const char *name;
 
           if (GTK_IS_CONSTRAINT (item))
             continue;
 
-          gtk_string_list_append (targets, get_target_name (GTK_CONSTRAINT_TARGET (item)));
+          name = get_target_name (GTK_CONSTRAINT_TARGET (item));
+
+          gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), name, name);
           g_object_unref (item);
         }
     }
+}
 
-  gtk_drop_down_set_model (GTK_DROP_DOWN (combo), G_LIST_MODEL (targets));
-  g_object_unref (targets);
+static void
+constraint_attribute_combo (GtkWidget *combo,
+                            gboolean is_source)
+{
+  if (is_source)
+    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "none", "None");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "left", "Left");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "right", "Right");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "top", "Top");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "bottom", "Bottom");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "start", "Start");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "end", "End");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "width", "Width");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "height", "Height");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-x", "Center X");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-y", "Center Y");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "baseline", "Baseline");
+}
+
+static void
+constraint_relation_combo (GtkWidget *combo)
+{
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "le", "≤");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "eq", "=");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "ge", "≥");
+}
+
+static void
+constraint_strength_combo (GtkWidget *combo)
+{
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
 }
 
 static gpointer
@@ -113,7 +147,7 @@ get_target (GListModel *model,
   if (id == NULL)
     return NULL;
 
-  if (strcmp ("Super", id) == 0)
+  if (strcmp ("super", id) == 0)
     return NULL;
 
   for (i = 0; i < g_list_model_get_n_items (model); i++)
@@ -137,65 +171,16 @@ get_target (GListModel *model,
   return NULL;
 }
 
-static void
-select_target (GtkDropDown *combo,
-               const char  *target_name)
-{
-  GListModel *model = gtk_drop_down_get_model (combo);
-
-  for (unsigned int i = 0; i < g_list_model_get_n_items (model); i++)
-    {
-      GtkStringObject *s = g_list_model_get_item (model, i);
-
-      g_object_unref (s);
-      if (strcmp (target_name, gtk_string_object_get_string (s)) == 0)
-        {
-          gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), i);
-          return;
-        }
-    }
-}
-
 static GtkConstraintAttribute
-get_attr (unsigned int id)
+get_target_attr (const char *id)
 {
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_ATTRIBUTE_NONE;
-    case 1: return GTK_CONSTRAINT_ATTRIBUTE_LEFT;
-    case 2: return GTK_CONSTRAINT_ATTRIBUTE_RIGHT;
-    case 3: return GTK_CONSTRAINT_ATTRIBUTE_TOP;
-    case 4: return GTK_CONSTRAINT_ATTRIBUTE_BOTTOM;
-    case 5: return GTK_CONSTRAINT_ATTRIBUTE_START;
-    case 6: return GTK_CONSTRAINT_ATTRIBUTE_END;
-    case 7: return GTK_CONSTRAINT_ATTRIBUTE_WIDTH;
-    case 8: return GTK_CONSTRAINT_ATTRIBUTE_HEIGHT;
-    case 9: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_X;
-    case 10: return GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y;
-    case 11: return GTK_CONSTRAINT_ATTRIBUTE_BASELINE;
-    default: g_assert_not_reached ();
-    }
-}
+  GtkConstraintAttribute attr;
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
+  attr = value->value;
+  g_type_class_unref (class);
 
-static unsigned int
-get_attr_id (GtkConstraintAttribute attr)
-{
-  switch (attr)
-    {
-    case GTK_CONSTRAINT_ATTRIBUTE_NONE: return 0;
-    case GTK_CONSTRAINT_ATTRIBUTE_LEFT: return 1;
-    case GTK_CONSTRAINT_ATTRIBUTE_RIGHT: return 2;
-    case GTK_CONSTRAINT_ATTRIBUTE_TOP: return 3;
-    case GTK_CONSTRAINT_ATTRIBUTE_BOTTOM: return 4;
-    case GTK_CONSTRAINT_ATTRIBUTE_START: return 5;
-    case GTK_CONSTRAINT_ATTRIBUTE_END: return 6;
-    case GTK_CONSTRAINT_ATTRIBUTE_WIDTH: return 7;
-    case GTK_CONSTRAINT_ATTRIBUTE_HEIGHT: return 8;
-    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_X: return 9;
-    case GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y: return 10;
-    case GTK_CONSTRAINT_ATTRIBUTE_BASELINE: return 11;
-    default: g_assert_not_reached ();
-    }
+  return attr;
 }
 
 static const char *
@@ -210,27 +195,15 @@ get_attr_nick (GtkConstraintAttribute attr)
 }
 
 static GtkConstraintRelation
-get_relation (unsigned int id)
+get_relation (const char *id)
 {
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_RELATION_LE;
-    case 1: return GTK_CONSTRAINT_RELATION_EQ;
-    case 2: return GTK_CONSTRAINT_RELATION_GE;
-    default: g_assert_not_reached ();
-    }
-}
+  GtkConstraintRelation relation;
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
+  relation = value->value;
+  g_type_class_unref (class);
 
-static unsigned int
-get_relation_id (GtkConstraintRelation relation)
-{
-  switch (relation)
-    {
-    case GTK_CONSTRAINT_RELATION_LE: return 0;
-    case GTK_CONSTRAINT_RELATION_EQ: return 1;
-    case GTK_CONSTRAINT_RELATION_GE: return 2;
-    default: g_assert_not_reached ();
-    }
+  return relation;
 }
 
 static const char *
@@ -261,29 +234,15 @@ get_relation_display_name (GtkConstraintRelation relation)
 }
 
 static GtkConstraintStrength
-get_strength (unsigned int id)
-{ 
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
-    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
-    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
-    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
-    default: g_assert_not_reached ();
-    }
-}
-
-static unsigned int
-get_strength_id (GtkConstraintStrength strength)
+get_strength (const char *id)
 {
-  switch (strength)
-    {
-    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
-    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
-    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
-    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
-    default: g_assert_not_reached ();
-    }
+  GtkConstraintStrength strength;
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
+  strength = value->value;
+  g_type_class_unref (class);
+
+  return strength;
 }
 
 static const char *
@@ -335,7 +294,7 @@ static void
 create_constraint (GtkButton        *button,
                    ConstraintEditor *editor)
 {
-  gpointer obj;
+  const char *id;
   gpointer target;
   GtkConstraintAttribute target_attr;
   gpointer source;
@@ -346,27 +305,25 @@ create_constraint (GtkButton        *button,
   int strength;
   GtkConstraint *constraint;
 
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
-  if (obj)
-    target = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
-  else
-    target = NULL;
-  target_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->target_attr)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
+  target = get_target (editor->model, id);
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
+  target_attr = get_target_attr (id);
 
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
-  if (obj)
-    source = get_target (editor->model, gtk_string_object_get_string (GTK_STRING_OBJECT (obj)));
-  else
-    source = NULL;
-  source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN(editor->source_attr)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
+  source = get_target (editor->model, id);
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
+  source_attr = get_target_attr (id);
 
-  relation = get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->relation));
+  relation = get_relation (id);
 
   multiplier = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->multiplier)), NULL);
 
   constant = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->constant)), NULL);
 
-  strength = get_strength (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength)));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
+  strength = get_strength (id);
 
   constraint = gtk_constraint_new (target, target_attr,
                                    relation,
@@ -381,9 +338,12 @@ create_constraint (GtkButton        *button,
 static void
 source_attr_changed (ConstraintEditor *editor)
 {
-  if (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))) == GTK_CONSTRAINT_ATTRIBUTE_NONE)
+  const char *id;
+
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
+  if (strcmp (id, "none") == 0)
     {
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source), GTK_INVALID_LIST_POSITION);
+      gtk_combo_box_set_active (GTK_COMBO_BOX (editor->source), -1);
       gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "");
       gtk_widget_set_sensitive (editor->source, FALSE);
       gtk_widget_set_sensitive (editor->multiplier, FALSE);
@@ -449,7 +409,7 @@ update_preview (ConstraintEditor *editor)
   GString *str;
   const char *name;
   const char *attr;
-  const char *relation;
+  char *relation;
   const char *multiplier;
   const char *constant;
   double c, m;
@@ -459,22 +419,23 @@ update_preview (ConstraintEditor *editor)
 
   str = g_string_new ("");
 
-  name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target))));
-  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected ((GTK_DROP_DOWN (editor->target_attr)))));
-  relation = get_relation_nick (get_relation (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->relation))));
+  name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
+  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
+  relation = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (editor->relation));
 
   if (name == NULL)
     name = "[ ]";
 
   g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
+  g_free (relation);
 
   constant = gtk_editable_get_text (GTK_EDITABLE (editor->constant));
   c = g_ascii_strtod (constant, NULL);
 
-  attr = get_attr_nick (get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr))));
+  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
   if (strcmp (attr, "none") != 0)
     {
-       name = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source))));
+      name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
       multiplier = gtk_editable_get_text (GTK_EDITABLE (editor->multiplier));
       m = g_ascii_strtod (multiplier, NULL);
 
@@ -502,18 +463,12 @@ update_preview (ConstraintEditor *editor)
 static void
 update_button (ConstraintEditor *editor)
 {
-  gpointer obj;
-  const char *target;
-  const char *source;
-  GtkConstraintAttribute source_attr = get_attr (gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->source_attr)));
+  const char *target = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
+  const char *source = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
+  const char *source_attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
 
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->target));
-  target = obj ? gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
-
-  obj = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (editor->source));
-  source = obj ?  gtk_string_object_get_string (GTK_STRING_OBJECT (obj)) : NULL;
-
-  if (target && (source || (source_attr == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
+  if (target &&
+      (source || (source_attr && get_target_attr (source_attr) == GTK_CONSTRAINT_ATTRIBUTE_NONE)))
     gtk_widget_set_sensitive (editor->button, TRUE);
   else
     gtk_widget_set_sensitive (editor->button, FALSE);
@@ -531,7 +486,12 @@ constraint_editor_constructed (GObject *object)
   ConstraintEditor *editor = CONSTRAINT_EDITOR (object);
 
   constraint_target_combo (editor->model, editor->target, FALSE);
+  constraint_attribute_combo (editor->target_attr, FALSE);
+  constraint_relation_combo (editor->relation);
   constraint_target_combo (editor->model, editor->source, TRUE);
+  constraint_attribute_combo (editor->source_attr, TRUE);
+
+  constraint_strength_combo (editor->strength);
 
   if (editor->constraint)
     {
@@ -539,24 +499,30 @@ constraint_editor_constructed (GObject *object)
       GtkConstraintAttribute attr;
       GtkConstraintRelation relation;
       GtkConstraintStrength strength;
+      const char *nick;
       char *val;
       double multiplier;
       double constant;
 
       target = gtk_constraint_get_target (editor->constraint);
-      select_target (GTK_DROP_DOWN (editor->target), get_target_name (target));
+      nick = get_target_name (target);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target), nick);
 
       attr = gtk_constraint_get_target_attribute (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (attr));
+      nick = get_attr_nick (attr);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), nick);
 
       target = gtk_constraint_get_source (editor->constraint);
-      select_target (GTK_DROP_DOWN (editor->source), get_target_name (target));
+      nick = get_target_name (target);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source), nick);
 
       attr = gtk_constraint_get_source_attribute (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (attr));
+      nick = get_attr_nick (attr);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), nick);
 
       relation = gtk_constraint_get_relation (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (relation));
+      nick = get_relation_nick (relation);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), nick);
 
       multiplier = gtk_constraint_get_multiplier (editor->constraint);
       val = g_strdup_printf ("%g", multiplier);
@@ -569,16 +535,17 @@ constraint_editor_constructed (GObject *object)
       g_free (val);
 
       strength = gtk_constraint_get_strength (editor->constraint);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
+      nick = get_strength_nick (strength);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
     }
   else
     {
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->target_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->source_attr), get_attr_id (GTK_CONSTRAINT_ATTRIBUTE_LEFT));
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->relation), get_relation_id (GTK_CONSTRAINT_RELATION_EQ));
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_REQUIRED));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), "left");
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), "left");
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), "eq");
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "required");
 
       gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1.0");
       gtk_editable_set_text (GTK_EDITABLE (editor->constant), "0.0");

demos/constraint-editor/constraint-editor.ui

@@ -1,21 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <object class="GtkStringList" id="targets">
-    <items>
-      <item>None</item>
-      <item>Left</item>
-      <item>Right</item>
-      <item>Top</item>
-      <item>Bottom</item>
-      <item>Start</item>
-      <item>End</item>
-      <item>Width</item>
-      <item>Height</item>
-      <item>Center X</item>
-      <item>Center Y</item>
-      <item>Baseline</item>
-    </items>
-  </object>
   <template class="ConstraintEditor" parent="GtkWidget">
     <child>
       <object class="GtkGrid" id="grid">
@@ -35,9 +19,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="target">
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
-            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+          <object class="GtkComboBoxText" id="target">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
+            <signal name="changed" handler="update_button" swapped="yes"/>
             <layout>
               <property name="column">1</property>
               <property name="row">1</property>
@@ -45,9 +29,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="target_attr">
-            <property name="model">targets</property>
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
+          <object class="GtkComboBoxText" id="target_attr">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
               <property name="column">2</property>
               <property name="row">1</property>
@@ -64,17 +47,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="relation">
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
-            <property name="model">
-              <object class="GtkStringList">
-                <items>
-                  <item>≤</item>
-                  <item>=</item>
-                  <item>≥</item>
-                </items>
-              </object>
-            </property>
+          <object class="GtkComboBoxText" id="relation">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
             <layout>
               <property name="column">1</property>
               <property name="row">2</property>
@@ -91,9 +65,9 @@
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="source">
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
-            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+          <object class="GtkComboBoxText" id="source">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
+            <signal name="changed" handler="update_button" swapped="yes"/>
             <layout>
               <property name="column">1</property>
               <property name="row">3</property>
@@ -101,11 +75,10 @@
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="source_attr">
-            <property name="model">targets</property>
-            <signal name="notify::selected" handler="update_preview" swapped="yes"/>
-            <signal name="notify::selected" handler="source_attr_changed" swapped="yes"/>
-            <signal name="notify::selected" handler="update_button" swapped="yes"/>
+          <object class="GtkComboBoxText" id="source_attr">
+            <signal name="changed" handler="update_preview" swapped="yes"/>
+            <signal name="changed" handler="source_attr_changed" swapped="yes"/>
+            <signal name="changed" handler="update_button" swapped="yes"/>
             <layout>
               <property name="column">2</property>
               <property name="row">3</property>
@@ -158,17 +131,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="strength">
-            <property name="model">
-              <object class="GtkStringList">
-                <items>
-                  <item>Weak</item>
-                  <item>Medium</item>
-                  <item>Strong</item>
-                  <item>Required</item>
-                </items>
-              </object>
-            </property>
+          <object class="GtkComboBoxText" id="strength">
             <layout>
               <property name="column">1</property>
               <property name="row">6</property>

demos/constraint-editor/guide-editor.c

@@ -21,6 +21,8 @@
 
 #include "guide-editor.h"
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 struct _GuideEditor
 {
   GtkWidget parent_instance;
@@ -57,30 +59,25 @@ static guint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE(GuideEditor, guide_editor, GTK_TYPE_WIDGET);
 
-static GtkConstraintStrength
-get_strength (unsigned int id)
+static void
+guide_strength_combo (GtkWidget *combo)
 {
-  switch (id)
-    {
-    case 0: return GTK_CONSTRAINT_STRENGTH_WEAK;
-    case 1: return GTK_CONSTRAINT_STRENGTH_MEDIUM;
-    case 2: return GTK_CONSTRAINT_STRENGTH_STRONG;
-    case 3: return GTK_CONSTRAINT_STRENGTH_REQUIRED;
-    default: g_assert_not_reached ();
-    }
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
+  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
 }
 
-static unsigned int
-get_strength_id (GtkConstraintStrength strength)
+static GtkConstraintStrength
+get_strength (const char *id)
 {
-  switch (strength)
-    {
-    case GTK_CONSTRAINT_STRENGTH_WEAK: return 0;
-    case GTK_CONSTRAINT_STRENGTH_MEDIUM: return 1;
-    case GTK_CONSTRAINT_STRENGTH_STRONG: return 2;
-    case GTK_CONSTRAINT_STRENGTH_REQUIRED: return 3;
-    default: g_assert_not_reached ();
-    }
+  GtkConstraintStrength strength;
+  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
+  GEnumValue *value = g_enum_get_value_by_nick (class, id);
+  strength = value->value;
+  g_type_class_unref (class);
+
+  return strength;
 }
 
 static const char *
@@ -121,11 +118,11 @@ static void
 create_guide (GtkButton   *button,
               GuideEditor *editor)
 {
+  const char *id;
   int strength;
   const char *name;
   int w, h;
   GtkConstraintGuide *guide;
-  unsigned int id;
 
   if (editor->guide)
     guide = g_object_ref (editor->guide);
@@ -147,7 +144,7 @@ create_guide (GtkButton   *button,
   h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_height));
   gtk_constraint_guide_set_max_size (guide, w, h);
 
-  id = gtk_drop_down_get_selected (GTK_DROP_DOWN (editor->strength));
+  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
   strength = get_strength (id);
   gtk_constraint_guide_set_strength (guide, strength);
 
@@ -194,9 +191,14 @@ guide_editor_constructed (GObject *object)
 {
   GuideEditor *editor = GUIDE_EDITOR (object);
 
+  guide_strength_combo (editor->strength);
+
   g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
+
   g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
+
   g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
+
   g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
 
   if (editor->guide)
@@ -222,7 +224,8 @@ guide_editor_constructed (GObject *object)
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), h);
 
       strength = gtk_constraint_guide_get_strength (editor->guide);
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (strength));
+      nick = get_strength_nick (strength);
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
     }
@@ -242,7 +245,7 @@ guide_editor_constructed (GObject *object)
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), G_MAXINT);
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), G_MAXINT);
 
-      gtk_drop_down_set_selected (GTK_DROP_DOWN (editor->strength), get_strength_id (GTK_CONSTRAINT_STRENGTH_MEDIUM));
+      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "medium");
 
       gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
     }

demos/constraint-editor/guide-editor.ui

@@ -167,17 +167,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkDropDown" id="strength">
-            <property name="model">
-              <object class="GtkStringList">
-                <items>
-                  <item>Weak</item>
-                  <item>Medium</item>
-                  <item>Strong</item>
-                  <item>Required</item>
-                </items>
-              </object>
-            </property>
+          <object class="GtkComboBoxText" id="strength">
             <layout>
               <property name="column">1</property>
               <property name="row">4</property>

demos/gtk-demo/application.c

@@ -2,6 +2,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
@@ -214,41 +216,6 @@ activate_quit (GSimpleAction *action,
     }
 }
 
-static void
-delete_messages (gpointer data)
-{
-  g_list_free_full ((GList *)data, g_free);
-}
-
-static void
-pop_message (GtkWidget *status)
-{
-  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
-
-  if (messages)
-    {
-      char *message = messages->data;
-      messages = g_list_remove (messages, message);
-
-      g_object_set_data_full (G_OBJECT (status), "messages",
-                              messages, delete_messages);
-
-      gtk_label_set_label (GTK_LABEL (status), message);
-    }
-}
-
-static void
-push_message (GtkWidget  *status,
-              const char *message)
-{
-  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
-
-  gtk_label_set_label (GTK_LABEL (status), message);
-  messages = g_list_prepend (messages, g_strdup (message));
-  g_object_set_data_full (G_OBJECT (status), "messages",
-                          messages, delete_messages);
-}
-
 static void
 update_statusbar (GtkTextBuffer         *buffer,
                   DemoApplicationWindow *window)
@@ -259,7 +226,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   GtkTextIter iter;
 
   /* clear any previous message, underflow is allowed */
-  pop_message (window->status);
+  gtk_statusbar_pop (GTK_STATUSBAR (window->status), 0);
 
   count = gtk_text_buffer_get_char_count (buffer);
 
@@ -273,7 +240,7 @@ update_statusbar (GtkTextBuffer         *buffer,
   msg = g_strdup_printf ("Cursor at row %d column %d - %d chars in document",
                          row, col, count);
 
-  push_message (window->status, msg);
+  gtk_statusbar_push (GTK_STATUSBAR (window->status), 0, msg);
 
   g_free (msg);
 }

demos/gtk-demo/application.ui

@@ -76,13 +76,8 @@
           </object>
         </child>
         <child>
-          <object class="GtkLabel" id="status">
+          <object class="GtkStatusbar" id="status">
             <property name="hexpand">1</property>
-            <property name="xalign">0</property>
-            <property name="margin-start">2</property>
-            <property name="margin-end">2</property>
-            <property name="margin-top">2</property>
-            <property name="margin-bottom">2</property>
             <layout>
               <property name="column">0</property>
               <property name="row">3</property>

demos/gtk-demo/assistant.c

@@ -162,10 +162,6 @@ create_page4 (GtkWidget *assistant)
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), progress_bar, GTK_ASSISTANT_PAGE_PROGRESS);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), progress_bar, "Applying changes");
 
-  gtk_accessible_update_property (GTK_ACCESSIBLE (progress_bar),
-                                  GTK_ACCESSIBLE_PROPERTY_LABEL, "Applying changes",
-                                  -1);
-
   /* This prevents the assistant window from being
    * closed while we're "busy" applying changes.
    */

demos/gtk-demo/builder.c

@@ -1,5 +1,5 @@
 /* Builder
- * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkShortcutController, toolbar
+ * #Keywords: GMenu, GtkPopoverMenuBar, GtkBuilder, GtkStatusBar, GtkShortcutController, toolbar
  *
  * Demonstrates a traditional interface, loaded from a XML description,
  * and shows how to connect actions to the menu items and toolbar buttons.
@@ -37,34 +37,30 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-static int
-pop_message (gpointer data)
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+static gboolean
+pop_status (gpointer data)
 {
-  GtkWidget *status = data;
-
-  gtk_label_set_label (GTK_LABEL (status), "");
-  g_object_set_data (G_OBJECT (status), "timeout", GUINT_TO_POINTER (0));
-
+  gtk_statusbar_pop (GTK_STATUSBAR (data), 0);
+  g_object_set_data (G_OBJECT (data), "timeout", NULL);
   return G_SOURCE_REMOVE;
 }
 
 static void
-status_message (GtkWidget  *status,
-                const char *text)
+status_message (GtkStatusbar *status,
+                const char   *text)
 {
   guint id;
 
-  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (status), "timeout"));
-  if (id)
-    g_source_remove (id);
-
-  gtk_label_set_text (GTK_LABEL (status), text);
-
-  id = g_timeout_add (5000, pop_message, status);
+  gtk_statusbar_push (GTK_STATUSBAR (status), 0, text);
+  id = g_timeout_add (5000, pop_status, status);
 
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,
@@ -73,7 +69,7 @@ help_activate (GSimpleAction *action,
   GtkWidget *status;
 
   status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (status, "Help not available");
+  status_message (GTK_STATUSBAR (status), "Help not available");
 }
 
 static void
@@ -86,7 +82,7 @@ not_implemented (GSimpleAction *action,
 
   text = g_strdup_printf ("Action “%s” not implemented", g_action_get_name (G_ACTION (action)));
   status = GTK_WIDGET (g_object_get_data (G_OBJECT (user_data), "status"));
-  status_message (status, text);
+  status_message (GTK_STATUSBAR (status), text);
   g_free (text);
 }
 

demos/gtk-demo/clipboard.ui

@@ -4,9 +4,6 @@
   <object class="GtkWindow" id="window">
     <property name="resizable">1</property>
     <property name="title">Clipboard</property>
-    <accessibility>
-      <relation name="described-by">label</relation>
-    </accessibility>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
@@ -16,7 +13,7 @@
         <property name="margin-bottom">12</property>
         <property name="spacing">12</property>
         <child>
-          <object class="GtkLabel" id="label">
+          <object class="GtkLabel">
             <property name="label">“Copy” will copy the selected data the clipboard, “Paste” will show the current clipboard contents. You can also drag the data to the bottom.</property>
             <property name="wrap">1</property>
             <property name="max-width-chars">40</property>
@@ -27,9 +24,6 @@
             <property name="spacing">12</property>
             <child>
               <object class="GtkDropDown" id="source_chooser">
-                <accessibility>
-                  <property name="label">Source Type</property>
-                </accessibility>
                 <property name="valign">center</property>
                 <property name="model">
                   <object class="GtkStringList">
@@ -60,9 +54,6 @@
                     <property name="name">Text</property>
                     <property name="child">
                       <object class="GtkEntry" id="source_text">
-                        <accessibility>
-                          <property name="label">Text Drag Source</property>
-                        </accessibility>
                         <property name="valign">center</property>
                         <signal name="notify::text" handler="text_changed_cb" object="copy_button"/>
                         <property name="text">Copy this!</property>
@@ -75,9 +66,6 @@
                     <property name="name">Color</property>
                     <property name="child">
                       <object class="GtkColorDialogButton" id="source_color">
-                        <accessibility>
-                          <property name="label">Color Drag Source</property>
-                        </accessibility>
                         <property name="dialog">
                           <object class="GtkColorDialog">
                           </object>
@@ -99,17 +87,14 @@
                         </style>
                         <child>
                           <object class="GtkToggleButton" id="image_rose">
-                            <accessibility>
-                              <property name="label">Photo Drag Source</property>
-                            </accessibility>
                             <property name="active">1</property>
                             <child>
+                              <object class="GtkDragSource">
+                                <signal name="prepare" handler="drag_prepare"/>
+                              </object>
                             </child>
                             <child>
                               <object class="GtkImage">
-                                <accessibility>
-                                  <property name="label">Portland Rose Photo</property>
-                                </accessibility>
                                 <style>
                                   <class name="large-icons"/>
                                 </style>
@@ -120,9 +105,6 @@
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="image_floppy">
-                            <accessibility>
-                              <property name="label">Icon Drag Source</property>
-                            </accessibility>
                             <property name="group">image_rose</property>
                             <child>
                               <object class="GtkDragSource">
@@ -131,9 +113,6 @@
                             </child>
                             <child>
                               <object class="GtkImage">
-                                <accessibility>
-                                  <property name="label">Floppy Buddy Icon</property>
-                                </accessibility>
                                 <style>
                                   <class name="large-icons"/>
                                 </style>
@@ -144,9 +123,6 @@
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="image_logo">
-                            <accessibility>
-                              <property name="label">SVG Drag Source</property>
-                            </accessibility>
                             <property name="group">image_floppy</property>
                             <child>
                               <object class="GtkDragSource">
@@ -155,9 +131,6 @@
                             </child>
                             <child>
                               <object class="GtkImage">
-                                <accessibility>
-                                  <property name="label">gtk-demo logo</property>
-                                </accessibility>
                                 <style>
                                   <class name="large-icons"/>
                                 </style>
@@ -175,9 +148,6 @@
                     <property name="name">File</property>
                     <property name="child">
                       <object class="GtkButton" id="source_file">
-                        <accessibility>
-                          <property name="label">File Drag Source</property>
-                        </accessibility>
                         <child>
                           <object class="GtkDragSource">
                             <property name="propagation-phase">capture</property>
@@ -202,9 +172,6 @@
                     <property name="name">Folder</property>
                     <property name="child">
                       <object class="GtkButton" id="source_folder">
-                        <accessibility>
-                          <property name="label">Folder Drag Source</property>
-                        </accessibility>
                         <child>
                           <object class="GtkDragSource">
                             <property name="propagation-phase">capture</property>
@@ -258,7 +225,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkLabel" id="paste_label">
+              <object class="GtkLabel">
                 <property name="xalign">0</property>
                 <binding name="label">
                   <lookup name="visible-child-name" type="GtkStack">
@@ -285,9 +252,6 @@
                     <property name="name">Text</property>
                     <property name="child">
                       <object class="GtkLabel">
-                        <accessibility>
-                          <relation name="labelled-by">paste_label</relation>
-                        </accessibility>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
                         <property name="xalign">0</property>
@@ -301,9 +265,6 @@
                     <property name="name">Image</property>
                     <property name="child">
                       <object class="GtkImage">
-                        <accessibility>
-                          <relation name="labelled-by">paste_label</relation>
-                        </accessibility>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
                         <style>
@@ -322,9 +283,6 @@
                         <property name="valign">center</property>
                         <child>
                           <object class="GtkColorSwatch">
-                            <accessibility>
-                              <relation name="labelled-by">paste_label</relation>
-                            </accessibility>
                             <property name="accessible-role">img</property>
                             <property name="can-focus">0</property>
                             <property name="selectable">0</property>
@@ -340,9 +298,6 @@
                     <property name="name">File</property>
                     <property name="child">
                       <object class="GtkLabel">
-                        <accessibility>
-                          <relation name="labelled-by">paste_label</relation>
-                        </accessibility>
                         <property name="halign">end</property>
                         <property name="valign">center</property>
                         <property name="xalign">0</property>

demos/gtk-demo/css_basics.c

@@ -6,6 +6,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -47,23 +49,20 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 }
 
-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+  GtkWidget *child;
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -82,7 +81,6 @@ do_css_basics (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       text = gtk_text_buffer_new (NULL);

demos/gtk-demo/css_basics.css

@@ -4,24 +4,23 @@
  * anymore. :)
  */
 
-/* This resets all properties to their defaults values
- * and overrides all user settings and the theme in use
- */
-@import url("resource://css_shadows/reset.css");
+/* This CSS resets all properties to their defaults values
+ *    and overrides all user settings and the theme in use */
+@import url("resource://css_basics/reset.css");
 
 /* Set a very futuristic style by default */
-.demo * {
+* {
   color: green;
   font-family: Monospace;
   border: 1px solid;
 }
 
-window.demo {
+window {
   background-color: white;
 }
 
 /* Make sure selections are visible */
-.demo selection {
+selection {
   background-color: darkGreen;
   color: black;
 }

demos/gtk-demo/css_multiplebgs.c

@@ -6,6 +6,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -48,23 +50,33 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 }
 
 static void
-clear_provider (gpointer data)
+drawing_area_draw (GtkDrawingArea *da,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
-  GtkStyleProvider *provider = data;
+  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (da));
 
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
+  gtk_render_background (context, cr, 0, 0, width, height);
+  gtk_render_frame (context, cr, 0, 0, width, height);
 }
 
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+  GtkWidget *child;
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -83,17 +95,16 @@ do_css_multiplebgs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       overlay = gtk_overlay_new ();
       gtk_window_set_child (GTK_WINDOW (window), overlay);
 
       child = gtk_drawing_area_new ();
-      /* Don't set a draw_func, since we are only interested in CSS drawing,
-       * which happens automatically.
-       */
       gtk_widget_set_name (child, "canvas");
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
+                                      drawing_area_draw,
+                                      NULL, NULL);
       gtk_overlay_set_child (GTK_OVERLAY (overlay), child);
 
       child = gtk_button_new ();

demos/gtk-demo/css_pixbufs.c

@@ -7,6 +7,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -49,23 +51,20 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 }
 
-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+  GtkWidget *child;
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 GtkWidget *
@@ -84,7 +83,6 @@ do_css_pixbufs (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);

demos/gtk-demo/css_pixbufs.css

@@ -50,7 +50,7 @@
     100% { background-size: 12px, 96px, 12px, 96px, 12px, 96px, 12px, 96px, auto; }
 }
 
-window.demo {
+window {
     background-image: url("resource://css_pixbufs/images/apple-red.png"),
                       url("resource://css_pixbufs/images/gnome-applets.png"),
                       url("resource://css_pixbufs/images/gnome-calendar.png"),
@@ -66,11 +66,11 @@ window.demo {
 }
 
 /* Make the text editor has a nice style */
-window.demo .view, scrollbar, separator {
+.view, scrollbar, separator {
   color: black;
   background-color: rgba(255,255,255,0.5);
 }
 
-window.demo .view:selected {
+.view:selected {
   background-color: rgba(127,127,255,0.5);
 }

demos/gtk-demo/css_shadows.c

@@ -5,6 +5,8 @@
 
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static void
 show_parsing_error (GtkCssProvider *provider,
                     GtkCssSection  *section,
@@ -46,23 +48,20 @@ css_text_changed (GtkTextBuffer  *buffer,
   gtk_text_buffer_remove_all_tags (buffer, &start, &end);
 
   text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-  gtk_css_provider_load_from_string (provider, text);
+  gtk_css_provider_load_from_data (provider, text, -1);
   g_free (text);
 }
 
-static void
-clear_provider (gpointer data)
-{
-  GtkStyleProvider *provider = data;
-
-  gtk_style_context_remove_provider_for_display (gdk_display_get_default (), provider);
-}
-
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (), provider, G_MAXUINT);
-  g_object_set_data_full (G_OBJECT (widget), "provider", provider, clear_provider);
+  GtkWidget *child;
+
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
+  for (child = gtk_widget_get_first_child (widget);
+       child != NULL;
+       child = gtk_widget_get_next_sibling (child))
+    apply_css (child, provider);
 }
 
 static GtkWidget *
@@ -102,7 +101,6 @@ do_css_shadows (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Shadows");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      gtk_widget_add_css_class (window, "demo");
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -144,7 +142,7 @@ do_css_shadows (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_set_visible (window, TRUE);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_shadows.css

@@ -5,13 +5,12 @@
  */
 
 /* This CSS resets all properties to their defaults values
- * and overrides all user settings and the theme in use
- */
+ *    and overrides all user settings and the theme in use */
 @import url("resource://css_shadows/reset.css");
 @import url("resource://css_shadows/cssview.css");
 
 /* Get a nice background for the window */
-window.demo.background {
+.background {
   background-color: #4870bc;
   background-image: linear-gradient(to left, transparent, rgba(255,255,255,.07) 50%, transparent 50%),
                     linear-gradient(to left, transparent, rgba(255,255,255,.13) 50%, transparent 50%),
@@ -20,7 +19,7 @@ window.demo.background {
   background-size: 29px, 59px, 73px, 109px;
 }
 
-window.demo button {
+button {
   color: black;
   padding: 10px;
   border-radius: 5px;
@@ -28,15 +27,18 @@ window.demo button {
   border: 1px transparent solid;
 }
 
-window.demo button:hover {
+button:hover {
   text-shadow: 3px 3px 5px alpha(black, 0.75);
   -gtk-icon-shadow: 3px 3px 5px alpha(black, 0.75);
   box-shadow: 3px 3px 5px alpha(black, 0.5) inset;
   border: solid 1px alpha(black, 0.75);
 }
 
-window.demo button:active {
+button:active {
   padding: 11px 9px 9px 11px;
   text-shadow: 1px 1px 2.5px alpha(black, 0.6);
   -gtk-icon-shadow: 1px 1px 2.5px alpha(black, 0.6);
 }
+
+
+

demos/gtk-demo/cssview.css

@@ -1,21 +1,21 @@
 /* Make the text editor has a nice style */
-window.demo .view {
+.view {
   color: #2e3436;
   font-family: Monospace;
   background-color: alpha(white, 0.30);
 }
 
-window.demo .view:selected {
+.view:selected {
   color: white;
   background-color: #4a90d9;
 }
 
-window.demo scrollbar trough,
+scrollbar trough,
 .scrollbars-junction {
   background-color: alpha(white, 0.80);
 }
 
-window.demo scrollbar slider {
+scrollbar slider {
   border-width: 3px;
   border-style: solid;
   border-radius: 10px;
@@ -24,11 +24,11 @@ window.demo scrollbar slider {
   background-color: #999;
 }
 
-window.demo scrollbar slider:hover {
+scrollbar slider:hover {
   background-color: #555;
 }
 
-window.demo paned separator {
+paned separator {
   background-color: alpha(white, 0.80);
   background-image: linear-gradient(transparent, transparent 1px, #999 1px, #999 4px, transparent 4px);
   background-size: 40px auto;
@@ -36,6 +36,6 @@ window.demo paned separator {
   background-position: center;
 }
 
-window.demo paned separator:hover {
+paned separator:hover {
   background-image: linear-gradient(transparent, transparent 1px, #555 1px, #555 4px, transparent 4px);
 }

demos/gtk-demo/demo.ui

@@ -208,13 +208,7 @@
           </object>
         </child>
         <child>
-          <object class="GtkLabel" id="statusbar1">
-            <property name="xalign">0</property>
-            <property name="margin-start">2</property>
-            <property name="margin-end">2</property>
-            <property name="margin-top">2</property>
-            <property name="margin-bottom">2</property>
-          </object>
+          <object class="GtkStatusbar" id="statusbar1"/>
         </child>
       </object>
     </child>

demos/gtk-demo/demo3widget.c

@@ -387,8 +387,6 @@ demo3_widget_class_init (Demo3WidgetClass *class)
   gtk_widget_class_set_template_from_resource (widget_class, "/menu/demo3widget.ui");
   gtk_widget_class_bind_template_child (widget_class, Demo3Widget, menu);
   gtk_widget_class_bind_template_callback (widget_class, pressed_cb);
-
-  gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_IMG);
 }
 
 GtkWidget *

demos/gtk-demo/demo3widget.ui

@@ -19,14 +19,8 @@
     </item>
   </menu>
   <template class="Demo3Widget">
-    <accessibility>
-      <property name="label">Demo image</property>
-    </accessibility>
     <child>
       <object class="GtkPopoverMenu" id="menu">
-        <accessibility>
-          <property name="label">Context menu</property>
-        </accessibility>
         <property name="has-arrow">0</property>
         <property name="menu-model">model</property>
       </object>

demos/gtk-demo/dnd.c

@@ -162,39 +162,27 @@ click_done (GtkGesture *gesture)
     gtk_widget_insert_after (item, canvas, last_child);
 }
 
-/* GtkSettings treats `GTK_THEME=foo:dark` as theme name `foo`, variant `dark`,
- * and our embedded CSS files let `foo-dark` work as an alias for `foo:dark`. */
-static gboolean
-has_dark_suffix (const char *theme)
-{
-  return g_str_has_suffix (theme, ":dark") ||
-         g_str_has_suffix (theme, "-dark");
-}
-
-/* So we can make a good guess whether the current theme is dark by checking for
- * either: it is suffixed `[:-]dark`, or Settings:…prefer-dark-theme is TRUE. */
 static gboolean
 theme_is_dark (void)
 {
-  const char *env_theme;
   GtkSettings *settings;
   char *theme;
   gboolean prefer_dark;
   gboolean dark;
 
-  /* Like GtkSettings, 1st see if theme is overridden by environment variable */
-  env_theme = g_getenv ("GTK_THEME");
-  if (env_theme != NULL)
-    return has_dark_suffix (env_theme);
-
-  /* If not, test Settings:…theme-name in the same way OR :…prefer-dark-theme */
   settings = gtk_settings_get_default ();
   g_object_get (settings,
                 "gtk-theme-name", &theme,
                 "gtk-application-prefer-dark-theme", &prefer_dark,
                 NULL);
-  dark = prefer_dark || has_dark_suffix (theme);
+
+  if ((strcmp (theme, "Adwaita") == 0 && prefer_dark) || strcmp (theme, "HighContrastInverse") == 0)
+    dark = TRUE;
+  else
+    dark = FALSE;
+
   g_free (theme);
+
   return dark;
 }
 
@@ -760,7 +748,9 @@ do_dnd (GtkWidget *do_widget)
       GtkCssProvider *provider;
       GString *css;
 
-      button = gtk_color_dialog_button_new (gtk_color_dialog_new ());
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+      button = gtk_color_button_new ();
+G_GNUC_END_IGNORE_DEPRECATIONS
       g_object_unref (g_object_ref_sink (button));
 
       provider = gtk_css_provider_new ();

demos/gtk-demo/drawingarea.c

@@ -334,17 +334,11 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_widget_set_vexpand (frame, TRUE);
       gtk_box_append (GTK_BOX (vbox), frame);
 
-      da = g_object_new (GTK_TYPE_DRAWING_AREA,
-                         "accessible-role", GTK_ACCESSIBLE_ROLE_IMG,
-                         NULL);
-      gtk_frame_set_child (GTK_FRAME (frame), da);
-      gtk_accessible_update_relation (GTK_ACCESSIBLE (da),
-                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                      -1);
-
+      da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), groups_draw, NULL, NULL);
+      gtk_frame_set_child (GTK_FRAME (frame), da);
 
       /*
        * Create the scribble area
@@ -358,17 +352,11 @@ do_drawingarea (GtkWidget *do_widget)
       gtk_widget_set_vexpand (frame, TRUE);
       gtk_box_append (GTK_BOX (vbox), frame);
 
-      da = g_object_new (GTK_TYPE_DRAWING_AREA,
-                         "accessible-role", GTK_ACCESSIBLE_ROLE_IMG,
-                         NULL);
-      gtk_frame_set_child (GTK_FRAME (frame), da);
-      gtk_accessible_update_relation (GTK_ACCESSIBLE (da),
-                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                      -1);
-
+      da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
       gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), scribble_draw, NULL, NULL);
+      gtk_frame_set_child (GTK_FRAME (frame), da);
 
       g_signal_connect (da, "resize",
                         G_CALLBACK (scribble_resize), NULL);
@@ -384,7 +372,7 @@ do_drawingarea (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-      gtk_window_present (GTK_WINDOW (window));
+      gtk_widget_set_visible (window, TRUE);
   else
       gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/entry_completion.c

@@ -95,13 +95,6 @@ do_entry_completion (GtkWidget *do_widget)
       entry = gtk_entry_new ();
       gtk_box_append (GTK_BOX (vbox), entry);
 
-      gtk_accessible_update_relation (GTK_ACCESSIBLE (entry),
-                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                      -1);
-      gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
-                                      GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE, GTK_ACCESSIBLE_AUTOCOMPLETE_LIST,
-                                      -1);
-
       /* Create the completion object */
       completion = gtk_entry_completion_new ();
 

demos/gtk-demo/entry_undo.c

@@ -43,10 +43,6 @@ do_entry_undo (GtkWidget *do_widget)
       entry = gtk_entry_new ();
       gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
       gtk_box_append (GTK_BOX (vbox), entry);
-
-      gtk_accessible_update_relation (GTK_ACCESSIBLE (entry),
-                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                      -1);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/errorstates.c

@@ -22,15 +22,11 @@ validate_more_details (GtkEntry   *entry,
     {
       gtk_widget_set_tooltip_text (GTK_WIDGET (entry), "Must have details first");
       gtk_widget_add_css_class (GTK_WIDGET (entry), "error");
-      gtk_accessible_update_state (GTK_ACCESSIBLE (entry),
-                                   GTK_ACCESSIBLE_STATE_INVALID, GTK_ACCESSIBLE_INVALID_TRUE,
-                                   -1);
     }
   else
     {
       gtk_widget_set_tooltip_text (GTK_WIDGET (entry), "");
       gtk_widget_remove_css_class (GTK_WIDGET (entry), "error");
-      gtk_accessible_reset_state (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_STATE_INVALID);
     }
 }
 
@@ -48,18 +44,10 @@ mode_switch_state_set (GtkSwitch *sw,
     {
       gtk_widget_set_visible (label, FALSE);
       gtk_switch_set_state (sw, state);
-      gtk_accessible_reset_relation (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE);
-      gtk_accessible_reset_state (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_STATE_INVALID);
     }
   else
     {
       gtk_widget_set_visible (label, TRUE);
-      gtk_accessible_update_relation (GTK_ACCESSIBLE (sw),
-                                      GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, label,
-                                      -1);
-      gtk_accessible_update_state (GTK_ACCESSIBLE (sw),
-                                   GTK_ACCESSIBLE_STATE_INVALID, GTK_ACCESSIBLE_INVALID_TRUE,
-                                   -1);
     }
 
   return TRUE;
@@ -85,9 +73,6 @@ level_scale_value_changed (GtkRange *range,
     {
       gtk_switch_set_state (GTK_SWITCH (sw), FALSE);
     }
-
-  gtk_accessible_reset_relation (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE);
-  gtk_accessible_reset_state (GTK_ACCESSIBLE (sw), GTK_ACCESSIBLE_STATE_INVALID);
 }
 
 GtkWidget *

demos/gtk-demo/expander.c

@@ -10,6 +10,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *window = NULL;
 
 static void
@@ -43,22 +45,21 @@ do_expander (GtkWidget *do_widget)
   if (!window)
     {
       toplevel = GTK_WIDGET (gtk_widget_get_root (do_widget));
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Expander");
-      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (toplevel));
-      area = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_widget_set_margin_start (area, 10);
-      gtk_widget_set_margin_end (area, 10);
-      gtk_widget_set_margin_top (area, 10);
-      gtk_widget_set_margin_bottom (area, 10);
-      gtk_window_set_child (GTK_WINDOW (window), area);
-      label = gtk_label_new ("<big><b>Something went wrong</b></big>");
-      gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-      gtk_box_append (GTK_BOX (area), label);
-      label = gtk_label_new ("Here are some more details but not the full story");
+      window = gtk_message_dialog_new_with_markup (GTK_WINDOW (toplevel),
+                                                   0,
+                                                   GTK_MESSAGE_ERROR,
+                                                   GTK_BUTTONS_CLOSE,
+                                                   "<big><b>%s</b></big>",
+                                                   "Something went wrong");
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (window),
+                                                "Here are some more details "
+                                                "but not the full story.");
+
+      area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
+
+      label = gtk_widget_get_last_child (area);
       gtk_label_set_wrap (GTK_LABEL (label), FALSE);
       gtk_widget_set_vexpand (label, FALSE);
-      gtk_box_append (GTK_BOX (area), label);
 
       expander = gtk_expander_new ("Details:");
       gtk_widget_set_vexpand (expander, TRUE);
@@ -121,7 +122,7 @@ do_expander (GtkWidget *do_widget)
   }
 
   if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_set_visible (window, TRUE);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/fishbowl.c

@@ -68,18 +68,13 @@ create_blurred_button (void)
   return w;
 }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static GtkWidget *
 create_font_button (void)
 {
-  GtkFontDialog *dialog;
-  GtkWidget *button;
-
-  dialog = gtk_font_dialog_new ();
-  button = gtk_font_dialog_button_new (dialog);
-  g_object_unref (dialog);
-
-  return button;
+  return gtk_font_button_new ();
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 static GtkWidget *
 create_level_bar (void)
@@ -315,20 +310,11 @@ do_fishbowl (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
-      GtkBuilderScope *scope;
       GtkWidget *bowl;
 
       g_type_ensure (GTK_TYPE_FISHBOWL);
 
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_prev_button_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_next_button_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), fishbowl_changes_toggled_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), format_header_cb);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/fishbowl/fishbowl.ui", NULL);
+      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
@@ -340,7 +326,6 @@ do_fishbowl (GtkWidget *do_widget)
 
       gtk_widget_realize (window);
       g_object_unref (builder);
-      g_object_unref (scope);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/font_features.ui

@@ -59,9 +59,6 @@
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkFontDialogButton" id="font">
-                        <accessibility>
-                          <property name="label">Font</property>
-                        </accessibility>
                         <property name="dialog">
                           <object class="GtkFontDialog">
                           </object>
@@ -76,7 +73,7 @@
                         <property name="column-spacing">10</property>
                         <property name="row-spacing">10</property>
                         <child>
-                          <object class="GtkLabel" id="size_label">
+                          <object class="GtkLabel">
                             <property name="label">Size</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -92,9 +89,6 @@
                             <property name="width-request">100</property>
                             <property name="valign">baseline</property>
                             <property name="adjustment">size_adjustment</property>
-                            <accessibility>
-                              <relation name="labelled-by">size_label</relation>
-                            </accessibility>
                             <layout>
                               <property name="column">1</property>
                               <property name="row">0</property>
@@ -107,9 +101,6 @@
                             <property name="max-width-chars">4</property>
                             <property name="hexpand">0</property>
                             <property name="valign">baseline</property>
-                            <accessibility>
-                              <relation name="labelled-by">size_label</relation>
-                            </accessibility>
                             <signal name="activate" handler="basic_entry_activated"
                                     object="size_adjustment" swapped="false"/>
                             <layout>
@@ -119,7 +110,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="letterspacing_label">
+                          <object class="GtkLabel">
                             <property name="label">Letterspacing</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -135,9 +126,6 @@
                             <property name="width-request">100</property>
                             <property name="valign">baseline</property>
                             <property name="adjustment">letterspacing_adjustment</property>
-                            <accessibility>
-                              <relation name="labelled-by">letterspacing_label</relation>
-                            </accessibility>
                             <layout>
                               <property name="column">1</property>
                               <property name="row">1</property>
@@ -150,9 +138,6 @@
                             <property name="max-width-chars">4</property>
                             <property name="hexpand">0</property>
                             <property name="valign">baseline</property>
-                            <accessibility>
-                              <relation name="labelled-by">letterspacing_label</relation>
-                            </accessibility>
                             <signal name="activate" handler="basic_entry_activated"
                                     object="letterspacing_adjustment" swapped="false"/>
                             <layout>
@@ -162,7 +147,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="line_height_label">
+                          <object class="GtkLabel">
                             <property name="label">Line Height</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -178,9 +163,6 @@
                             <property name="width-request">100</property>
                             <property name="valign">baseline</property>
                             <property name="adjustment">line_height_adjustment</property>
-                            <accessibility>
-                              <relation name="labelled-by">line_height_label</relation>
-                            </accessibility>
                             <layout>
                               <property name="column">1</property>
                               <property name="row">2</property>
@@ -193,9 +175,6 @@
                             <property name="max-width-chars">4</property>
                             <property name="hexpand">0</property>
                             <property name="valign">baseline</property>
-                            <accessibility>
-                              <relation name="labelled-by">line_height_label</relation>
-                            </accessibility>
                             <signal name="activate" handler="basic_entry_activated"
                                     object="line_height_adjustment" swapped="false"/>
                             <layout>
@@ -205,7 +184,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="foreground_label">
+                          <object class="GtkLabel">
                             <property name="label">Foreground</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -223,9 +202,6 @@
                             </property>
                             <property name="valign">baseline</property>
                             <property name="rgba">black</property>
-                            <accessibility>
-                              <relation name="labelled-by">foreground_label</relation>
-                            </accessibility>
                             <signal name="notify::rgba" handler="color_set_cb"/>
                             <layout>
                               <property name="column">1</property>
@@ -234,7 +210,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="background_label">
+                          <object class="GtkLabel">
                             <property name="label">Background</property>
                             <property name="xalign">0</property>
                             <property name="valign">baseline</property>
@@ -252,9 +228,6 @@
                             </property>
                             <property name="valign">baseline</property>
                             <property name="rgba">white</property>
-                            <accessibility>
-                              <relation name="labelled-by">background_label</relation>
-                            </accessibility>
                             <signal name="notify::rgba" handler="color_set_cb"/>
                             <layout>
                               <property name="column">1</property>
@@ -267,9 +240,6 @@
                             <property name="icon-name">object-flip-vertical-symbolic</property>
                             <property name="halign">start</property>
                             <property name="valign">center</property>
-                            <accessibility>
-                              <property name="label">Swap colors</property>
-                            </accessibility>
                             <style>
                               <class name="circular"/>
                             </style>
@@ -371,9 +341,6 @@
                             <property name="yalign">0</property>
                             <property name="valign">start</property>
                             <property name="selectable">1</property>
-                            <accessibility>
-                              <property name="label">Font example</property>
-                            </accessibility>
                           </object>
                         </property>
                       </object>
@@ -383,9 +350,6 @@
                         <property name="name">entry</property>
                         <property name="child">
                           <object class="GtkTextView" id="entry">
-                            <accessibility>
-                              <property name="label">Example text</property>
-                            </accessibility>
                             <property name="buffer">
                               <object class="GtkTextBuffer">
                                 <property name="text">Grumpy wizards make toxic brew for the evil Queen and Jack. A quick movement of the enemy will jeopardize six gunboats. The job of waxing linoleum frequently peeves chintzy kids. My girl wove six dozen plaid jackets before she quit. Twelve ziggurats quickly jumped a finch box.
@@ -482,9 +446,6 @@
                     <property name="icon-name">document-edit-symbolic</property>
                     <property name="halign">end</property>
                     <property name="valign">end</property>
-                    <accessibility>
-                      <property name="label">Edit text</property>
-                    </accessibility>
                     <signal name="clicked" handler="font_features_toggle_edit"/>
                   </object>
                 </child>

demos/gtk-demo/fontrendering.c

@@ -306,7 +306,7 @@ retry:
   texture = gdk_texture_new_for_pixbuf (pixbuf2);
   gtk_picture_set_paintable (GTK_PICTURE (image), GDK_PAINTABLE (texture));
   g_object_unref (pixbuf2);
-  g_object_unref (texture);
+  g_object_unref (pixbuf2);
 }
 
 static gboolean fading = FALSE;

demos/gtk-demo/fontrendering.ui

@@ -39,7 +39,7 @@
             <property name="row-spacing">10</property>
             <property name="column-spacing">10</property>
             <child>
-              <object class="GtkLabel" id="text_label">
+              <object class="GtkLabel">
                 <property name="margin-start">10</property>
                 <property name="label">Text</property>
                 <property name="xalign">1</property>
@@ -57,13 +57,10 @@
                 <layout>
                   <property name="column">2</property>
                 </layout>
-                <accessibility>
-                  <relation name="labelled-by">text_label</relation>
-                </accessibility>
               </object>
             </child>
             <child>
-              <object class="GtkLabel" id="font_label">
+              <object class="GtkLabel">
                 <property name="margin-start">10</property>
                 <property name="label">Font</property>
                 <property name="xalign">1</property>
@@ -78,9 +75,6 @@
             </child>
             <child>
               <object class="GtkFontDialogButton" id="font_button">
-                <accessibility>
-                  <relation name="labelled-by">font_label</relation>
-                </accessibility>
                 <property name="dialog">
                   <object class="GtkFontDialog">
                   </object>
@@ -192,9 +186,6 @@
                 <property name="icon-name">list-add-symbolic</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <accessibility>
-                  <property name="label">Zoom in</property>
-                </accessibility>
                 <style>
                   <class name="circular"/>
                 </style>
@@ -220,9 +211,6 @@
                 <property name="icon-name">list-remove-symbolic</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <accessibility>
-                  <property name="label">Zoom out</property>
-                </accessibility>
                 <style>
                   <class name="circular"/>
                 </style>
@@ -263,9 +251,6 @@
             <property name="vexpand">1</property>
             <child>
               <object class="GtkPicture" id="image">
-                <accessibility>
-                  <property name="label">Font rendering example</property>
-                </accessibility>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="can-shrink">0</property>

demos/gtk-demo/headerbar.c

@@ -18,7 +18,6 @@ do_headerbar (GtkWidget *do_widget)
   GtkWidget *header;
   GtkWidget *button;
   GtkWidget *box;
-  GtkWidget *content;
 
   if (!window)
     {
@@ -38,26 +37,16 @@ do_headerbar (GtkWidget *do_widget)
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_widget_add_css_class (box, "linked");
       button = gtk_button_new_from_icon_name ("go-previous-symbolic");
-      gtk_widget_set_tooltip_text (button, "Back");
       gtk_box_append (GTK_BOX (box), button);
       button = gtk_button_new_from_icon_name ("go-next-symbolic");
-      gtk_widget_set_tooltip_text (button, "Forward");
       gtk_box_append (GTK_BOX (box), button);
 
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);
-      button = gtk_switch_new ();
-      gtk_accessible_update_property (GTK_ACCESSIBLE (button),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Change something",
-                                      -1);
-      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), gtk_switch_new ());
 
       gtk_window_set_titlebar (GTK_WINDOW (window), header);
 
-      content = gtk_text_view_new ();
-      gtk_accessible_update_property (GTK_ACCESSIBLE (content),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Content",
-                                      -1);
-      gtk_window_set_child (GTK_WINDOW (window), content);
+      gtk_window_set_child (GTK_WINDOW (window), gtk_text_view_new ());
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/iconscroll.c

@@ -354,18 +354,10 @@ do_iconscroll (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
-      GtkBuilderScope *scope;
       GtkWidget *label;
       guint id;
 
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), iconscroll_prev_clicked_cb);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), iconscroll_next_clicked_cb);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-
-      gtk_builder_add_from_resource (builder, "/iconscroll/iconscroll.ui", NULL);
+      builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
       gtk_window_set_display (GTK_WINDOW (window),
@@ -383,7 +375,6 @@ do_iconscroll (GtkWidget *do_widget)
                               GUINT_TO_POINTER (id), remove_timeout);
 
       g_object_unref (builder);
-      g_object_unref (scope);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/image_scaling.c

@@ -164,18 +164,12 @@ do_image_scaling (GtkWidget *do_widget)
       scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, -10., 10., 0.1);
       gtk_scale_add_mark (GTK_SCALE (scale), 0., GTK_POS_TOP, NULL);
       gtk_widget_set_tooltip_text (scale, "Zoom");
-      gtk_accessible_update_property (GTK_ACCESSIBLE (scale),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Zoom",
-                                      -1);
       gtk_range_set_value (GTK_RANGE (scale), 0.);
       gtk_widget_set_hexpand (scale, TRUE);
       gtk_box_append (GTK_BOX (box2), scale);
 
       dropdown = gtk_drop_down_new (G_LIST_MODEL (gtk_string_list_new ((const char *[]){ "Linear", "Nearest", "Trilinear", NULL })), NULL);
       gtk_widget_set_tooltip_text (dropdown, "Filter");
-      gtk_accessible_update_property (GTK_ACCESSIBLE (dropdown),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Filter",
-                                      -1);
       gtk_box_append (GTK_BOX (box2), dropdown);
 
       g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);

demos/gtk-demo/listbox_controls.ui

@@ -49,7 +49,6 @@
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="hexpand">1</property>
-                                <property name="mnemonic-widget">switch</property>
                               </object>
                             </child>
                             <child>
@@ -74,7 +73,6 @@
                                 <property name="halign">start</property>
                                 <property name="valign">center</property>
                                 <property name="hexpand">1</property>
-                                <property name="mnemonic-widget">check</property>
                               </object>
                             </child>
                             <child>
@@ -112,7 +110,6 @@
                                 <property name="margin-start">10</property>
                                 <property name="margin-end">10</property>
                                 <property name="opacity">0</property>
-                                <property name="accessible-role">status</property>
                               </object>
                             </child>
                           </object>
@@ -153,11 +150,10 @@
                                   <property name="halign">start</property>
                                   <property name="valign">center</property>
                                   <property name="hexpand">1</property>
-                                  <property name="mnemonic-widget">scale</property>
                                 </object>
                               </child>
                               <child>
-                                <object class="GtkScale" id="scale">
+                                <object class="GtkScale">
                                   <property name="halign">end</property>
                                   <property name="valign">center</property>
                                   <property name="draw-value">0</property>
@@ -189,11 +185,10 @@
                                   <property name="halign">start</property>
                                   <property name="valign">center</property>
                                   <property name="hexpand">1</property>
-                                  <property name="mnemonic-widget">spin</property>
                                 </object>
                               </child>
                               <child>
-                                <object class="GtkSpinButton" id="spin">
+                                <object class="GtkSpinButton">
                                   <property name="halign">end</property>
                                   <property name="valign">center</property>
                                   <property name="adjustment">
@@ -222,11 +217,10 @@
                                   <property name="halign">start</property>
                                   <property name="valign">center</property>
                                   <property name="hexpand">1</property>
-                                  <property name="mnemonic-widget">dropdown</property>
                                 </object>
                               </child>
                               <child>
-                                <object class="GtkDropDown" id="dropdown">
+                                <object class="GtkDropDown">
                                   <property name="halign">end</property>
                                   <property name="valign">center</property>
                                   <property name="model">
@@ -258,11 +252,10 @@
                                   <property name="halign">start</property>
                                   <property name="valign">center</property>
                                   <property name="hexpand">1</property>
-                                  <property name="mnemonic-widget">entry</property>
                                 </object>
                               </child>
                               <child>
-                                <object class="GtkEntry" id="entry">
+                                <object class="GtkEntry">
                                   <property name="halign">end</property>
                                   <property name="valign">center</property>
                                   <property name="placeholder-text">Type here…</property>

demos/gtk-demo/listview_applauncher.c

@@ -52,10 +52,6 @@ setup_listitem_cb (GtkListItemFactory *factory,
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   image = gtk_image_new ();
-  gtk_accessible_update_property (GTK_ACCESSIBLE (image),
-                                  GTK_ACCESSIBLE_PROPERTY_LABEL,
-                                  "App icon",
-                                  -1);
   gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
   gtk_box_append (GTK_BOX (box), image);
   label = gtk_label_new ("");
@@ -83,7 +79,6 @@ bind_listitem_cb (GtkListItemFactory *factory,
 
   gtk_image_set_from_gicon (GTK_IMAGE (image), g_app_info_get_icon (app_info));
   gtk_label_set_label (GTK_LABEL (label), g_app_info_get_display_name (app_info));
-  gtk_list_item_set_accessible_label (list_item, g_app_info_get_display_name (app_info));
 }
 
 /* In more complex code, we would also need functions to unbind and teardown

demos/gtk-demo/listview_clocks.c

@@ -431,9 +431,6 @@ setup_listitem_cb (GtkListItemFactory *factory,
   picture = gtk_picture_new ();
   gtk_expression_bind (expression, picture, "paintable", picture);
   gtk_box_append (GTK_BOX (box), picture);
-  gtk_accessible_update_relation (GTK_ACCESSIBLE (picture),
-                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, location_label, NULL,
-                                  -1);
 
 
   /* And finally, everything comes together.
@@ -490,9 +487,6 @@ do_listview_clocks (GtkWidget *do_widget)
 
       model = GTK_SELECTION_MODEL (gtk_no_selection_new (create_clocks_model ()));
       gridview = gtk_grid_view_new (model, factory);
-      gtk_accessible_update_property (GTK_ACCESSIBLE (gridview),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Clocks",
-                                      -1);
       gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
       gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
 

demos/gtk-demo/listview_selections.c

@@ -368,38 +368,6 @@ match_func (MatchObject *obj,
   g_free (tmp2);
 }
 
-static void
-setup_header (GtkSignalListItemFactory *factory,
-              GObject                  *list_item,
-              gpointer                  data)
-{
-  GtkListHeader *self = GTK_LIST_HEADER (list_item);
-  GtkWidget *child;
-
-  child = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (child), 0);
-  gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
-  gtk_widget_set_margin_top (child, 10);
-  gtk_widget_set_margin_bottom (child, 10);
-
-  gtk_list_header_set_child (self, child);
-}
-
-static void
-bind_header (GtkSignalListItemFactory *factory,
-             GObject                  *list_item,
-             gpointer                  data)
-{
-  GtkListHeader *self = GTK_LIST_HEADER (list_item);
-  GtkWidget *child = gtk_list_header_get_child (self);
-  GObject *item = gtk_list_header_get_item (self);
-
-  if (strstr (gtk_string_object_get_string (GTK_STRING_OBJECT (item)), "hour"))
-    gtk_label_set_label (GTK_LABEL (child), "<big><b>Hours</b></big>");
-  else
-    gtk_label_set_label (GTK_LABEL (child), "<big><b>Minutes</b></big>");
-}
-
 GtkWidget *
 do_listview_selections (GtkWidget *do_widget)
 {
@@ -409,12 +377,10 @@ do_listview_selections (GtkWidget *do_widget)
   GtkExpression *expression;
   GtkListItemFactory *factory;
   const char * const times[] = { "1 minute", "2 minutes", "5 minutes", "20 minutes", NULL };
-  const char * const minutes[] = {
+  const char * const many_times[] = {
     "1 minute", "2 minutes", "5 minutes", "10 minutes", "15 minutes", "20 minutes",
     "25 minutes", "30 minutes", "35 minutes", "40 minutes", "45 minutes", "50 minutes",
-    "55 minutes", NULL
-  };
-  const char * const hours[] = { "1 hour", "2 hours", "3 hours", "5 hours", "6 hours", "7 hours",
+    "55 minutes", "1 hour", "2 hours", "3 hours", "5 hours", "6 hours", "7 hours",
     "8 hours", "9 hours", "10 hours", "11 hours", "12 hours", NULL
   };
   const char * const device_titles[] = { "Digital Output", "Headphones", "Digital Output", "Analog Output", NULL };
@@ -429,10 +395,6 @@ do_listview_selections (GtkWidget *do_widget)
 
   if (!window)
     {
-      GtkStringList *minutes_model, *hours_model;
-      GListStore *store;
-      GtkFlattenListModel *flat;
-
       window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
@@ -460,25 +422,14 @@ do_listview_selections (GtkWidget *do_widget)
       gtk_box_append (GTK_BOX (box), button);
 
       /* A dropdown using an expression to obtain strings */
-      minutes_model = gtk_string_list_new (minutes);
-      hours_model = gtk_string_list_new (hours);
-      store = g_list_store_new (G_TYPE_LIST_MODEL);
-      g_list_store_append (store, minutes_model);
-      g_list_store_append (store, hours_model);
-      g_object_unref (minutes_model);
-      g_object_unref (hours_model);
-      flat = gtk_flatten_list_model_new (G_LIST_MODEL (store));
+      button = drop_down_new_from_strings (many_times, NULL, NULL);
+      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
       expression = gtk_cclosure_expression_new (G_TYPE_STRING, NULL,
                                                 0, NULL,
                                                 (GCallback)get_title,
                                                 NULL, NULL);
-      button = gtk_drop_down_new (G_LIST_MODEL (flat), expression);
-      gtk_drop_down_set_enable_search (GTK_DROP_DOWN (button), TRUE);
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_header), NULL);
-      g_signal_connect (factory, "bind", G_CALLBACK (bind_header), NULL);
-      gtk_drop_down_set_header_factory (GTK_DROP_DOWN (button), factory);
-      g_object_unref (factory);
+      gtk_drop_down_set_expression (GTK_DROP_DOWN (button), expression);
+      gtk_expression_unref (expression);
       gtk_box_append (GTK_BOX (box), button);
 
       button = gtk_drop_down_new (NULL, NULL);

demos/gtk-demo/main-listitem.ui

@@ -10,8 +10,6 @@
         <property name="child">
           <object class="GtkInscription">
             <property name="hexpand">1</property>
-            <property name="nat-chars">25</property>
-            <property name="text-overflow">ellipsize-end</property>
             <binding name="text">
               <lookup name="title" type="GtkDemo">
                 <lookup name="item">expander</lookup>

demos/gtk-demo/main.c

@@ -18,6 +18,7 @@
 #include <string.h>
 
 #include "config.h"
+
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 
@@ -267,9 +268,9 @@ activate_run (GSimpleAction *action,
 }
 
 static GtkWidget *
-display_image (const char *format,
-               const char *resource,
-               GtkWidget  *label)
+display_image (const char  *format,
+               const char  *resource,
+               char       **label)
 {
   GtkWidget *sw, *image;
 
@@ -279,17 +280,13 @@ display_image (const char *format,
   sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), image);
 
-  gtk_accessible_update_relation (GTK_ACCESSIBLE (image),
-                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                  -1);
-
   return sw;
 }
 
 static GtkWidget *
-display_images (const char *format,
-                const char *resource_dir,
-                GtkWidget  *label)
+display_images (const char  *format,
+                const char  *resource_dir,
+                char       **label)
 {
   char **resources;
   GtkWidget *grid;
@@ -314,15 +311,13 @@ display_images (const char *format,
     {
       char *resource_name;
       GtkWidget *box;
-      GtkWidget *image_label;
 
       resource_name = g_strconcat (resource_dir, "/", resources[i], NULL);
 
-      image_label = gtk_label_new (resources[i]);
-      widget = display_image (NULL, resource_name, image_label);
+      widget = display_image (NULL, resource_name, NULL);
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_box_append (GTK_BOX (box), widget);
-      gtk_box_append (GTK_BOX (box), image_label);
+      gtk_box_append (GTK_BOX (box), gtk_label_new (resources[i]));
       gtk_flow_box_insert (GTK_FLOW_BOX (grid), box, -1);
 
       g_free (resource_name);
@@ -330,19 +325,15 @@ display_images (const char *format,
 
   g_strfreev (resources);
 
-  gtk_label_set_label (GTK_LABEL (label), "Images");
-
-  gtk_accessible_update_relation (GTK_ACCESSIBLE (grid),
-                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                  -1);
+  *label = g_strdup ("Images");
 
   return sw;
 }
 
 static GtkWidget *
-display_text (const char *format,
-              const char *resource,
-              GtkWidget  *label)
+display_text (const char  *format,
+              const char  *resource,
+              char       **label)
 {
   GtkTextBuffer *buffer;
   GtkWidget *textview, *sw;
@@ -377,10 +368,6 @@ display_text (const char *format,
 
   gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);
 
-  gtk_accessible_update_relation (GTK_ACCESSIBLE (textview),
-                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                  -1);
-
   sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
@@ -391,19 +378,15 @@ display_text (const char *format,
 }
 
 static GtkWidget *
-display_video (const char *format,
-               const char *resource,
-               GtkWidget  *label)
+display_video (const char  *format,
+               const char  *resource,
+               char       **label)
 {
   GtkWidget *video;
 
   video = gtk_video_new_for_resource (resource);
   gtk_video_set_loop (GTK_VIDEO (video), TRUE);
 
-  gtk_accessible_update_relation (GTK_ACCESSIBLE (video),
-                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, label, NULL,
-                                  -1);
-
   return video;
 }
 
@@ -425,9 +408,9 @@ display_nothing (const char *resource)
 static struct {
   const char *extension;
   const char *format;
-  GtkWidget * (* display_func) (const char *format,
-                                const char *resource,
-                                GtkWidget  *label);
+  GtkWidget * (* display_func) (const char  *format,
+                                const char  *resource,
+                                char       **label);
 } display_funcs[] = {
   { ".gif", NULL, display_image },
   { ".jpg", NULL, display_image },
@@ -450,6 +433,7 @@ add_data_tab (const char *demoname)
   char **resources;
   GtkWidget *widget, *label;
   guint i, j;
+  char *label_string;
 
   resource_dir = g_strconcat ("/", demoname, NULL);
   resources = g_resources_enumerate_children (resource_dir, 0, NULL);
@@ -469,21 +453,23 @@ add_data_tab (const char *demoname)
             break;
         }
 
-      label = gtk_label_new (resources[i]);
+      label_string = NULL;
 
       if (j < G_N_ELEMENTS (display_funcs))
         widget = display_funcs[j].display_func (display_funcs[j].format,
                                                 resource_name,
-                                                label);
+                                                &label_string);
       else
         widget = display_nothing (resource_name);
 
+      label = gtk_label_new (label_string ? label_string : resources[i]);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
       g_object_set (gtk_notebook_get_page (GTK_NOTEBOOK (notebook), widget),
                     "tab-expand", FALSE,
                     NULL);
 
       g_free (resource_name);
+      g_free (label_string);
     }
 
   g_strfreev (resources);

demos/gtk-demo/main.ui

@@ -57,17 +57,14 @@
       <object class="GtkBox">
         <child>
           <object class="GtkBox">
+            <property name="width-request">220</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkSearchBar" id="searchbar">
-                <accessibility>
-                  <relation name="labelled-by">search-entry</relation>
-                </accessibility>
                 <property name="key-capture-widget">window</property>
                 <child>
                   <object class="GtkSearchEntry" id="search-entry">
                     <accessibility>
-                      <property name="label" translatable="yes">Search</property>
                       <relation name="controls">listview</relation>
                     </accessibility>
                   </object>
@@ -79,15 +76,15 @@
                 <style>
                   <class name="sidebar"/>
                 </style>
+                <property name="width-request">120</property>
                 <property name="hscrollbar-policy">never</property>
-                <property name="propagate-natural-width">1</property>
+                <property name="min-content-width">150</property>
                 <property name="vexpand">1</property>
                 <child>
                   <object class="GtkListView" id="listview">
                     <style>
                       <class name="navigation-sidebar"/>
                     </style>
-                    <property name="tab-behavior">item</property>
                     <property name="factory">
                       <object class="GtkBuilderListItemFactory">
                         <property name="resource">/ui/main-listitem.ui</property>

demos/gtk-demo/meson.build

@@ -150,13 +150,25 @@ if librsvg_dep.found()
   gtkdemo_deps += [ librsvg_dep ]
 endif
 
+gtkdemo_args = [ '-DGDK_DISABLE_DEPRECATED', '-DGTK_DISABLE_DEPRECATED', ]
+
 demos_h = custom_target('gtk4 demo header',
   output: 'demos.h',
   input: demos,
   command: [ find_program('geninclude.py'), '@OUTPUT@', '@INPUT@' ],
 )
 
-if can_use_objcopy_for_resources
+objcopy_supports_add_symbol = false
+objcopy = find_program('objcopy', required : false)
+if objcopy.found()
+  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
+endif
+
+ld = find_program('ld', required : false)
+
+if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+  glib_compile_resources = find_program('glib-compile-resources')
+
   # Create the resource blob
   gtkdemo_gresource = custom_target('gtkdemo.gresource',
       input : 'demo.gresource.xml',
@@ -204,7 +216,6 @@ if can_use_objcopy_for_resources
     output : 'gtkdemo_resources2.o',
     command : [objcopy,
                  '--strip-all',
-                 '--set-section-alignment', '.data=8',
                  '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
                  '@INPUT@',
                  '@OUTPUT@'])
@@ -233,7 +244,7 @@ gtkdemo_deps += [ demo_conf_h ]
 
 executable('gtk4-demo',
   sources: [demos, demos_h, extra_demo_sources, gtkdemo_resources],
-  c_args: demo_cflags,
+  c_args: gtkdemo_args + demo_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
   win_subsystem: 'windows',
@@ -243,7 +254,7 @@ executable('gtk4-demo',
 
 executable('gtk4-demo-application',
   sources: ['application.c', gtkdemo_resources],
-  c_args: common_cflags,
+  c_args: gtkdemo_args + common_cflags,
   dependencies: gtkdemo_deps,
   include_directories: confinc,
   win_subsystem: 'windows',

demos/gtk-demo/paint.c

@@ -7,6 +7,8 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 enum {
   COLOR_SET,
   N_SIGNALS
@@ -122,16 +124,19 @@ drawing_area_unmap (GtkWidget *widget)
 
 static void
 drawing_area_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
+		       GtkSnapshot *snapshot)
 {
   DrawingArea *area = (DrawingArea *) widget;
-  int width, height;
+  GtkAllocation allocation;
   cairo_t *cr;
 
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  cr = gtk_snapshot_append_cairo (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
+  gtk_widget_get_allocation (widget, &allocation);
+  cr = gtk_snapshot_append_cairo (snapshot,
+                                  &GRAPHENE_RECT_INIT (
+                                    0, 0,
+				    allocation.width,
+				    allocation.height
+                                  ));
 
   cairo_set_source_rgb (cr, 1, 1, 1);
   cairo_paint (cr);
@@ -140,7 +145,7 @@ drawing_area_snapshot (GtkWidget   *widget,
   cairo_paint (cr);
 
   cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
-  cairo_rectangle (cr, 0, 0, width, height);
+  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
   cairo_stroke (cr);
 
   cairo_destroy (cr);

demos/gtk-demo/password_entry.c

@@ -68,9 +68,6 @@ do_password_entry (GtkWidget *do_widget)
                     "placeholder-text", "Password",
                     "activates-default", TRUE,
                     NULL);
-      gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Password",
-                                      -1);
       g_signal_connect (entry, "notify::text", G_CALLBACK (update_button), NULL);
       gtk_box_append (GTK_BOX (box), entry);
 
@@ -80,9 +77,6 @@ do_password_entry (GtkWidget *do_widget)
                     "placeholder-text", "Confirm",
                     "activates-default", TRUE,
                     NULL);
-      gtk_accessible_update_property (GTK_ACCESSIBLE (entry2),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Confirm",
-                                      -1);
       g_signal_connect (entry2, "notify::text", G_CALLBACK (update_button), NULL);
       gtk_box_append (GTK_BOX (box), entry2);
 

demos/gtk-demo/pickers.c

@@ -189,7 +189,6 @@ do_pickers (GtkWidget *do_widget)
     gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
 
     picker = gtk_color_dialog_button_new (gtk_color_dialog_new ());
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 0, 1, 1);
 
     label = gtk_label_new ("Font:");
@@ -199,7 +198,6 @@ do_pickers (GtkWidget *do_widget)
     gtk_grid_attach (GTK_GRID (table), label, 0, 1, 1, 1);
 
     picker = gtk_font_dialog_button_new (gtk_font_dialog_new ());
-    gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 1, 1, 1);
 
     label = gtk_label_new ("File:");
@@ -210,9 +208,6 @@ do_pickers (GtkWidget *do_widget)
 
     picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
     button = gtk_button_new_from_icon_name ("document-open-symbolic");
-    gtk_accessible_update_property (GTK_ACCESSIBLE (button),
-                                    GTK_ACCESSIBLE_PROPERTY_LABEL, "Select File",
-                                    -1);
 
     label = gtk_label_new ("None");
 
@@ -228,9 +223,6 @@ do_pickers (GtkWidget *do_widget)
     gtk_box_append (GTK_BOX (picker), button);
     app_picker = gtk_button_new_from_icon_name ("emblem-system-symbolic");
     gtk_widget_set_halign (app_picker, GTK_ALIGN_END);
-    gtk_accessible_update_property (GTK_ACCESSIBLE (app_picker),
-                                    GTK_ACCESSIBLE_PROPERTY_LABEL, "Open File",
-                                    -1);
     gtk_widget_set_sensitive (app_picker, FALSE);
     g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
     gtk_box_append (GTK_BOX (picker), app_picker);
@@ -249,7 +241,7 @@ do_pickers (GtkWidget *do_widget)
   }
 
   if (!gtk_widget_get_visible (window))
-    gtk_window_present (GTK_WINDOW (window));
+    gtk_widget_set_visible (window, TRUE);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/reset.css

@@ -6,6 +6,6 @@
  * Also, when adding new style properties, please add them here.
  */
 
-window.demo * {
+* {
   all: unset;
 }

demos/gtk-demo/spinbutton.c

@@ -188,20 +188,10 @@ do_spinbutton (GtkWidget *do_widget)
   if (!window)
     {
       GtkBuilder *builder;
-      GtkBuilderScope *scope;
       GtkAdjustment *adj;
       GtkWidget *label;
 
-      scope = gtk_builder_cscope_new ();
-      builder = gtk_builder_new ();
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_hex_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_hex_spin_output);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_time_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_time_spin_output);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_month_spin_input);
-      gtk_builder_cscope_add_callback (GTK_BUILDER_CSCOPE (scope), spinbutton_month_spin_output);
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/spinbutton/spinbutton.ui", NULL);
+      builder = gtk_builder_new_from_resource ("/spinbutton/spinbutton.ui");
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
@@ -243,7 +233,6 @@ do_spinbutton (GtkWidget *do_widget)
                                    NULL, NULL);
 
       g_object_unref (builder);
-      g_object_unref (scope);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/spinner.c

@@ -27,6 +27,7 @@ GtkWidget *
 do_spinner (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
+  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *button;
@@ -34,19 +35,28 @@ do_spinner (GtkWidget *do_widget)
 
   if (!window)
   {
-    window = gtk_window_new ();
-    gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Spinner");
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+    window = gtk_dialog_new_with_buttons ("Spinner",
+                                          GTK_WINDOW (do_widget),
+                                          0,
+                                          _("_Close"),
+                                          GTK_RESPONSE_NONE,
+                                          NULL);
     gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+
+    g_signal_connect (window, "response",
+                      G_CALLBACK (gtk_window_destroy), NULL);
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-    gtk_widget_set_margin_top (vbox, 5);
-    gtk_widget_set_margin_bottom (vbox, 5);
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     gtk_widget_set_margin_start (vbox, 5);
     gtk_widget_set_margin_end (vbox, 5);
-
-    gtk_window_set_child (GTK_WINDOW (window), vbox);
+    gtk_widget_set_margin_top (vbox, 5);
+    gtk_widget_set_margin_bottom (vbox, 5);
+    gtk_box_append (GTK_BOX (content_area), vbox);
 
     /* Sensitive */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);

demos/gtk-demo/suggestionentry.c

@@ -801,7 +801,7 @@ suggestion_entry_key_pressed (GtkEventControllerKey *controller,
             selected = matches - 1;
         }
 
-      gtk_list_view_scroll_to (GTK_LIST_VIEW (self->list), selected, GTK_LIST_SCROLL_SELECT, NULL);
+      gtk_single_selection_set_selected (self->selection, selected);
       return TRUE;
     }
 

demos/gtk-demo/video_player.c

@@ -150,36 +150,20 @@ do_video_player (GtkWidget *do_widget)
 
       button = gtk_button_new ();
       image = gtk_image_new_from_resource ("/cursors/images/gtk_logo_cursor.png");
-      gtk_accessible_update_relation (GTK_ACCESSIBLE (image),
-                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, button, NULL,
-                                      -1);
       gtk_image_set_pixel_size (GTK_IMAGE (image), 24);
       gtk_button_set_child (GTK_BUTTON (button), image);
       g_signal_connect (button, "clicked", G_CALLBACK (logo_clicked_cb), video);
-      gtk_accessible_update_property (GTK_ACCESSIBLE (button),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "GTK Logo",
-                                      -1);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (title), button);
 
       button = gtk_button_new ();
       image = gtk_image_new_from_resource ("/video-player/bbb.png");
-      gtk_accessible_update_relation (GTK_ACCESSIBLE (image),
-                                      GTK_ACCESSIBLE_RELATION_LABELLED_BY, button, NULL,
-                                      -1);
       gtk_image_set_pixel_size (GTK_IMAGE (image), 24);
       gtk_button_set_child (GTK_BUTTON (button), image);
       g_signal_connect (button, "clicked", G_CALLBACK (bbb_clicked_cb), video);
-      gtk_accessible_update_property (GTK_ACCESSIBLE (button),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Big Buck Bunny",
-                                      -1);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (title), button);
 
       fullscreen_button = gtk_button_new_from_icon_name ("view-fullscreen-symbolic");
       g_signal_connect (fullscreen_button, "clicked", G_CALLBACK (fullscreen_clicked_cb), NULL);
-      gtk_accessible_update_property (GTK_ACCESSIBLE (fullscreen_button),
-                                      GTK_ACCESSIBLE_PROPERTY_LABEL, "Fullscreen",
-                                      -1);
-
       gtk_header_bar_pack_end (GTK_HEADER_BAR (title), fullscreen_button);
 
       controller = gtk_shortcut_controller_new ();

demos/print-editor/print-editor.c

@@ -6,6 +6,8 @@
 
 #include "demo_conf.h"
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 static GtkWidget *main_window;
 static GFile *filename = NULL;
 static GtkPageSetup *page_setup = NULL;
@@ -41,7 +43,7 @@ update_statusbar (void)
   GtkTextIter iter;
   const char *print_str;
 
-  gtk_label_set_label (GTK_LABEL (statusbar), "");
+  gtk_statusbar_pop (GTK_STATUSBAR (statusbar), 0);
 
   gtk_text_buffer_get_iter_at_mark (buffer,
                                     &iter,
@@ -59,10 +61,10 @@ update_statusbar (void)
 
   msg = g_strdup_printf ("%d, %d%s %s",
                          row, col,
-                         file_changed?" - Modified":"",
-                         print_str);
+			 file_changed?" - Modified":"",
+			 print_str);
 
-  gtk_label_set_label (GTK_LABEL (statusbar), msg);
+  gtk_statusbar_push (GTK_STATUSBAR (statusbar), 0, msg);
 
   g_free (msg);
 }
@@ -825,12 +827,7 @@ activate (GApplication *app)
                      contents);
 
   /* Create statusbar */
-  statusbar = gtk_label_new ("");
-  gtk_label_set_xalign (GTK_LABEL (statusbar), 0);
-  gtk_widget_set_margin_start (statusbar, 2);
-  gtk_widget_set_margin_end (statusbar, 2);
-  gtk_widget_set_margin_top (statusbar, 2);
-  gtk_widget_set_margin_bottom (statusbar, 2);
+  statusbar = gtk_statusbar_new ();
   gtk_box_append (GTK_BOX (box), statusbar);
 
   /* Show text widget info in the statusbar */

demos/widget-factory/meson.build

@@ -1,6 +1,16 @@
 # demos/widget-factory
 
-if can_use_objcopy_for_resources
+objcopy_supports_add_symbol = false
+objcopy = find_program('objcopy', required : false)
+if objcopy.found()
+  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
+endif
+
+ld = find_program('ld', required : false)
+
+if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
+  glib_compile_resources = find_program('glib-compile-resources')
+
   # Create the resource blob
   widgetfactory_gresource = custom_target('widgetfactory.gresource',
       input : 'widget-factory.gresource.xml',

demos/widget-factory/widget-factory.ui

@@ -1572,9 +1572,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     <property name="valign">3</property>
                                     <child>
                                       <object class="GtkVolumeButton">
-                                        <accessibility>
-                                          <property name="label" translatable="1">Volume</property>
-                                        </accessibility>
                                         <property name="orientation">1</property>
                                         <property name="valign">3</property>
                                         <property name="value">.5</property>
@@ -1587,9 +1584,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                     </child>
                                     <child>
                                       <object class="GtkScaleButton" id="mic-button">
-                                        <accessibility>
-                                          <property name="label" translatable="1">Microphone gain</property>
-                                        </accessibility>
                                         <property name="has-tooltip">1</property>
                                         <property name="icons">microphone-sensitivity-muted-symbolic
 microphone-sensitivity-high-symbolic
@@ -2250,24 +2244,20 @@ microphone-sensitivity-medium-symbolic</property>
                         <child>
                           <object class="GtkBox">
                             <property name="spacing">6</property>
-                            <property name="valign">center</property>
                             <child>
                               <object class="GtkBox" id="lockbox">
                                 <property name="hexpand">1</property>
                                 <property name="spacing">6</property>
-                                <property name="valign">center</property>
                                 <child>
                                   <object class="GtkMenuButton" id="open_menubutton">
                                     <property name="halign">3</property>
                                     <property name="popover">open_popover</property>
                                     <property name="label">Open</property>
-                                    <property name="valign">center</property>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkToggleButton" id="record_button">
                                     <property name="halign">3</property>
-                                    <property name="valign">center</property>
                                     <signal name="toggled" handler="on_record_button_toggled"/>
                                     <style>
                                       <class name="text-button"/>
@@ -2277,19 +2267,16 @@ microphone-sensitivity-medium-symbolic</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property name="spacing">6</property>
-                                        <property name="valign">center</property>
                                         <child>
                                           <object class="GtkImage">
                                             <property name="valign">4</property>
                                             <property name="icon-name">media-record-symbolic</property>
-                                            <property name="valign">center</property>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkLabel">
                                             <property name="valign">4</property>
                                             <property name="label">Record</property>
-                                            <property name="valign">center</property>
                                           </object>
                                         </child>
                                       </object>
@@ -2298,7 +2285,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                                 <child>
                                   <object class="GtkBox">
-                                    <property name="valign">center</property>
                                     <style>
                                       <class name="linked"/>
                                     </style>
@@ -2306,14 +2292,12 @@ microphone-sensitivity-medium-symbolic</property>
                                       <object class="GtkToggleButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
-                                        <property name="valign">center</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkToggleButton" id="list_button">
                                         <property name="group">grid_button</property>
                                         <property name="icon-name">view-list-symbolic</property>
-                                        <property name="valign">center</property>
                                       </object>
                                     </child>
                                   </object>
@@ -2321,7 +2305,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 <child>
                                   <object class="GtkButton" id="circular_button">
                                     <property name="icon-name">emblem-system-symbolic</property>
-                                    <property name="valign">center</property>
                                     <style>
                                       <class name="circular"/>
                                     </style>
@@ -2330,15 +2313,12 @@ microphone-sensitivity-medium-symbolic</property>
                               </object>
                             </child>
                             <child>
-                              <object class="GtkLockButton" id="lockbutton">
-                                <property name="valign">center</property>
-                              </object>
+                              <object class="GtkLockButton" id="lockbutton"/>
                             </child>
                             <child>
                               <object class="GtkMenuButton">
                                 <property name="icon-name">view-more-symbolic</property>
                                 <property name="menu-model">new_style_menu_model</property>
-                                <property name="valign">center</property>
                               </object>
                             </child>
                           </object>

docs/RELEASE-HOWTO.md

@@ -5,6 +5,16 @@ How to do a GTK release?
 
 Make sure you have suitable versions of Meson and Ninja.
 
+Also make sure you have the following packages installed with all their
+dependencies:
+
+  * gtk-doc
+  * docbook-utils
+
+Without those packages make distcheck will *not* pass.
+
+Make sure that gtk-doc is the latest released version.
+
 ## Release check list
 
   0. Save all your work, then move to the branch from which you want
@@ -18,8 +28,8 @@ $ git clean -dfx
   1. Build using the common sequence:
 
 ```sh
-$ meson setup _build
-$ meson compile -C _build
+$ meson _build .
+$ ninja -C _build
 ```
 
   2. Update NEWS based on the content of git log; follow the format of prior
@@ -30,10 +40,11 @@ $ meson compile -C _build
      writers, committers, etc. Anybody who is mentioned in the commit log
      gets a credit, but only real names, not email addresses or nicknames.
 
-  3. Update the pot file and commit the changes:
+  3. Update the pot files and commit the changes:
 
 ```sh
 $ ninja -C _build gtk40-pot
+$ ninja -C _build gtk40-properties-pot
 ```
 
   4. If this is a major, stable, release, verify that the release notes
@@ -61,7 +72,7 @@ $ ninja -C _build gtk40-pot
      Make sure that all new symbols have proper Since: tags, and that there
      is an index in the main `-docs.xml` for the next stable version.
 
-  8. Run `meson dist -C_build` to generate the tarball.
+  8. Run `ninja dist` to generate the tarball.
 
   9. Fix broken stuff found by 8), commit changes, repeat.
 
@@ -83,8 +94,7 @@ $ ninja -C _build gtk40-pot
 $ git tag -m "GTK 4.2.0" 4.2.0
 ```
 
-  13. Bump the version number in `meson.build`, and add a section for the next
-      release in NEWS and commit the change.
+  13. Bump the version number in `meson.build` and commit the change.
 
   14. Push the changes upstream, and push the tag as well. The git command for
     doing that is:
@@ -101,8 +111,7 @@ $ git push origin 4.2.0
 
 ```sh
 $ scp gtk-4.2.0.tar.xz matthiasc@master.gnome.org:
-$ ssh matthiasc@master.gnome.org
-$ ftpadmin install gtk-4.2.0.tar.xz
+$ ssh matthiasc@master.gnome.org ftpadmin install gtk-4.2.0.tar.xz
 ```
 
   16. Go to the gnome-announce list archives, find the last announce message,

docs/reference/gtk/coordinates.md

@@ -23,7 +23,7 @@ When it comes to rendering, GTK follows the CSS box model as far as practical.
 
 The CSS stylesheet that is in use determines the sizes (and appearance) of the
 margin, border and padding areas for each widget. The size of the content area
-is determined by GTKs layout algorithm using each widget’s [vfunc@Gtk.Widget.measure]
+is determined by GTKs layout algorithm using each widgets [vfunc@Gtk.Widget.measure]
 and [vfunc@Gtk.Widget.size_allocate] vfuncs.
 
 You can learn more about the CSS box model by reading the
@@ -37,11 +37,11 @@ To learn more about where GTK CSS differs from CSS on the web, see the
 
 The content area in the CSS box model is the region that the widget considers its own.
 
-The origin of the widget’s coordinate system is the top left corner of the content area,
-and its size is the widget’s size. The size can be queried with [method@Gtk.Widget.get_width]
+The origin of the widgets coordinate system is the top left corner of the content area,
+and its size is the widgets size. The size can be queried with [method@Gtk.Widget.get_width]
 and [method@Gtk.Widget.get_height]. GTK allows general 3D transformations to position
 widgets (although most of the time, the transformation will be a simple 2D translation).
-The transform to go from one widget’s coordinate system to another one can be obtained
+The transform to go from one widgets coordinate system to another one can be obtained
 with [method@Gtk.Widget.compute_transform].
 
 In addition to a size, widgets can optionally have a **_baseline_** to position text on.
@@ -55,8 +55,8 @@ or [method@Gtk.Widget.compute_bounds]. These methods can fail (either because th
 don't share a common ancestor, or because of a singular transformation), and callers need
 to handle this eventuality.
 
-Another area that is occasionally relevant are the widget’s **_bounds_**, which is the area
-that a widget’s rendering is typically confined to (technically, widgets can draw outside
+Another area that is occasionally relevant are the widgets **_bounds_**, which is the area
+that a widgets rendering is typically confined to (technically, widgets can draw outside
 of this area, unless clipping is enforced via the [property@Gtk.Widget:overflow] property).
 In CSS terms, the bounds of a widget correspond to the border area.
 

docs/reference/gtk/css-overview.md

@@ -68,7 +68,7 @@ in a selector, widget names must be prefixed with a # character.
 | E:focus-within | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#focus-within-pseudo) | Set on all ancestors of the focus widget, unlike CSS |
 | E:focus-visible | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#focus-within-pseudo) | Set on focus widget and all ancestors, unlike CSS |
 | E:disabled | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#UIstates) | Corresponds to GTK_STATE_FLAG_INSENSITIVE |
-| E:checked | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#UIstates) | Corresponds to GTK_STATE_FLAG_CHECKED |
+| E:disabled | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#UIstates) | Corresponds to GTK_STATE_FLAG_CHECKED |
 | E:indeterminate | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#indeterminate) | Corresponds to GTK_STATE_FLAG_INCONSISTENT |
 | E:backdrop, E:selected | | Corresponds to GTK_STATE_FLAG_BACKDROP, GTK_STATE_FLAG_SELECTED |
 | E:not(selector) | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#negation) | |

docs/reference/gtk/getting_started.md

@@ -89,11 +89,11 @@ using `gtk_application_new()`.
 When creating a [class@Gtk.Application], you need to pick an application
 identifier (a name) and pass it to [ctor@Gtk.Application.new] as parameter. For
 this example `org.gtk.example` is used. For choosing an identifier for your
-application, see [this guide](https://developer.gnome.org/documentation/tutorials/application-id.html).
+application, see [this guide](https://wiki.gnome.org/HowDoI/ChooseApplicationID).
 Lastly, [ctor@Gtk.Application.new] takes `GApplicationFlags` as input
 for your application, if your application would have special needs.
 
-Next the [activate signal](https://developer.gnome.org/documentation/tutorials/application.html) is
+Next the [activate signal](https://wiki.gnome.org/HowDoI/GtkApplication) is
 connected to the activate() function above the `main()` function. The `activate`
 signal will be emitted when your application is launched with `g_application_run()`
 on the line below. The `g_application_run()` call also takes as arguments the

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

@@ -16,7 +16,6 @@ SYNOPSIS
 |   **gtk4-builder-tool** enumerate [OPTIONS...] <FILE>
 |   **gtk4-builder-tool** simplify [OPTIONS...] <FILE>
 |   **gtk4-builder-tool** preview [OPTIONS...] <FILE>
-|   **gtk4-builder-tool** render [OPTIONS...] <FILE>
 |   **gtk4-builder-tool** screenshot [OPTIONS...] <FILE>
 
 DESCRIPTION
@@ -70,11 +69,12 @@ file to use.
 
   Load style information from the given CSS file.
 
-Render
-^^^^^^
+Screenshot
+^^^^^^^^^^
 
-The ``render`` command saves a rendering of the UI definition file as a png image
-or node file. The name of the file to write can be specified as a second FILE argument.
+The ``screenshot`` command saves a rendering of the UI definition file
+as a png image or node file. The name of the file to write can be specified as
+a second FILE argument.
 
 This command accepts options to specify the ID of the toplevel object and a CSS
 file to use.
@@ -96,11 +96,6 @@ file to use.
 
   Overwrite an existing file.
 
-Screenshot
-^^^^^^^^^^
-
-The ``screenshot`` command is an alias for ``render``.
-
 Simplification
 ^^^^^^^^^^^^^^
 

docs/reference/gtk/gtk4-rendernode-tool.rst

@@ -1,47 +0,0 @@
-.. _gtk4-rendernode-tool(1):
-
-====================
-gtk4-rendernode-tool
-====================
-
------------------------
-GskRenderNode Utility
------------------------
-
-SYNOPSIS
---------
-|   **gtk4-rendernode-tool** <COMMAND> [OPTIONS...] <FILE>
-|
-|   **gtk4-rendernode-tool** info [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** show [OPTIONS...] <FILE>
-|   **gtk4-rendernode-tool** render [OPTIONS...] <FILE> [<FILE>]
-
-DESCRIPTION
------------
-
-``gtk4-rendernode-tool`` can perform various operations on serialized rendernodes.
-
-COMMANDS
---------
-
-Information
-^^^^^^^^^^^
-
-The ``info`` command shows general information about the rendernode, such
-as the number of nodes, and the depth of the tree.
-
-Showing
-^^^^^^^
-
-The ``show`` command displays the rendernode.
-
-Rendering
-^^^^^^^^^
-
-The ``render`` command saves a rendering of the rendernode as a png or tiff image.
-The name of the file to write can be specified as a second FILE argument.
-
-``--renderer=RENDERER``
-
-  Use the given renderer. Use ``--renderer=help`` to get a information
-  about poassible values for the ``RENDERER``.

docs/reference/gtk/meson.build

@@ -75,7 +75,6 @@ if get_option('man-pages') and rst2man.found()
     [ 'gtk4-encode-symbolic-svg', '1', ],
     [ 'gtk4-launch', '1', ],
     [ 'gtk4-query-settings', '1', ],
-    [ 'gtk4-rendernode-tool', '1' ],
     [ 'gtk4-update-icon-cache', '1', ],
   ]
 

docs/reference/gtk/running.md

@@ -73,6 +73,9 @@ A number of keys are influencing behavior instead of just logging:
 `no-css-cache`
 : Bypass caching for CSS style properties
 
+`touchscreen`
+: Pretend the pointer is a touchscreen device
+
 `snapshot`
 : Include debug render nodes in the generated snapshots
 
@@ -205,12 +208,6 @@ A number of options affect behavior instead of logging:
 `nograbs`
 : Turn off all pointer and keyboard grabs
 
-`portals`
-: Force the use of [portals](https://docs.flatpak.org/en/latest/portals.html)
-
-`no-portals`
-: Disable use of [portals](https://docs.flatpak.org/en/latest/portals.html)
-
 `gl-disable`
 : Disable OpenGL support
 

docs/reference/gtk/section-accessibility.md

@@ -31,7 +31,7 @@ described by a set of *attributes*.
 Roles define the taxonomy and semantics of a UI control to any assistive
 technology application; for instance, a button will have a role of
 `GTK_ACCESSIBLE_ROLE_BUTTON`; an entry will have a role of
-`GTK_ACCESSIBLE_ROLE_TEXTBOX`; a check button will have a role of
+`GTK_ACCESSIBLE_ROLE_TEXTBOX`; a toggle button will have a role of
 `GTK_ACCESSIBLE_ROLE_CHECKBOX`; etc.
 
 Each role is part of the widget's instance, and **cannot** be changed over
@@ -46,7 +46,6 @@ Each role name is part of the #GtkAccessibleRole enumeration.
 
 | Role name | Description | Related GTK widget |
 |-----------|-------------|--------------------|
-| `APPLICATION` | An application window | [class@Gtk.Window] |
 | `BUTTON` | A control that performs an action when pressed | [class@Gtk.Button], [class@Gtk.LinkButton], [class@Gtk.Expander] |
 | `CHECKBOX` | A control that has three possible value: `true`, `false`, or `undefined` | [class@Gtk.CheckButton] |
 | `COMBOBOX` | A control that can be expanded to show a list of possible values to select | [class@Gtk.ComboBox] |
@@ -79,6 +78,7 @@ Each role name is part of the #GtkAccessibleRole enumeration.
 | `TAB_PANEL` | A page in a notebook or stack | [class@Gtk.Stack] |
 | `TEXT_BOX` | A type of input that allows free-form text as its value. | [class@Gtk.Entry], [class@Gtk.PasswordEntry], [class@Gtk.TextView] |
 | `TREE_GRID` | A treeview-like columned list | [class@Gtk.ColumnView] |
+| `WINDOW` | An application window | [class@Gtk.Window] |
 | `...` | … |
 
 See the [WAI-ARIA](https://www.w3.org/WAI/PF/aria/appendices#quickref) list
@@ -204,27 +204,19 @@ you should ensure that:
    readable and localised action performed when pressed; for instance "Copy",
    "Paste", "Add layer", or "Remove"
 
-GTK will try to fill in some information by using ancillary UI control properties,
-for instance the accessible name will be taken from the label used by the UI control,
-or from its tooltip, if the `GTK_ACCESSIBLE_PROPERTY_LABEL` property or the
-`GTK_ACCESSIBLE_RELATION_LABELLED_BY` relation are unset. Similary for the accessible
-description. Nevertheless, it is good practice and project hygiene to explicitly specify
-the accessible properties, just like it's good practice to specify tooltips and style classes.
+GTK will try to fill in some information by using ancillary UI control
+properties, for instance the accessible label will be taken from the label or
+placeholder text used by the UI control, or from its tooltip, if the
+`GTK_ACCESSIBLE_PROPERTY_LABEL` property or the `GTK_ACCESSIBLE_RELATION_LABELLED_BY`
+relation are unset. Nevertheless, it is good practice and project hygiene
+to explicitly specify the accessible properties, just like it's good practice
+to specify tooltips and style classes.
 
 Application developers using GTK **should** ensure that their UI controls
-are accessible as part of the development process. The GTK Inspector shows
-the accessible attributes of each widget, and also provides an overlay that
-can highlight accessibility issues.
-
-It is possible to set accessible attributes in UI files as well:
-```xml
-<object class="GtkButton" id="button1">
-  <accessibility>
-    <property name="label">Download</property>
-    <relation name="labelled-by">label1</relation>
-  /accessibility>
-</object>
-```
+are accessible as part of the development process. When using `GtkBuilder`
+templates and UI definition files, GTK provides a validation tool that
+verifies that each UI element has a valid role and properties; this tool can
+be used as part of the application's test suite to avoid regressions.
 
 ## Implementations
 
@@ -267,13 +259,6 @@ turn automatically any widget into a `GtkButton`; but if your widget behaves
 like a button, using the %GTK_ACCESSIBLE_ROLE_BUTTON will allow any
 assistive technology to handle it like they would a `GtkButton`.
 
-For widgets that act as containers of other widgets, you should use
-%GTK_ACCESSIBLE_ROLE_GROUP if the grouping of the children is semantic
-in nature; for instance, the children of a [class@Gtk.HeaderBar] are
-grouped together on the header of a window. For generic containers that
-only impose a layout on their children, you should use
-%GTK_ACCESSIBLE_ROLE_GENERIC instead.
-
 ### Attributes can both hide and enhance
 
 Accessible attributes can be used to override the content of a UI element,
@@ -382,6 +367,3 @@ To allow changing the value via accessible technologies, you can export
 actions.  Since the accessibility interfaces only support actions
 without parameters, you should provide actions such as `increase-value`
 and `decrease-value`.
-
-Since GTK 4.10, the best way to suppose changing the value is by implementing
-the [iface@Gtk.AccessibleRange] interface.

docs/reference/gtk/section-list-widget.md

@@ -30,12 +30,12 @@ Views display data from a **_model_**. Models implement the [`iface@Gio.ListMode
 interface and can be provided in a variety of ways:
 
  * List model implementations for many specific types of data already exist, for
-   example [`class@Gtk.DirectoryList`] or [`class@Gtk.StringList`].
+   example `GtkDirectoryList` or `GtkStringList`.
 
- * There are generic list model implementations like [`class@Gio.ListStore`] that allow building
+ * There are generic list model implementations like`GListStore` that allow building
    lists of arbitrary objects.
 
- * Wrapping list models like [`class@Gtk.FilterListModel`] or [`class@Gtk.SortListModel`]
+ * Wrapping list models like `GtkFilterListModel` or `GtkSortListModel`
    modify, adapt or combine other models.
 
  * Last but not least, developers are encouraged to create their own `GListModel`
@@ -133,8 +133,8 @@ tradeoffs of those and experiment with them.
 
 GTK offers a wide variety of wrapping models which change or supplement an
 existing model (or models) in some way. But when it comes to storing your
-actual data, there are only a few ready-made choices available:
-[`class@Gio.ListStore`], [`class@Gtk.StringList`], and [`class@Gtk.DirectoryList`].
+actual data, there are only a few ready-made choices available: [`class@Gio.ListStore`]
+and [`class@Gtk.StringList`].
 
 `GListStore` is backed by a balanced tree and has performance characteristics
 that are expected for that data structure. It works reasonably well for dataset
@@ -147,10 +147,6 @@ that are expected for that data structure. `GtkStringList` is a good fit for any
 place where you would otherwise use `char*[]` and works best if the dataset
 is not very dynamic.
 
-`GtkDirectoryList` is a list model that wraps [`method@Gio.File.enumerate_children_async`].
-It presents a `GListModel` and fills it asynchronously with the [`iface@Gio.File`]s
-returned from that function.
-
 If these models don't fit your use case or scalability requirements, you
 should make a custom `GListModel` implementation. It is a small interface and
 not very hard to implement.
@@ -200,15 +196,6 @@ The _data table_ style of list is a high density table, similar in style to a
 traditional treeview. Individual cells can be selectable and editable. Use
 the `.data-table` style class.
 
-## Sections
-
-List models can optionally group their items into **_sections_**, by implementing
-the `GtkSectionModel` interface. `GtkListView` can
-display headers for sections, by installing a separate **_header factory_**.
-
-Many GTK list models support section inherently, or they pass through the
-section of a model they are wrapping.
-
 ## Comparison to GtkTreeView
 
 Developers familiar with `GtkTreeView` may wonder how this way of doing lists

examples/application6/exampleappprefs.c

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs
 
 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
   gtk_widget_init_template (GTK_WIDGET (prefs));
   prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind_with_mapping (prefs->settings, "font",
-                                prefs->font, "font-desc",
-                                G_SETTINGS_BIND_DEFAULT,
-                                string_to_font_desc,
-                                font_desc_to_string,
-                                NULL, NULL);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
 }
 
 static void

examples/application6/prefs.ui

@@ -27,10 +27,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkFontDialogButton" id="font">
-                <property name="dialog">
-                  <object class="GtkFontDialog"/>
-                </property>
+              <object class="GtkFontButton" id="font">
                 <layout>
                   <property name="column">1</property>
                   <property name="row">0</property>
@@ -50,16 +47,12 @@
               </object>
             </child>
             <child>
-              <object class="GtkDropDown" id="transition">
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Fade</item>
-                      <item translatable="yes">Slide</item>
-                    </items>
-                  </object>
-                </property>
+              <object class="GtkComboBoxText" id="transition">
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="crossfade">Fade</item>
+                  <item translatable="yes" id="slide-left-right">Slide</item>
+                </items>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">1</property>

examples/application7/exampleappprefs.c

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs
 
 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
   gtk_widget_init_template (GTK_WIDGET (prefs));
   prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind_with_mapping (prefs->settings, "font",
-                                prefs->font, "font-desc",
-                                G_SETTINGS_BIND_DEFAULT,
-                                string_to_font_desc,
-                                font_desc_to_string,
-                                NULL, NULL);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
 }
 
 static void

examples/application7/prefs.ui

@@ -27,10 +27,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkFontDialogButton" id="font">
-                <property name="dialog">
-                  <object class="GtkFontDialog"/>
-                </property>
+              <object class="GtkFontButton" id="font">
                 <layout>
                   <property name="column">1</property>
                   <property name="row">0</property>
@@ -50,16 +47,12 @@
               </object>
             </child>
             <child>
-              <object class="GtkDropDown" id="transition">
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Fade</item>
-                      <item translatable="yes">Slide</item>
-                    </items>
-                  </object>
-                </property>
+              <object class="GtkComboBoxText" id="transition">
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="crossfade">Fade</item>
+                  <item translatable="yes" id="slide-left-right">Slide</item>
+                </items>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">1</property>

examples/application8/exampleappprefs.c

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs
 
 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
   gtk_widget_init_template (GTK_WIDGET (prefs));
   prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind_with_mapping (prefs->settings, "font",
-                                prefs->font, "font-desc",
-                                G_SETTINGS_BIND_DEFAULT,
-                                string_to_font_desc,
-                                font_desc_to_string,
-                                NULL, NULL);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
 }
 
 static void

examples/application8/prefs.ui

@@ -27,10 +27,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkFontDialogButton" id="font">
-                <property name="dialog">
-                  <object class="GtkFontDialog"/>
-                </property>
+              <object class="GtkFontButton" id="font">
                 <layout>
                   <property name="column">1</property>
                   <property name="row">0</property>
@@ -50,16 +47,12 @@
               </object>
             </child>
             <child>
-              <object class="GtkDropDown" id="transition">
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Fade</item>
-                      <item translatable="yes">Slide</item>
-                    </items>
-                  </object>
-                </property>
+              <object class="GtkComboBoxText" id="transition">
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="crossfade">Fade</item>
+                  <item translatable="yes" id="slide-left-right">Slide</item>
+                </items>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">1</property>

examples/application9/exampleappprefs.c

@@ -15,78 +15,18 @@ struct _ExampleAppPrefs
 
 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
-static gboolean
-string_to_font_desc (GValue   *value,
-                     GVariant *variant,
-                     gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  PangoFontDescription *desc;
-
-  desc = pango_font_description_from_string (s);
-  g_value_take_boxed (value, desc);
-
-  return TRUE;
-}
-
-static GVariant *
-font_desc_to_string (const GValue       *value,
-                     const GVariantType *expected_type,
-                     gpointer            user_data)
-{
-  PangoFontDescription *desc = g_value_get_boxed (value);
-  char *s = pango_font_description_to_string (desc);
-  return g_variant_new_take_string (s);
-}
-
-static gboolean
-transition_to_pos (GValue   *value,
-                   GVariant *variant,
-                   gpointer  user_data)
-{
-  const char *s = g_variant_get_string (variant, NULL);
-  if (strcmp (s, "none") == 0)
-    g_value_set_uint (value, 0);
-  else if (strcmp (s, "crossfade") == 0)
-    g_value_set_uint (value, 1);
-  else
-    g_value_set_uint (value, 2);
-
-  return TRUE;
-}
-
-static GVariant *
-pos_to_transition (const GValue       *value,
-                   const GVariantType *expected_type,
-                   gpointer            user_data)
-{
-  switch (g_value_get_uint (value))
-    {
-    case 0: return g_variant_new_string ("none");
-    case 1: return g_variant_new_string ("crossfade");
-    case 2: return g_variant_new_string ("slide-left-right");
-    default: g_assert_not_reached ();
-    }
-}
-
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
   gtk_widget_init_template (GTK_WIDGET (prefs));
   prefs->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind_with_mapping (prefs->settings, "font",
-                                prefs->font, "font-desc",
-                                G_SETTINGS_BIND_DEFAULT,
-                                string_to_font_desc,
-                                font_desc_to_string,
-                                NULL, NULL);
-  g_settings_bind_with_mapping (prefs->settings, "transition",
-                                prefs->transition, "selected",
-                                G_SETTINGS_BIND_DEFAULT,
-                                transition_to_pos,
-                                pos_to_transition,
-                                NULL, NULL);
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
 }
 
 static void

examples/application9/prefs.ui

@@ -27,10 +27,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkFontDialogButton" id="font">
-                <property name="dialog">
-                  <object class="GtkFontDialog"/>
-                </property>
+              <object class="GtkFontButton" id="font">
                 <layout>
                   <property name="column">1</property>
                   <property name="row">0</property>
@@ -50,16 +47,12 @@
               </object>
             </child>
             <child>
-              <object class="GtkDropDown" id="transition">
-                <property name="model">
-                  <object class="GtkStringList">
-                    <items>
-                      <item translatable="yes">None</item>
-                      <item translatable="yes">Fade</item>
-                      <item translatable="yes">Slide</item>
-                    </items>
-                  </object>
-                </property>
+              <object class="GtkComboBoxText" id="transition">
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="crossfade">Fade</item>
+                  <item translatable="yes" id="slide-left-right">Slide</item>
+                </items>
                 <layout>
                   <property name="column">1</property>
                   <property name="row">1</property>

examples/bp/bloatpad.c

@@ -1,6 +1,8 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
 typedef struct
 {
   GtkApplication parent_instance;
@@ -354,8 +356,8 @@ combo_changed (GtkDropDown *combo,
                GParamSpec  *pspec,
                gpointer     user_data)
 {
+  GtkDialog *dialog = user_data;
   GtkEntry *entry = g_object_get_data (user_data, "entry");
-  GtkWidget *set_button = g_object_get_data (user_data, "set-button");
   const char *action;
   char **accels;
   char *str;
@@ -370,7 +372,7 @@ combo_changed (GtkDropDown *combo,
   g_strfreev (accels);
 
   gtk_editable_set_text (GTK_EDITABLE (entry), str);
-  gtk_widget_set_sensitive (set_button, FALSE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE);
 }
 
 static void
@@ -378,21 +380,15 @@ entry_changed (GtkEntry   *entry,
                GParamSpec *pspec,
                gpointer    user_data)
 {
-  GtkWidget *set_button = g_object_get_data (user_data, "set-button");
+  GtkDialog *dialog = user_data;
 
-  gtk_widget_set_sensitive (set_button, TRUE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, TRUE);
 }
 
 static void
-close_clicked (GtkButton *button,
-               gpointer   user_data)
-{
-  gtk_window_destroy (GTK_WINDOW (user_data));
-}
-
-static void
-set_clicked (GtkButton *button,
-             gpointer   user_data)
+response (GtkDialog *dialog,
+          guint      response_id,
+          gpointer   user_data)
 {
   GtkEntry *entry = g_object_get_data (user_data, "entry");
   GtkDropDown *combo = g_object_get_data (user_data, "combo");
@@ -400,6 +396,12 @@ set_clicked (GtkButton *button,
   const char *str;
   char **accels;
 
+  if (response_id == GTK_RESPONSE_CANCEL)
+    {
+      gtk_window_destroy (GTK_WINDOW (dialog));
+      return;
+    }
+
   action = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_drop_down_get_selected_item (combo)));
 
   if (!action)
@@ -411,7 +413,7 @@ set_clicked (GtkButton *button,
   gtk_application_set_accels_for_action (gtk_window_get_application (user_data), action, (const char **) accels);
   g_strfreev (accels);
 
-  gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE);
 }
 
 static void
@@ -422,45 +424,32 @@ edit_accels (GSimpleAction *action,
   GtkApplication *app = user_data;
   GtkWidget *combo;
   GtkWidget *entry;
-  GtkWidget *header;
-  GtkWidget *close_button;
-  GtkWidget *set_button;
-  GtkWidget *box;
   char **actions;
   GtkWidget *dialog;
   int i;
   GtkStringList *strings;
 
-  dialog = gtk_window_new ();
-  gtk_window_set_title (GTK_WINDOW (dialog), "Accelerators");
+  dialog = gtk_dialog_new_with_buttons ("Accelerators",
+                                        NULL,
+                                        GTK_DIALOG_USE_HEADER_BAR,
+                                        "Close", GTK_RESPONSE_CANCEL,
+                                        "Set", GTK_RESPONSE_APPLY,
+                                        NULL);
+
   gtk_window_set_application (GTK_WINDOW (dialog), app);
   actions = gtk_application_list_action_descriptions (app);
 
-  header = gtk_header_bar_new ();
-  gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-  close_button = gtk_button_new_with_label ("Close");
-  g_signal_connect (close_button, "clicked", G_CALLBACK (close_clicked), dialog);
-  gtk_header_bar_pack_start (GTK_HEADER_BAR (header), close_button);
-  set_button = gtk_button_new_with_label ("Set");
-  g_signal_connect (set_button, "clicked", G_CALLBACK (set_clicked), dialog);
-  gtk_header_bar_pack_end (GTK_HEADER_BAR (header), set_button);
-
-  gtk_window_set_titlebar (GTK_WINDOW (dialog), header);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-  g_object_set (box,
+  strings = gtk_string_list_new (NULL);
+  combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
+  g_object_set (gtk_dialog_get_content_area (GTK_DIALOG (dialog)),
                 "margin-top", 10,
                 "margin-bottom", 10,
                 "margin-start", 10,
                 "margin-end", 10,
+                "spacing", 10,
                 NULL);
-  gtk_window_set_child (GTK_WINDOW (dialog), box);
-
-  strings = gtk_string_list_new (NULL);
-  combo = gtk_drop_down_new (G_LIST_MODEL (strings), NULL);
-
-  gtk_box_append (GTK_BOX (box), combo);
 
+  gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), combo);
   for (i = 0; actions[i]; i++)
     gtk_string_list_append (strings, actions[i]);
   g_signal_connect (combo, "notify::selected", G_CALLBACK (combo_changed), dialog);
@@ -469,10 +458,10 @@ edit_accels (GSimpleAction *action,
   gtk_widget_set_hexpand (entry, TRUE);
   g_signal_connect (entry, "notify::text", G_CALLBACK (entry_changed), dialog);
 
-  gtk_box_append (GTK_BOX (box), entry);
+  gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), entry);
+  g_signal_connect (dialog, "response", G_CALLBACK (response), dialog);
   g_object_set_data (G_OBJECT (dialog), "combo", combo);
   g_object_set_data (G_OBJECT (dialog), "entry", entry);
-  g_object_set_data (G_OBJECT (dialog), "set-button", set_button);
 
   gtk_drop_down_set_selected (GTK_DROP_DOWN (combo), 0);
 

examples/meson.build

@@ -13,6 +13,8 @@ foreach ex : examples
   example_name = ex == 'builder' ? 'builder_example' : ex
   executable(example_name, '@0@.c'.format(ex),
              c_args: [
+               '-DGDK_DISABLE_DEPRECATED',
+               '-DGTK_DISABLE_DEPRECATED',
                '-DGTK_SRCDIR="@0@"'.format(meson.current_source_dir()),
              ] + common_cflags,
              dependencies: libgtk_dep)

gdk/broadway/gdkcairocontext-broadway.c

@@ -34,7 +34,7 @@ gdk_broadway_cairo_context_dispose (GObject *object)
 
 static void
 gdk_broadway_cairo_context_begin_frame (GdkDrawContext *draw_context,
-                                        GdkMemoryDepth  depth,
+                                        gboolean        prefers_high_depth,
                                         cairo_region_t *region)
 {
   GdkBroadwayCairoContext *self = GDK_BROADWAY_CAIRO_CONTEXT (draw_context);

gdk/broadway/gdkdrawcontext-broadway.c

@@ -34,7 +34,7 @@ gdk_broadway_draw_context_dispose (GObject *object)
 
 static void
 gdk_broadway_draw_context_begin_frame (GdkDrawContext *draw_context,
-                                       GdkMemoryDepth  depth,
+                                       gboolean        prefers_high_depth,
                                        cairo_region_t *region)
 {
   GdkBroadwayDrawContext *self = GDK_BROADWAY_DRAW_CONTEXT (draw_context);

gdk/deprecated/meson.build

@@ -1,7 +1,7 @@
-gdk_deprecated_sources = files([
-  'gdkpixbuf.c',
-])
+gdk_deprecated_sources = [
+  'deprecated/gdkpixbuf.c',
+]
 
-gdk_deprecated_headers = files([
-  'gdkpixbuf.h',
-])
+gdk_deprecated_headers = [
+  'deprecated/gdkpixbuf.h',
+]

gdk/gdkcontentformats.c

@@ -645,9 +645,6 @@ gdk_content_formats_builder_clear (GdkContentFormatsBuilder *builder)
 {
   g_clear_pointer (&builder->gtypes, g_slist_free);
   g_clear_pointer (&builder->mime_types, g_slist_free);
-
-  builder->n_gtypes = 0;
-  builder->n_mime_types = 0;
 }
 
 /**

gdk/gdkdisplay.c

@@ -36,7 +36,6 @@
 #include "gdkglcontextprivate.h"
 #include "gdkmonitorprivate.h"
 #include "gdkrectangle.h"
-#include "gdkvulkancontext.h"
 
 #ifdef HAVE_EGL
 #include <epoxy/egl.h>
@@ -384,9 +383,6 @@ gdk_display_dispose (GObject *object)
 #endif
   g_clear_error (&priv->gl_error);
 
-  for (GList *l = display->seats; l; l = l->next)
-    g_object_run_dispose (G_OBJECT (l->data));
-
   G_OBJECT_CLASS (gdk_display_parent_class)->dispose (object);
 }
 
@@ -1217,49 +1213,6 @@ gdk_display_get_keymap (GdkDisplay *display)
   return GDK_DISPLAY_GET_CLASS (display)->get_keymap (display);
 }
 
-/*<private>
- * gdk_display_create_vulkan_context:
- * @self: a `GdkDisplay`
- * @error: return location for an error
- *
- * Creates a new `GdkVulkanContext` for use with @display.
- *
- * The context can not be used to draw to surfaces, it can only be
- * used for custom rendering or compute.
- *
- * If the creation of the `GdkVulkanContext` failed, @error will be set.
- *
- * Returns: (transfer full): the newly created `GdkVulkanContext`, or
- *   %NULL on error
- */
-GdkVulkanContext *
-gdk_display_create_vulkan_context (GdkDisplay  *self,
-                                   GError     **error)
-{
-  g_return_val_if_fail (GDK_IS_DISPLAY (self), NULL);
-  g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
-  if (gdk_display_get_debug_flags (self) & GDK_DEBUG_VULKAN_DISABLE)
-    {
-      g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE,
-                           _("Vulkan support disabled via GDK_DEBUG"));
-      return NULL;
-    }
-
-  if (GDK_DISPLAY_GET_CLASS (self)->vk_extension_name == NULL)
-    {
-      g_set_error (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_UNSUPPORTED,
-                   "The %s backend has no Vulkan support.", G_OBJECT_TYPE_NAME (self));
-      return FALSE;
-    }
-
-  return g_initable_new (GDK_DISPLAY_GET_CLASS (self)->vk_context_type,
-                         NULL,
-                         error,
-                         "display", self,
-                         NULL);
-}
-
 static void
 gdk_display_init_gl (GdkDisplay *self)
 {

gdk/gdkdisplayprivate.h

@@ -100,11 +100,6 @@ struct _GdkDisplay
   VkDevice vk_device;
   VkQueue vk_queue;
   uint32_t vk_queue_family_index;
-  VkPipelineCache vk_pipeline_cache;
-  gsize vk_pipeline_cache_size;
-  char *vk_pipeline_cache_etag;
-  guint vk_save_pipeline_cache_source;
-  GHashTable *vk_shader_modules;
 
   guint vulkan_refcount;
 #endif /* GDK_RENDERING_VULKAN */
@@ -207,9 +202,6 @@ gulong              _gdk_display_get_next_serial      (GdkDisplay       *display
 void                _gdk_display_pause_events         (GdkDisplay       *display);
 void                _gdk_display_unpause_events       (GdkDisplay       *display);
 
-GdkVulkanContext *  gdk_display_create_vulkan_context (GdkDisplay       *self,
-                                                       GError          **error);
-
 GdkGLContext *      gdk_display_get_gl_context        (GdkDisplay       *display);
 
 gboolean            gdk_display_init_egl              (GdkDisplay       *display,

gdk/gdkdrawcontext.c

@@ -311,20 +311,19 @@ gdk_draw_context_begin_frame (GdkDrawContext       *context,
   g_return_if_fail (priv->surface != NULL);
   g_return_if_fail (region != NULL);
 
-  gdk_draw_context_begin_frame_full (context, GDK_MEMORY_U8, region);
+  gdk_draw_context_begin_frame_full (context, FALSE, region);
 }
 
 /*
- * @depth: best depth to render in
+ * @prefers_high_depth: %TRUE to request a higher bit depth
  *
- * If the given depth is not `GDK_MEMORY_U8`, GDK will see about providing a
- * rendering target that supports a higher bit depth than 8 bits per channel.
- * Typically this means a target supporting 16bit floating point pixels, but
- * that is not guaranteed.
+ * If high depth is preferred, GDK will see about providing a rendering target
+ * that supports higher bit depth than 8 bits per channel. Typically this means
+ * a target supporting 16bit floating point pixels, but that is not guaranteed.
  *
  * This is only a request and if the GDK backend does not support HDR rendering
  * or does not consider it worthwhile, it may choose to not honor the request.
- * It may also choose to provide a differnet depth even if it was not requested.
+ * It may also choose to provide high depth even if it was not requested.
  * Typically the steps undertaken by a backend are:
  * 1. Check if high depth is supported by this drawing backend.
  * 2. Check if the compositor supports high depth.
@@ -334,12 +333,12 @@ gdk_draw_context_begin_frame (GdkDrawContext       *context,
  * In either of those cases, the context will usually choose to not honor the request.
  *
  * The rendering code must be able to deal with content in any bit depth, no matter
- * the preference. The depth argument is only a hint and GDK is free
+ * the preference. The prefers_high_depth argument is only a hint and GDK is free
  * to choose.
  */
 void
 gdk_draw_context_begin_frame_full (GdkDrawContext       *context,
-                                   GdkMemoryDepth        depth,
+                                   gboolean              prefers_high_depth,
                                    const cairo_region_t *region)
 {
   GdkDrawContextPrivate *priv = gdk_draw_context_get_instance_private (context);
@@ -366,12 +365,12 @@ gdk_draw_context_begin_frame_full (GdkDrawContext       *context,
     }
 
   if (gdk_display_get_debug_flags (priv->display) & GDK_DEBUG_HIGH_DEPTH)
-    depth = GDK_MEMORY_FLOAT32;
+    prefers_high_depth = TRUE;
 
   priv->frame_region = cairo_region_copy (region);
   priv->surface->paint_context = g_object_ref (context);
 
-  GDK_DRAW_CONTEXT_GET_CLASS (context)->begin_frame (context, depth, priv->frame_region);
+  GDK_DRAW_CONTEXT_GET_CLASS (context)->begin_frame (context, prefers_high_depth, priv->frame_region);
 
   cairo_region_intersect_rectangle (priv->frame_region,
                                     &(cairo_rectangle_int_t) {

gdk/gdkdrawcontextprivate.h

@@ -22,8 +22,6 @@
 
 #include "gdkdrawcontext.h"
 
-#include "gdkmemoryformatprivate.h"
-
 G_BEGIN_DECLS
 
 #define GDK_DRAW_CONTEXT_CLASS(klass) 	(G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DRAW_CONTEXT, GdkDrawContextClass))
@@ -42,7 +40,7 @@ struct _GdkDrawContextClass
   GObjectClass parent_class;
 
   void                  (* begin_frame)                         (GdkDrawContext         *context,
-                                                                 GdkMemoryDepth          depth,
+                                                                 gboolean                prefers_high_depth,
                                                                  cairo_region_t         *update_area);
   void                  (* end_frame)                           (GdkDrawContext         *context,
                                                                  cairo_region_t         *painted);
@@ -52,7 +50,7 @@ struct _GdkDrawContextClass
 void                    gdk_draw_context_surface_resized        (GdkDrawContext         *context);
 
 void                    gdk_draw_context_begin_frame_full       (GdkDrawContext         *context,
-                                                                 GdkMemoryDepth          depth,
+                                                                 gboolean                prefers_high_depth,
                                                                  const cairo_region_t   *region);
 G_END_DECLS
 

gdk/gdkenums.h

@@ -30,8 +30,6 @@
 
 #include <glib.h>
 
-#include <gdk/version/gdkversionmacros.h>
-
 G_BEGIN_DECLS
 
 /**
@@ -308,20 +306,6 @@ typedef enum
  *   the alpha value. Since: 4.6
  * @GDK_MEMORY_R32G32B32A32_FLOAT: 4 float values; for red, green, blue and
  *   alpha. Since: 4.6
-  * @GDK_MEMORY_G8A8_PREMULTIPLIED: 2 bytes; for grayscale, alpha. The color
- *   values are premultiplied with the alpha value. Since: 4.12
- * @GDK_MEMORY_G8A8: 2 bytes; for grayscale, alpha. Since: 4.12
- * @GDK_MEMORY_G8: One byte; for grayscale. The data is opaque.
- *   Since: 4.12
- * @GDK_MEMORY_G16A16_PREMULTIPLIED: 2 guint16 values; for grayscale, alpha.
- *  The color values are premultiplied with the alpha value. Since: 4.12
- * @GDK_MEMORY_G16A16: 2 guint16 values; for grayscale, alpha. Since: 4.12
- * @GDK_MEMORY_G16: One guint16 value; for grayscale. The data is opaque.
- *   Since: 4.12
- * @GDK_MEMORY_A8: One byte; for alpha.
- *   Since: 4.12
- * @GDK_MEMORY_A16: One guint16 value; for alpha.
- *   Since: 4.12
  * @GDK_MEMORY_N_FORMATS: The number of formats. This value will change as
  *   more formats get added, so do not rely on its concrete integer.
  *
@@ -356,16 +340,6 @@ typedef enum {
   GDK_MEMORY_R32G32B32_FLOAT,
   GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED,
   GDK_MEMORY_R32G32B32A32_FLOAT,
-  GDK_MEMORY_G8A8_PREMULTIPLIED GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G8A8 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G8 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G16A16_PREMULTIPLIED GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G16A16 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_G16 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_A8 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_A16 GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_A16_FLOAT GDK_AVAILABLE_ENUMERATOR_IN_4_12,
-  GDK_MEMORY_A32_FLOAT GDK_AVAILABLE_ENUMERATOR_IN_4_12,
 
   GDK_MEMORY_N_FORMATS
 } GdkMemoryFormat;

gdk/gdkglcontext.c

@@ -173,8 +173,12 @@ static GPrivate thread_current_context = G_PRIVATE_INIT (unref_unmasked);
 static void
 gdk_gl_context_clear_old_updated_area (GdkGLContext *context)
 {
-  for (unsigned int i = 0; i < GDK_GL_MAX_TRACKED_BUFFERS; i++)
-    g_clear_pointer (&context->old_updated_area[i], cairo_region_destroy);
+  int i;
+
+  for (i = 0; i < 2; i++)
+    {
+      g_clear_pointer (&context->old_updated_area[i], cairo_region_destroy);
+    }
 }
 
 static void
@@ -462,26 +466,29 @@ gdk_gl_context_real_get_damage (GdkGLContext *context)
       eglQuerySurface (gdk_display_get_egl_display (display), egl_surface,
                        EGL_BUFFER_AGE_EXT, &buffer_age);
 
-      if (buffer_age > 0 && buffer_age <= GDK_GL_MAX_TRACKED_BUFFERS)
+      switch (buffer_age)
         {
-          cairo_region_t *damage = cairo_region_create ();
-          int i;
+          case 1:
+            return cairo_region_create ();
+            break;
 
-          for (i = 0; i < buffer_age - 1; i++)
-            {
-              if (context->old_updated_area[i] == NULL)
-                {
-                  cairo_region_create_rectangle (&(GdkRectangle) {
-                                                     0, 0,
-                                                     gdk_surface_get_width (surface),
-                                                     gdk_surface_get_height (surface)
-                                                 });
-                  break;
-                }
-              cairo_region_union (damage, context->old_updated_area[i]);
-            }
+          case 2:
+            if (context->old_updated_area[0])
+              return cairo_region_copy (context->old_updated_area[0]);
+            break;
 
-          return damage;
+          case 3:
+            if (context->old_updated_area[0] &&
+                context->old_updated_area[1])
+              {
+                cairo_region_t *damage = cairo_region_copy (context->old_updated_area[0]);
+                cairo_region_union (damage, context->old_updated_area[1]);
+                return damage;
+              }
+            break;
+
+          default:
+            ;
         }
     }
 #endif
@@ -581,7 +588,7 @@ gdk_gl_context_get_scale (GdkGLContext *self)
 
 static void
 gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,
-                                 GdkMemoryDepth  depth,
+                                 gboolean        prefers_high_depth,
                                  cairo_region_t *region)
 {
   GdkGLContext *context = GDK_GL_CONTEXT (draw_context);
@@ -590,23 +597,20 @@ gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,
   cairo_region_t *damage;
   double scale;
   int ww, wh;
-  int i;
 
   surface = gdk_draw_context_get_surface (draw_context);
   scale = gdk_gl_context_get_scale (context);
 
 #ifdef HAVE_EGL
   if (priv->egl_context)
-    gdk_surface_ensure_egl_surface (surface, depth != GDK_MEMORY_U8);
+    gdk_surface_ensure_egl_surface (surface, prefers_high_depth);
 #endif
 
   damage = GDK_GL_CONTEXT_GET_CLASS (context)->get_damage (context);
 
-  g_clear_pointer (&context->old_updated_area[GDK_GL_MAX_TRACKED_BUFFERS - 1], cairo_region_destroy);
-  for (i = GDK_GL_MAX_TRACKED_BUFFERS - 1; i > 0; i--)
-    {
-      context->old_updated_area[i] = context->old_updated_area[i - 1];
-    }
+  if (context->old_updated_area[1])
+    cairo_region_destroy (context->old_updated_area[1]);
+  context->old_updated_area[1] = context->old_updated_area[0];
   context->old_updated_area[0] = cairo_region_copy (region);
 
   cairo_region_union (region, damage);
@@ -1552,7 +1556,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
 
   priv->has_sync = gdk_gl_context_check_version (context, "3.2", "3.0") ||
                    epoxy_has_gl_extension ("GL_ARB_sync") ||
-                   epoxy_has_gl_extension ("GL_APPLE_sync");
+                   epoxy_has_gl_extension ("GK_APPLE_sync");
 
 #ifdef G_ENABLE_DEBUG
   {

gdk/gdkglcontextprivate.h

@@ -34,11 +34,6 @@ typedef enum {
   GDK_GL_CGL
 } GdkGLBackend;
 
-/* The maximum amount of buffers we track update regions for.
- * Note that this is equal to the max buffer age value we
- * can provide a damage region for */
-#define GDK_GL_MAX_TRACKED_BUFFERS 4
-
 #define GDK_GL_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
 #define GDK_IS_GL_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GL_CONTEXT))
 #define GDK_GL_CONTEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
@@ -50,7 +45,7 @@ struct _GdkGLContext
   GdkDrawContext parent_instance;
 
   /* We store the old drawn areas to support buffer-age optimizations */
-  cairo_region_t *old_updated_area[GDK_GL_MAX_TRACKED_BUFFERS];
+  cairo_region_t *old_updated_area[2];
 };
 
 struct _GdkGLContextClass

gdk/gdkgltexture.c

@@ -138,7 +138,6 @@ static gboolean
 gdk_gl_texture_find_format (gboolean         use_es,
                             guint            gl_major,
                             guint            gl_minor,
-                            GdkMemoryAlpha   alpha,
                             GLint            gl_format,
                             GLint            gl_type,
                             GdkMemoryFormat *out_format)
@@ -148,12 +147,8 @@ gdk_gl_texture_find_format (gboolean         use_es,
   for (format = 0; format < GDK_MEMORY_N_FORMATS; format++)
     {
       GLenum q_internal_format, q_format, q_type;
-      GLint q_swizzle[4];
 
-      if (gdk_memory_format_alpha (format) != alpha)
-        continue;
-
-      if (!gdk_memory_format_gl_format (format, use_es, gl_major, gl_minor, &q_internal_format, &q_format, &q_type, &q_swizzle))
+      if (!gdk_memory_format_gl_format (format, use_es, gl_major, gl_minor, &q_internal_format, &q_format, &q_type))
         continue;
 
       if (q_format != gl_format || q_type != gl_type)
@@ -172,57 +167,23 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
                             gpointer      download_)
 {
   GdkTexture *texture = GDK_TEXTURE (self);
-  GdkMemoryFormat format;
   gsize expected_stride;
   Download *download = download_;
   GLenum gl_internal_format, gl_format, gl_type;
-  GLint gl_swizzle[4];
   int major, minor;
 
-  format = gdk_texture_get_format (texture),
   expected_stride = texture->width * gdk_memory_format_bytes_per_pixel (download->format);
   gdk_gl_context_get_version (context, &major, &minor);
 
-  if (!gdk_gl_context_get_use_es (context) &&
-      gdk_memory_format_gl_format (format,
-                                   FALSE,
-                                   major, minor,
-                                   &gl_internal_format,
-                                   &gl_format, &gl_type, &gl_swizzle))
+  if (download->stride == expected_stride &&
+      !gdk_gl_context_get_use_es (context) &&
+      gdk_memory_format_gl_format (download->format, TRUE, major, minor, &gl_internal_format, &gl_format, &gl_type))
     {
-      if (download->stride == expected_stride &&
-          download->format == format)
-        {
-          glGetTexImage (GL_TEXTURE_2D,
-                         0,
-                         gl_format,
-                         gl_type,
-                         download->data);
-        }
-      else
-        {
-          gsize stride = texture->width * gdk_memory_format_bytes_per_pixel (format);
-          guchar *pixels = g_malloc_n (stride, texture->height);
-
-          glPixelStorei (GL_PACK_ALIGNMENT, 1);
-          glGetTexImage (GL_TEXTURE_2D,
-                         0,
-                         gl_format,
-                         gl_type,
-                         pixels);
-
-          gdk_memory_convert (download->data,
-                              download->stride,
-                              download->format,
-                              pixels,
-                              stride,
-                              format,
-                              texture->width,
-                              texture->height);
-
-          g_free (pixels);
-
-        }
+      glGetTexImage (GL_TEXTURE_2D,
+                     0,
+                     gl_format,
+                     gl_type,
+                     download->data);
     }
   else
     {
@@ -235,26 +196,17 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
       glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, self->id, 0);
       if (gdk_gl_context_check_version (context, "4.3", "3.1"))
         {
+          gdk_gl_context_get_version (context, &major, &minor);
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_FORMAT, &gl_read_format);
           glGetFramebufferParameteriv (GL_FRAMEBUFFER, GL_IMPLEMENTATION_COLOR_READ_TYPE, &gl_read_type);
-          if (!gdk_gl_texture_find_format (TRUE, major, minor, gdk_memory_format_alpha (format), gl_read_format, gl_read_type, &actual_format))
-            {
-              gl_read_format = GL_RGBA;
-              gl_read_type = GL_UNSIGNED_BYTE;
-              if (gdk_memory_format_alpha (format) == GDK_MEMORY_ALPHA_PREMULTIPLIED)
-                actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
-              else
-                actual_format = GDK_MEMORY_R8G8B8A8;
-            }
+          if (!gdk_gl_texture_find_format (gdk_gl_context_get_use_es (context), major, minor, gl_read_format, gl_read_type, &actual_format))
+            actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
         }
       else
         {
           gl_read_format = GL_RGBA;
           gl_read_type = GL_UNSIGNED_BYTE;
-          if (gdk_memory_format_alpha (format) == GDK_MEMORY_ALPHA_PREMULTIPLIED)
-            actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED; /* pray */
-          else
-            actual_format = GDK_MEMORY_R8G8B8A8;
+          actual_format = GDK_MEMORY_R8G8B8A8_PREMULTIPLIED;
         }
 
       if (download->format == actual_format &&
@@ -269,95 +221,19 @@ gdk_gl_texture_do_download (GdkGLTexture *self,
       else
         {
           gsize actual_bpp = gdk_memory_format_bytes_per_pixel (actual_format);
-          gsize stride = actual_bpp * texture->width;
-          guchar *pixels = g_malloc_n (stride, texture->height);
+          guchar *pixels = g_malloc_n (texture->width * actual_bpp, texture->height);
 
-          glPixelStorei (GL_PACK_ALIGNMENT, 1);
           glReadPixels (0, 0,
                         texture->width, texture->height,
                         gl_read_format,
                         gl_read_type,
                         pixels);
 
-          /* Fix up gles inadequacies */
-
-          if (gl_read_format == GL_RGBA &&
-              gl_read_type == GL_UNSIGNED_BYTE &&
-              (format == GDK_MEMORY_G8A8 ||
-               format == GDK_MEMORY_G8A8_PREMULTIPLIED ||
-               format == GDK_MEMORY_G8 ||
-               format == GDK_MEMORY_A8))
-            {
-              for (unsigned int y = 0; y < texture->height; y++)
-                {
-                  for (unsigned int x = 0; x < texture->width; x++)
-                    {
-                      guchar *data = &pixels[y * stride + x * actual_bpp];
-                      if (format == GDK_MEMORY_G8A8 ||
-                          format == GDK_MEMORY_G8A8_PREMULTIPLIED)
-                        {
-                          data[3] = data[1];
-                          data[1] = data[0];
-                          data[2] = data[0];
-                        }
-                      else if (format == GDK_MEMORY_G8)
-                        {
-                          data[1] = data[0];
-                          data[2] = data[0];
-                          data[3] = 0xff;
-                        }
-                      else if (format == GDK_MEMORY_A8)
-                        {
-                          data[3] = data[0];
-                          data[0] = 0;
-                          data[1] = 0;
-                          data[2] = 0;
-                        }
-                    }
-                }
-            }
-
-          if (gl_read_format == GL_RGBA &&
-              gl_read_type == GL_UNSIGNED_SHORT &&
-              (format == GDK_MEMORY_G16A16 ||
-               format == GDK_MEMORY_G16A16_PREMULTIPLIED ||
-               format == GDK_MEMORY_G16 ||
-               format == GDK_MEMORY_A16))
-            {
-              for (unsigned int y = 0; y < texture->height; y++)
-                {
-                  for (unsigned int x = 0; x < texture->width; x++)
-                    {
-                      guint16 *data = (guint16 *) &pixels[y * stride + x * actual_bpp];
-                      if (format == GDK_MEMORY_G16A16 ||
-                          format == GDK_MEMORY_G16A16_PREMULTIPLIED)
-                        {
-                          data[3] = data[1];
-                          data[1] = data[0];
-                          data[2] = data[0];
-                        }
-                      else if (format == GDK_MEMORY_G16)
-                        {
-                          data[1] = data[0];
-                          data[2] = data[0];
-                          data[3] = 0xffff;
-                        }
-                      else if (format == GDK_MEMORY_A16)
-                        {
-                          data[3] = data[0];
-                          data[0] = 0;
-                          data[1] = 0;
-                          data[2] = 0;
-                        }
-                    }
-                }
-            }
-
           gdk_memory_convert (download->data,
                               download->stride,
                               download->format,
                               pixels,
-                              stride,
+                              texture->width * actual_bpp,
                               actual_format,
                               texture->width,
                               texture->height);

gdk/gdkgltexturebuilder.c

@@ -644,18 +644,10 @@ gdk_gl_texture_builder_get_format (GdkGLTextureBuilder *self)
  * The format is the preferred format the texture data should be downloaded to. The
  * format must be supported by the GL version of [property@Gdk.GLTextureBuilder:context].
  *
- * GDK's texture download code assumes that the format corresponds to the storage
- * parameters of the GL texture in an obvious way. For example, a format of
- * `GDK_MEMORY_R16G16B16A16_PREMULTIPLIED` is expected to be stored as `GL_RGBA16`
- * texture, and `GDK_MEMORY_G8A8` is expected to be stored as `GL_RG8` texture.
- *
  * Setting the right format is particularly useful when using high bit depth textures
  * to preserve the bit depth, to set the correct value for unpremultiplied textures
  * and to make sure opaque textures are treated as such.
  *
- * Non-RGBA textures need to have swizzling parameters set up properly to be usable
- * in GSK's shaders.
- *
  * Since: 4.12
  */
 void

gdk/gdkmemoryformat.c

@@ -60,36 +60,6 @@ name ## _from_float (guchar      *dest_data, \
     } \
 }
 
-#define TYPED_GRAY_FUNCS(name, T, G, A, bpp, scale) \
-static void \
-name ## _to_float (float        *dest, \
-                   const guchar *src_data, \
-                   gsize         n) \
-{ \
-  for (gsize i = 0; i < n; i++) \
-    { \
-      T *src = (T *) (src_data + i * bpp); \
-      if (A >= 0) dest[3] = (float) src[A] / scale; else dest[3] = 1.0; \
-      if (G >= 0) dest[0] = (float) src[G] / scale; else dest[0] = dest[3]; \
-      dest[1] = dest[2] = dest[0]; \
-      dest += 4; \
-    } \
-} \
-\
-static void \
-name ## _from_float (guchar      *dest_data, \
-                     const float *src, \
-                     gsize        n) \
-{ \
-  for (gsize i = 0; i < n; i++) \
-    { \
-      T *dest = (T *) (dest_data + i * bpp); \
-      if (G >= 0) dest[G] = CLAMP ((src[0] + src[1] + src[2]) * scale / 3.f + 0.5, 0, scale); \
-      if (A >= 0) dest[A] = CLAMP (src[3] * scale + 0.5, 0, scale); \
-      src += 4; \
-    } \
-}
-
 TYPED_FUNCS (b8g8r8a8_premultiplied, guchar, 2, 1, 0, 3, 4, 255)
 TYPED_FUNCS (a8r8g8b8_premultiplied, guchar, 1, 2, 3, 0, 4, 255)
 TYPED_FUNCS (r8g8b8a8_premultiplied, guchar, 0, 1, 2, 3, 4, 255)
@@ -102,15 +72,6 @@ TYPED_FUNCS (b8g8r8, guchar, 2, 1, 0, -1, 3, 255)
 TYPED_FUNCS (r16g16b16, guint16, 0, 1, 2, -1, 6, 65535)
 TYPED_FUNCS (r16g16b16a16, guint16, 0, 1, 2, 3, 8, 65535)
 
-TYPED_GRAY_FUNCS (g8a8_premultiplied, guchar, 0, 1, 2, 255)
-TYPED_GRAY_FUNCS (g8a8, guchar, 0, 1, 2, 255)
-TYPED_GRAY_FUNCS (g8, guchar, 0, -1, 1, 255)
-TYPED_GRAY_FUNCS (a8, guchar, -1, 0, 1, 255)
-TYPED_GRAY_FUNCS (g16a16_premultiplied, guint16, 0, 1, 4, 65535)
-TYPED_GRAY_FUNCS (g16a16, guint16, 0, 1, 4, 65535)
-TYPED_GRAY_FUNCS (g16, guint16, 0, -1, 2, 65535)
-TYPED_GRAY_FUNCS (a16, guint16, -1, 0, 2, 65535)
-
 static void
 r16g16b16_float_to_float (float        *dest,
                           const guchar *src_data,
@@ -156,37 +117,6 @@ r16g16b16a16_float_from_float (guchar      *dest,
   float_to_half (src, (guint16 *) dest, 4 * n);
 }
 
-static void
-a16_float_to_float (float        *dest,
-                    const guchar *src_data,
-                    gsize         n)
-{
-  const guint16 *src = (const guint16 *) src_data;
-  for (gsize i = 0; i < n; i++)
-    {
-      half_to_float (src, dest, 1);
-      dest[1] = dest[0];
-      dest[2] = dest[0];
-      dest[3] = dest[0];
-      src++;
-      dest += 4;
-    }
-}
-
-static void
-a16_float_from_float (guchar      *dest_data,
-                      const float *src,
-                      gsize        n)
-{
-  guint16 *dest = (guint16 *) dest_data;
-  for (gsize i = 0; i < n; i++)
-    {
-      float_to_half (&src[3], dest, 1);
-      dest ++;
-      src += 4;
-    }
-}
-
 static void
 r32g32b32_float_to_float (float        *dest,
                           const guchar *src_data,
@@ -236,37 +166,6 @@ r32g32b32a32_float_from_float (guchar      *dest,
   memcpy (dest, src, sizeof (float) * n * 4);
 }
 
-static void
-a32_float_to_float (float        *dest,
-                    const guchar *src_data,
-                    gsize         n)
-{
-  const float *src = (const float *) src_data;
-  for (gsize i = 0; i < n; i++)
-    {
-      dest[0] = src[0];
-      dest[1] = src[0];
-      dest[2] = src[0];
-      dest[3] = src[0];
-      src++;
-      dest += 4;
-    }
-}
-
-static void
-a32_float_from_float (guchar      *dest_data,
-                      const float *src,
-                      gsize        n)
-{
-  float *dest = (float *) dest_data;
-  for (gsize i = 0; i < n; i++)
-    {
-      dest[0] = src[3];
-      dest ++;
-      src += 4;
-    }
-}
-
 #define PREMULTIPLY_FUNC(name, R1, G1, B1, A1, R2, G2, B2, A2) \
 static void \
 name (guchar *dest, \
@@ -320,7 +219,7 @@ struct _GdkMemoryFormatDescription
   GdkMemoryAlpha alpha;
   gsize bytes_per_pixel;
   gsize alignment;
-  GdkMemoryDepth depth;
+  gboolean prefers_high_depth;
   struct {
     guint gl_major;
     guint gl_minor;
@@ -331,7 +230,6 @@ struct _GdkMemoryFormatDescription
     guint internal_format;
     guint format;
     guint type;
-    GLint swizzle[4];
   } gl;
   /* no premultiplication going on here */
   void (* to_float) (float *, const guchar*, gsize);
@@ -346,14 +244,14 @@ struct _GdkMemoryFormatDescription
 #  error "Define the right GL flags here"
 #endif
 
-static const GdkMemoryFormatDescription memory_formats[] = {
+static const GdkMemoryFormatDescription memory_formats[GDK_MEMORY_N_FORMATS] = {
   [GDK_MEMORY_B8G8R8A8_PREMULTIPLIED] = {
     GDK_MEMORY_ALPHA_PREMULTIPLIED,
     4,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE },
     b8g8r8a8_premultiplied_to_float,
     b8g8r8a8_premultiplied_from_float,
   },
@@ -361,9 +259,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_PREMULTIPLIED,
     4,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED },
     a8r8g8b8_premultiplied_to_float,
     a8r8g8b8_premultiplied_from_float,
   },
@@ -371,9 +269,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_PREMULTIPLIED,
     4,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, 0, 0 },
-    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE },
     r8g8b8a8_premultiplied_to_float,
     r8g8b8a8_premultiplied_from_float,
   },
@@ -381,9 +279,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_STRAIGHT,
     4,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_BGRA, GL_UNSIGNED_BYTE },
     b8g8r8a8_to_float,
     b8g8r8a8_from_float,
   },
@@ -391,9 +289,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_STRAIGHT,
     4,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_RGBA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_RGBA, GDK_GL_UNSIGNED_BYTE_FLIPPED },
     a8r8g8b8_to_float,
     a8r8g8b8_from_float,
   },
@@ -401,9 +299,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_STRAIGHT,
     4,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, 0, 0 },
-    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE },
     r8g8b8a8_to_float,
     r8g8b8a8_from_float,
   },
@@ -411,9 +309,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_STRAIGHT,
     4,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA8, GL_BGRA, GDK_GL_UNSIGNED_BYTE_FLIPPED },
     a8b8g8r8_to_float,
     a8b8g8r8_from_float,
   },
@@ -421,9 +319,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_OPAQUE,
     3,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, 0, 0 },
-    { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB8, GL_RGB, GL_UNSIGNED_BYTE },
     r8g8b8_to_float,
     r8g8b8_from_float,
   },
@@ -431,9 +329,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_OPAQUE,
     3,
     G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
+    FALSE,
     { 0, 0, G_MAXUINT, G_MAXUINT },
-    { GL_RGB8, GL_BGR, GL_UNSIGNED_BYTE, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB8, GL_BGR, GL_UNSIGNED_BYTE },
     b8g8r8_to_float,
     b8g8r8_from_float,
   },
@@ -441,9 +339,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_OPAQUE,
     6,
     G_ALIGNOF (guint16),
-    GDK_MEMORY_U16,
+    TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGB16, GL_RGB, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB16, GL_RGB, GL_UNSIGNED_SHORT },
     r16g16b16_to_float,
     r16g16b16_from_float,
   },
@@ -451,9 +349,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_PREMULTIPLIED,
     8,
     G_ALIGNOF (guint16),
-    GDK_MEMORY_U16,
+    TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT },
     r16g16b16a16_to_float,
     r16g16b16a16_from_float,
   },
@@ -461,9 +359,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_STRAIGHT,
     8,
     G_ALIGNOF (guint16),
-    GDK_MEMORY_U16,
+    TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA16, GL_RGBA, GL_UNSIGNED_SHORT },
     r16g16b16a16_to_float,
     r16g16b16a16_from_float,
   },
@@ -471,9 +369,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_OPAQUE,
     6,
     G_ALIGNOF (guint16),
-    GDK_MEMORY_FLOAT16,
+    TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGB16F, GL_RGB, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB16F, GL_RGB, GL_HALF_FLOAT },
     r16g16b16_float_to_float,
     r16g16b16_float_from_float,
   },
@@ -481,9 +379,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_PREMULTIPLIED,
     8,
     G_ALIGNOF (guint16),
-    GDK_MEMORY_FLOAT16,
+    TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT },
     r16g16b16a16_float_to_float,
     r16g16b16a16_float_from_float,
   },
@@ -491,9 +389,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_STRAIGHT,
     8,
     G_ALIGNOF (guint16),
-    GDK_MEMORY_FLOAT16,
+    TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT },
     r16g16b16a16_float_to_float,
     r16g16b16a16_float_from_float,
   },
@@ -501,9 +399,9 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_OPAQUE,
     12,
     G_ALIGNOF (float),
-    GDK_MEMORY_FLOAT32,
+    TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGB32F, GL_RGB, GL_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ONE } },
+    { GL_RGB32F, GL_RGB, GL_FLOAT },
     r32g32b32_float_to_float,
     r32g32b32_float_from_float,
   },
@@ -513,7 +411,7 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     G_ALIGNOF (float),
     TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA32F, GL_RGBA, GL_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA32F, GL_RGBA, GL_FLOAT },
     r32g32b32a32_float_to_float,
     r32g32b32a32_float_from_float,
   },
@@ -521,117 +419,14 @@ static const GdkMemoryFormatDescription memory_formats[] = {
     GDK_MEMORY_ALPHA_STRAIGHT,
     16,
     G_ALIGNOF (float),
-    GDK_MEMORY_FLOAT32,
+    TRUE,
     { 0, 0, 3, 0 },
-    { GL_RGBA32F, GL_RGBA, GL_FLOAT, { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA } },
+    { GL_RGBA32F, GL_RGBA, GL_FLOAT },
     r32g32b32a32_float_to_float,
     r32g32b32a32_float_from_float,
-  },
-  [GDK_MEMORY_G8A8_PREMULTIPLIED] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    2,
-    G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
-    { 0, 0, 3, 0 },
-    { GL_RG8, GL_RG, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
-    g8a8_premultiplied_to_float,
-    g8a8_premultiplied_from_float,
-  },
-  [GDK_MEMORY_G8A8] = {
-    GDK_MEMORY_ALPHA_STRAIGHT,
-    2,
-    G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
-    { 0, 0, 3, 0 },
-    { GL_RG8, GL_RG, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
-    g8a8_to_float,
-    g8a8_from_float,
-  },
-  [GDK_MEMORY_G8] = {
-    GDK_MEMORY_ALPHA_OPAQUE,
-    1,
-    G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
-    { 0, 0, 3, 0 },
-    { GL_R8, GL_RED, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_ONE } },
-    g8_to_float,
-    g8_from_float,
-  },
-  [GDK_MEMORY_G16A16_PREMULTIPLIED] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    4,
-    G_ALIGNOF (guint16),
-    GDK_MEMORY_U16,
-    { 0, 0, 3, 0 },
-    { GL_RG16, GL_RG, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
-    g16a16_premultiplied_to_float,
-    g16a16_premultiplied_from_float,
-  },
-  [GDK_MEMORY_G16A16] = {
-    GDK_MEMORY_ALPHA_STRAIGHT,
-    4,
-    G_ALIGNOF (guint16),
-    GDK_MEMORY_U16,
-    { 0, 0, 3, 0 },
-    { GL_RG16, GL_RG, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_GREEN } },
-    g16a16_to_float,
-    g16a16_from_float,
-  },
-  [GDK_MEMORY_G16] = {
-    GDK_MEMORY_ALPHA_OPAQUE,
-    2,
-    G_ALIGNOF (guint16),
-    GDK_MEMORY_U16,
-    { 0, 0, 3, 0 },
-    { GL_R16, GL_RED, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_ONE } },
-    g16_to_float,
-    g16_from_float,
-  },
-  [GDK_MEMORY_A8] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    1,
-    G_ALIGNOF (guchar),
-    GDK_MEMORY_U8,
-    { 0, 0, 3, 0 },
-    { GL_R8, GL_RED, GL_UNSIGNED_BYTE, { GL_RED, GL_RED, GL_RED, GL_RED } },
-    a8_to_float,
-    a8_from_float,
-  },
-  [GDK_MEMORY_A16] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    2,
-    G_ALIGNOF (guint16),
-    GDK_MEMORY_U16,
-    { 0, 0, 3, 0 },
-    { GL_R16, GL_RED, GL_UNSIGNED_SHORT, { GL_RED, GL_RED, GL_RED, GL_RED } },
-    a16_to_float,
-    a16_from_float,
-  },
-  [GDK_MEMORY_A16_FLOAT] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    2,
-    G_ALIGNOF (guint16),
-    GDK_MEMORY_FLOAT16,
-    { 0, 0, 3, 0 },
-    { GL_R16F, GL_RED, GL_HALF_FLOAT, { GL_RED, GL_RED, GL_RED, GL_RED } },
-    a16_float_to_float,
-    a16_float_from_float,
-  },
-  [GDK_MEMORY_A32_FLOAT] = {
-    GDK_MEMORY_ALPHA_PREMULTIPLIED,
-    4,
-    G_ALIGNOF (float),
-    GDK_MEMORY_FLOAT32,
-    { 0, 0, 3, 0 },
-    { GL_R32F, GL_RED, GL_FLOAT, { GL_RED, GL_RED, GL_RED, GL_RED } },
-    a32_float_to_float,
-    a32_float_from_float,
   }
 };
 
-/* if this fails, somebody forgot to add formats above */
-G_STATIC_ASSERT (G_N_ELEMENTS (memory_formats) == GDK_MEMORY_N_FORMATS);
-
 gsize
 gdk_memory_format_bytes_per_pixel (GdkMemoryFormat format)
 {
@@ -651,84 +446,23 @@ gdk_memory_format_alignment (GdkMemoryFormat format)
 }
 
 /*<private>
- * gdk_memory_format_get_depth:
+ * gdk_memory_format_prefers_high_depth:
  * @format: a memory format
  *
- * Gets the depth of the individual channels of the format.
- * See gsk_render_node_prefers_high_depth() for more
- * information on this.
+ * Checks if the given format benefits from being rendered
+ * in bit depths higher than 8bits per pixel. See
+ * gsk_render_node_prefers_high_depth() for more information
+ * on this.
+ * Usually this is the case when
+ * gdk_memory_format_bytes_per_pixel() is larger than 4.
  *
- * Usually renderers want to use higher depth for render
- * targets to match these formats.
- *
- * Returns: The depth of this format
+ * Returns: %TRUE if the format benefits from being
+ *     composited in hgiher bit depths.
  **/
-GdkMemoryDepth
-gdk_memory_format_get_depth (GdkMemoryFormat format)
+gboolean
+gdk_memory_format_prefers_high_depth (GdkMemoryFormat format)
 {
-  return memory_formats[format].depth;
-}
-
-/*<private>
- * gdk_memory_depth_merge:
- * @depth1: the first depth
- * @depth2: the second depth
- *
- * Returns a depth that can accomodate both given depths
- * without any loss of precision.
- *
- * Returns: The merged depth
- **/
-GdkMemoryDepth
-gdk_memory_depth_merge (GdkMemoryDepth depth1,
-                        GdkMemoryDepth depth2)
-{
-  switch (depth1)
-    {
-      case GDK_MEMORY_U8:
-        return depth2;
-
-      case GDK_MEMORY_FLOAT32:
-        return GDK_MEMORY_FLOAT32;
-
-      case GDK_MEMORY_U16:
-      case GDK_MEMORY_FLOAT16:
-        if (depth2 == depth1 || depth2 == GDK_MEMORY_U8)
-          return depth1;
-        else
-          return GDK_MEMORY_FLOAT32;
-
-      default:
-        g_assert_not_reached ();
-        return GDK_MEMORY_U8;
-    }
-}
-
-/*
- * gdk_memory_depth_get_alpha_format:
- * @depth: the depth
- *
- * Gets the preferred format to use for rendering masks and other
- * alpha-only content.
- *
- * Returns: the format
- **/
-GdkMemoryFormat
-gdk_memory_depth_get_alpha_format (GdkMemoryDepth depth)
-{
-  switch (depth)
-    {
-      case GDK_MEMORY_U8:
-        return GDK_MEMORY_A8;
-      case GDK_MEMORY_U16:
-        return GDK_MEMORY_A16;
-      case GDK_MEMORY_FLOAT16:
-        return GDK_MEMORY_A16_FLOAT;
-      case GDK_MEMORY_FLOAT32:
-        return GDK_MEMORY_A32_FLOAT;
-      default:
-        g_return_val_if_reached (GDK_MEMORY_A8);
-    }
+  return memory_formats[format].prefers_high_depth;
 }
 
 gboolean
@@ -738,13 +472,14 @@ gdk_memory_format_gl_format (GdkMemoryFormat  format,
                              guint            gl_minor,
                              guint           *out_internal_format,
                              guint           *out_format,
-                             guint           *out_type,
-                             GLint          (*out_swizzle)[4])
+                             guint           *out_type)
 {
   *out_internal_format = memory_formats[format].gl.internal_format;
   *out_format = memory_formats[format].gl.format;
   *out_type = memory_formats[format].gl.type;
-  memcpy (out_swizzle, &memory_formats[format].gl.swizzle, sizeof(GLint) * 4);
+
+  if (memory_formats[format].alpha == GDK_MEMORY_ALPHA_STRAIGHT)
+    return FALSE;
 
   if (gles)
     {
@@ -812,26 +547,6 @@ gdk_memory_convert (guchar              *dest_data,
   g_assert (dest_format < GDK_MEMORY_N_FORMATS);
   g_assert (src_format < GDK_MEMORY_N_FORMATS);
 
-  if (src_format == dest_format)
-    {
-      gsize bytes_per_row = src_desc->bytes_per_pixel * width;
-
-      if (bytes_per_row == src_stride && bytes_per_row == dest_stride)
-        {
-          memcpy (dest_data, src_data, bytes_per_row * height);
-        }
-      else
-        {
-          for (y = 0; y < height; y++)
-            {
-              memcpy (dest_data, src_data, bytes_per_row);
-              src_data += src_stride;
-              dest_data += dest_stride;
-            }
-        }
-      return;
-    }
-
   if (src_format == GDK_MEMORY_R8G8B8A8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)
     func = r8g8b8a8_to_r8g8b8a8_premultiplied;
   else if (src_format == GDK_MEMORY_B8G8R8A8 && dest_format == GDK_MEMORY_R8G8B8A8_PREMULTIPLIED)

gdk/gdkmemoryformatprivate.h

@@ -21,8 +21,6 @@
 
 #include "gdkenums.h"
 
-#include <epoxy/gl.h>
-
 G_BEGIN_DECLS
 
 typedef enum {
@@ -31,28 +29,17 @@ typedef enum {
   GDK_MEMORY_ALPHA_OPAQUE
 } GdkMemoryAlpha;
 
-typedef enum {
-  GDK_MEMORY_U8,
-  GDK_MEMORY_U16,
-  GDK_MEMORY_FLOAT16,
-  GDK_MEMORY_FLOAT32
-} GdkMemoryDepth;
-
 gsize                   gdk_memory_format_alignment         (GdkMemoryFormat             format) G_GNUC_CONST;
 GdkMemoryAlpha          gdk_memory_format_alpha             (GdkMemoryFormat             format) G_GNUC_CONST;
 gsize                   gdk_memory_format_bytes_per_pixel   (GdkMemoryFormat             format) G_GNUC_CONST;
-GdkMemoryDepth          gdk_memory_format_get_depth         (GdkMemoryFormat             format) G_GNUC_CONST;
-GdkMemoryDepth          gdk_memory_depth_merge              (GdkMemoryDepth              depth1,
-                                                             GdkMemoryDepth              depth2) G_GNUC_CONST;
-GdkMemoryFormat         gdk_memory_depth_get_alpha_format   (GdkMemoryDepth              depth) G_GNUC_CONST;
+gboolean                gdk_memory_format_prefers_high_depth(GdkMemoryFormat             format) G_GNUC_CONST;
 gboolean                gdk_memory_format_gl_format         (GdkMemoryFormat             format,
                                                              gboolean                    gles,
                                                              guint                       gl_major,
                                                              guint                       gl_minor,
                                                              guint                      *out_internal_format,
                                                              guint                      *out_format,
-                                                             guint                      *out_type,
-                                                             GLint                     (*out_gizzle)[4]);
+                                                             guint                      *out_type);
 
 void                    gdk_memory_convert                  (guchar                     *dest_data,
                                                              gsize                       dest_stride,

gdk/gdkmemorytexture.c

@@ -151,8 +151,6 @@ gdk_memory_texture_new (int              width,
   g_return_val_if_fail (height > 0, NULL);
   g_return_val_if_fail (bytes != NULL, NULL);
   g_return_val_if_fail (stride >= width * gdk_memory_format_bytes_per_pixel (format), NULL);
-  /* needs to be this complex to support subtexture of the bottom right part */
-  g_return_val_if_fail (g_bytes_get_size (bytes) >= stride * (height - 1) + width * gdk_memory_format_bytes_per_pixel (format), NULL);
 
   bytes = gdk_memory_sanitize (bytes, width, height, format, stride, &stride);
 

gdk/gdkprivate.h

@@ -21,3 +21,23 @@ void gdk_source_set_static_name_by_id (guint       tag,
 #ifndef I_
 #define I_(string) g_intern_static_string (string)
 #endif
+
+#if !GLIB_CHECK_VERSION (2, 75, 1)
+static inline gboolean
+g_set_str (char       **str_pointer,
+           const char  *new_str)
+{
+  char *copy;
+
+  if (*str_pointer == new_str ||
+      (*str_pointer && new_str && strcmp (*str_pointer, new_str) == 0))
+    return FALSE;
+
+  copy = g_strdup (new_str);
+  g_free (*str_pointer);
+  *str_pointer = copy;
+
+  return TRUE;
+}
+#endif
+