Show cvNN tags in the font tweak section

These are more suitable for this than ssNN, since
they are meant for global character replacements.

.gitlab-ci.yml

@@ -1,7 +1,6 @@
 stages:
   - build
   - flatpak
-  - deploy
 
 .cache-paths: &cache-paths
   paths:
@@ -62,21 +61,3 @@ flatpak:widget-factory:
   variables:
     APPID: org.gtk.WidgetFactory
   <<: *flatpak-defaults
-
-pages:
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v1
-  stage: deploy 
-  script:
-    - meson -Ddocumentation=true _build .
-    - ninja -C _build
-    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-
-    - mkdir -p public/
-    - mv _build/docs/reference/gtk/html/ public/gtk/
-    - mv _build/docs/reference/gdk/html/ public/gdk/
-    - mv _build/docs/reference/gsk/html/ public/gsk/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master

.gitlab-ci/Dockerfile

@@ -28,7 +28,6 @@ RUN dnf -y install \
     gstreamer1-plugins-good \
     gstreamer1-plugins-bad-free-devel \
     gstreamer1-plugins-base-devel \
-    gtk-doc \
     iso-codes \
     itstool \
     json-glib-devel \

.gitlab-ci/test-msys2.sh

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

NEWS

@@ -1,87 +1,3 @@
-Overview of Changes in GTK+ 3.94.0
-==================================
-
-* GdkPaintable is a new, powerful abstraction for drawable content.
-  gtk4-demo has a new "Paint" demo to show some of its capabilities.
-
-* There is support for displaying media, with
-  GtkVideo
-  GtkMediaFile
-  GtkMediaStream
-  GtkMediaControls
-
-* GtkFontChooser now supports OpenType font variations and features.
-
-* The Ctrl-Shift-E support in the simple IM context has been replaced
-  by an optional completion popup for Emoji alpha codes. This can be
-  enabled with the GtkEntry::enable-emoji-completion property.
-
-* Wayland has an input method based on the text protocol now
-
-* Input methods, print backends and media backends have been converted
-  to GIOModules and extension points, and support for generic loadable
-  modules has been dropped. Platform im modules are always included.
-
-* GdkWindow has been renamed to GdkSurface.
-
-* Applications can now create their own GtkSnapshot objects for
-  intermediate rendering.
-
-* Widget event signals have been replaced by event controller, and
-  some new event controllers have been introduced for this:
-  GtkEventControllerMotion
-  GtkEventControllerKey
-  GtkGestureStylus
-
-* Event controllers can now be created in .ui files.
-
-* Invalidation tracking has been changed, only gtk_widget_queue_draw is left.
-
-* Observing widget contents and size is now done by using the
-  GtkWidgetPaintable object instead of connecting to widget signals.
-
-* The GtkWidget::draw signal has been removed, widgets need
-  to implement GtkWidget::snapshot.
-
-* GdkTexture now has GdkMemoryTexture and GdkGLTexture subclasses.
-
-* The Vulkan support in GDK can now use a particular device that is
-  specified by the GDK_VULKAN_DEVICE environment variable. use
-  GDK_VULKAN_DEVICE=list to see them all.
-
-* GTK+ Inspector
-  - has logging support, and the logging settings have been cleaned up
-  - has an fps overlay
-
-* Removed APIs and features:
-  Individual event signals such as ::proximity-in-event
-  The ::draw signal
-  threading support
-  non-platform IM modules
-  papi and test print backends
-  GtkPlacesSidebar
-  GtkRecentChooser
-  GtkToolPalette
-  GdkStatus
-  gtk_true, gtk_false
-  gtk_widget_show_now
-  gtk_widget_draw
-  gtk_render_icon_surface
-
-* Translation updates:
- Croatian
- Esperanto
- Estonian
- French
- Friulian
- Icelandic
- Latvian
- Polish
- Russian
- Scottish Gaelic
- Spanish
-
-
 Overview of Changes in GTK+ 3.93.0
 ==================================
 

benchmarks/benchmark.h

@@ -1,156 +0,0 @@
-
-#ifndef __GTK_BENCHMARK_H__
-#define __GTK_BENCHMARK_H__
-
-#include <valgrind/callgrind.h>
-#include <glib.h>
-
-#define SAMPLE_SIZE 5
-
-
-typedef struct _Benchmark Benchmark;
-typedef void (*BenchmarkFunc)(Benchmark *b, gsize size, gpointer user_data);
-
-struct _Benchmark
-{
-  char *name;
-  gint64 start_time;
-  gint64 end_time;
-  gsize size;
-  BenchmarkFunc func;
-  guint profile : 1;
-  gpointer data;
-};
-
-static void
-benchmark_destroy (Benchmark *b)
-{
-  g_free (b->name);
-}
-
-static void
-benchmark_start (Benchmark *b)
-{
-  b->start_time = g_get_monotonic_time ();
-
-  if (b->profile)
-    CALLGRIND_START_INSTRUMENTATION;
-}
-
-static void
-benchmark_stop (Benchmark *b)
-{
-  if (b->profile)
-    CALLGRIND_STOP_INSTRUMENTATION;
-
-  b->end_time = g_get_monotonic_time ();
-}
-
-typedef struct
-{
-  GArray *benchmarks;
-  char *profile_benchmark_name;
-} BenchmarkSuite;
-
-static void
-benchmark_suite_init (BenchmarkSuite *bs,
-                      const char     *profile_benchmark_name)
-{
-  bs->benchmarks = g_array_new (FALSE, TRUE, sizeof (Benchmark));
-  g_array_set_clear_func (bs->benchmarks, (GDestroyNotify)benchmark_destroy);
-  bs->profile_benchmark_name = (char *)profile_benchmark_name; // XXX strdup
-
-  g_assert (SAMPLE_SIZE % 2 == 1);
-}
-
-static void
-benchmark_suite_add (BenchmarkSuite *bs,
-                     const char     *benchmark_name,
-                     gsize           size,
-                     BenchmarkFunc   benchmark_func,
-                     gpointer        user_data)
-{
-  Benchmark *b;
-
-  g_array_set_size (bs->benchmarks, bs->benchmarks->len + 1);
-  b = &g_array_index (bs->benchmarks, Benchmark, bs->benchmarks->len - 1);
-
-  b->name = (char *)benchmark_name; /* XXX strdup? */
-  b->size = size;
-  b->func = benchmark_func;
-  b->data = user_data;
-}
-
-static int
-benchmark_suite_run (BenchmarkSuite *bs)
-{
-  const guint n_benchmarks = bs->benchmarks->len;
-  const gboolean profile = bs->profile_benchmark_name != NULL;
-  guint i;
-
-  if (profile)
-    {
-      /* For profiling, we only run the selected benchmark. */
-      gboolean found = FALSE;
-
-
-      for (i = 0; i < n_benchmarks; i ++)
-        {
-          Benchmark *b = &g_array_index (bs->benchmarks, Benchmark, i);
-
-          if (strcmp (bs->profile_benchmark_name, b->name) == 0)
-            {
-              b->profile = TRUE;
-              b->func (b, b->size, b->data);
-              found = TRUE;
-              break;
-            }
-        }
-
-      if (!found)
-        g_error ("No benchmark '%s' found", bs->profile_benchmark_name);
-    }
-  else
-    {
-      for (i = 0; i < n_benchmarks; i ++)
-        {
-          gint64 samples[SAMPLE_SIZE];
-          Benchmark *b = &g_array_index (bs->benchmarks, Benchmark, i);
-          int s, x, y;
-
-          for (s = 0; s < SAMPLE_SIZE; s ++)
-            {
-              b->start_time = 0;
-              b->end_time = 0;
-
-              b->func (b, b->size, b->data);
-
-              if (b->start_time == 0)
-                g_error ("Benchmark '%s' did not call benchmark_start()", b->name);
-
-              if (b->end_time == 0)
-                g_error ("Benchmark '%s' did not call benchmark_stop()", b->name);
-
-              samples[s] = b->end_time - b->start_time;
-            }
-
-          /* Bubble sort \o/ */
-          for (x = 0; x < SAMPLE_SIZE; x ++)
-            for (y = 0; y < SAMPLE_SIZE; y ++)
-              if (samples[x] < samples[y])
-                {
-                  int k = samples[x];
-                  samples[x] = samples[y];
-                  samples[y] = k;
-                }
-
-          /* Median of SAMPLE_SIZE */
-          printf ("%s (%" G_GSIZE_FORMAT ") |  %.2fms\n", b->name, b->size,
-                  samples[SAMPLE_SIZE / 2 + 1] / 1000.0);
-        }
-    }
-
-  return 0;
-}
-
-#endif

benchmarks/containers.c

@@ -1,237 +0,0 @@
-#include <gtk/gtk.h>
-#include "benchmark.h"
-
-/* Command line options */
-const char *profile_benchmark_name = NULL;
-
-static GOptionEntry options[] = {
-  { "profile", 'p', 0, G_OPTION_ARG_STRING, &profile_benchmark_name, "Benchmark name to profile using callgrind", NULL },
-  { NULL }
-};
-
-typedef struct
-{
-  GType type;
-} ContainerData;
-
-/*
- *  PROFILING:
- *
- *  valgrind --tool=callgrind --instr-atstart=no benchmarks/name --profile="benchmark name"
- *
- *  ENJOY.
- */
-
-static void
-container_create_benchmark (Benchmark *b,
-                            gsize      size,
-                            gpointer   user_data)
-{
-  ContainerData *data = user_data;
-  guint i;
-  GtkWidget **widgets = g_malloc (sizeof (GtkWidget*) * size);
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    widgets[i] = g_object_new (data->type, NULL);
-  benchmark_stop (b);
-
-  g_free (widgets);
-}
-
-static void
-container_destroy_benchmark (Benchmark *b,
-                             gsize      size,
-                             gpointer   user_data)
-{
-  ContainerData *data = user_data;
-  guint i;
-  GtkWidget **widgets = g_malloc (sizeof (GtkWidget*) * size);
-
-  for (i = 0; i < size; i ++)
-    {
-      widgets[i] = g_object_new (data->type, NULL);
-      g_object_ref_sink (widgets[i]);
-    }
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    g_object_unref (widgets[i]);
-  benchmark_stop (b);
-
-  g_free (widgets);
-}
-
-static void
-container_add_benchmark (Benchmark *b,
-                         gsize      size,
-                         gpointer   user_data)
-{
-  ContainerData *data = user_data;
-  guint i;
-  GtkWidget *container;
-  GtkWidget **buttons = g_malloc (sizeof (GtkWidget*) * size);
-
-  for (i = 0; i < size; i ++)
-    buttons[i] = gtk_button_new ();
-
-  container = g_object_new (data->type, NULL);
-
-  benchmark_start (b);
-
-  for (i = 0; i < size; i ++)
-    gtk_container_add ((GtkContainer *)container, buttons[i]);
-
-  benchmark_stop (b);
-
-  g_free (buttons);
-}
-
-static void
-container_remove_benchmark (Benchmark *b,
-                            gsize      size,
-                            gpointer   user_data)
-{
-  ContainerData *data = user_data;
-  guint i;
-  GtkWidget *container;
-  GtkWidget **buttons = g_malloc (sizeof (GtkWidget*) * size);
-
-  for (i = 0; i < size; i ++)
-    {
-      buttons[i] = gtk_button_new ();
-      /* We add an extra ref here so the later remove() does NOT dispose the buttons. */
-      g_object_ref_sink (buttons[i]);
-      g_object_ref (buttons[i]);
-    }
-
-  container = g_object_new (data->type, NULL);
-
-  for (i = 0; i < size; i ++)
-    gtk_container_add ((GtkContainer *)container, buttons[i]);
-
-  benchmark_start (b);
-
-  for (i = 0; i < size; i ++)
-    gtk_container_remove ((GtkContainer *)container, buttons[i]);
-
-  benchmark_stop (b);
-
-  g_free (buttons);
-}
-
-static void
-container_measure_benchmark (Benchmark *b,
-                             gsize      size,
-                             gpointer   user_data)
-{
-  ContainerData *data = user_data;
-  guint i;
-  GtkWidget *container;
-  GtkWidget **buttons = g_malloc (sizeof (GtkWidget*) * size);
-
-  for (i = 0; i < size; i ++)
-    buttons[i] = gtk_button_new ();
-
-  container = g_object_new (data->type, NULL);
-
-  for (i = 0; i < size; i ++)
-    gtk_container_add ((GtkContainer *)container, buttons[i]);
-
-  benchmark_start (b);
-
-  gtk_widget_measure (container, GTK_ORIENTATION_HORIZONTAL, -1,
-                      NULL, NULL, NULL, NULL);
-
-  benchmark_stop (b);
-
-  g_free (buttons);
-}
-
-static void
-container_allocate_benchmark (Benchmark *b,
-                              gsize      size,
-                              gpointer   user_data)
-{
-  ContainerData *data = user_data;
-  guint i;
-  GtkWidget *container;
-  GtkWidget **buttons = g_malloc (sizeof (GtkWidget*) * size);
-  int width, height;
-
-  for (i = 0; i < size; i ++)
-    buttons[i] = gtk_button_new ();
-
-  container = g_object_new (data->type, NULL);
-
-  for (i = 0; i < size; i ++)
-    gtk_container_add ((GtkContainer *)container, buttons[i]);
-
-
-  gtk_widget_measure (container, GTK_ORIENTATION_HORIZONTAL, -1,
-                      &width, NULL, NULL, NULL);
-  gtk_widget_measure (container, GTK_ORIENTATION_VERTICAL, width,
-                      &height, NULL, NULL, NULL);
-
-  benchmark_start (b);
-  gtk_widget_size_allocate (container,
-                            &(GtkAllocation){0, 0, width, height},
-                            -1);
-  benchmark_stop (b);
-
-  g_free (buttons);
-}
-
-int
-main (int argc, char **argv)
-{
-  BenchmarkSuite suite;
-  GOptionContext *option_context;
-  GError *error = NULL;
-  const GType types[] = {
-    GTK_TYPE_BOX,
-    GTK_TYPE_GRID,
-    GTK_TYPE_STACK,
-/*    GTK_TYPE_NOTEBOOK, XXX too slow! :( */
-  };
-  int i;
-  int N = 10000;
-
-  option_context = g_option_context_new ("");
-  g_option_context_add_main_entries (option_context, options, NULL);
-  if (!g_option_context_parse (option_context, &argc, &argv, &error))
-    {
-      g_printerr ("Option parsing failed: %s\n", error->message);
-      return 1;
-    }
-
-  benchmark_suite_init (&suite, profile_benchmark_name);
-  gtk_init ();
-
-  for (i = 0; i < G_N_ELEMENTS (types); i ++)
-    {
-      ContainerData *data = g_malloc (sizeof (ContainerData));
-      data->type = types[i];
-
-      benchmark_suite_add (&suite,
-                           g_strdup_printf ("%s create", g_type_name (types[i])),
-                           N, container_create_benchmark, data);
-      benchmark_suite_add (&suite,
-                           g_strdup_printf ("%s destroy", g_type_name (types[i])),
-                           N, container_destroy_benchmark, data);
-      benchmark_suite_add (&suite,
-                           g_strdup_printf ("%s add", g_type_name (types[i])),
-                           N, container_add_benchmark, data);
-      benchmark_suite_add (&suite,
-                           g_strdup_printf ("%s remove", g_type_name (types[i])),
-                           N, container_remove_benchmark, data);
-      benchmark_suite_add (&suite,
-                           g_strdup_printf ("%s measure", g_type_name (types[i])),
-                           N, container_measure_benchmark, data);
-      benchmark_suite_add (&suite,
-                           g_strdup_printf ("%s allocate", g_type_name (types[i])),
-                           N, container_allocate_benchmark, data);
-    }
-
-  return benchmark_suite_run (&suite);
-}

benchmarks/css.c

@@ -1,77 +0,0 @@
-#include <gtk/gtk.h>
-#include "benchmark.h"
-
-/* Command line options */
-const char *profile_benchmark_name = NULL;
-static GOptionEntry options[] = {
-  { "profile", 'p', 0, G_OPTION_ARG_STRING, &profile_benchmark_name, "Benchmark name to profile using callgrind", NULL },
-  { NULL }
-};
-
-
-static void
-css_compute_benchmark (Benchmark *b,
-                       gsize      size,
-                       gpointer   user_data)
-{
-  GtkWidget **widgets = g_malloc (sizeof (GtkWidget *) * size);
-  GtkWidget *box;
-  GtkWidget *scroller;
-  GtkWidget *window;
-  GdkFrameClock *frame_clock;
-  guint i;
-
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-
-  for (i = 0; i < size; i ++)
-    {
-      widgets[i] = gtk_label_new ("foo");
-      /*widgets[i] = gtk_button_new ();*/
-      gtk_container_add (GTK_CONTAINER (box), widgets[i]);
-    }
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  scroller = gtk_scrolled_window_new (NULL, NULL);
-  gtk_container_add (GTK_CONTAINER (scroller), box);
-  gtk_container_add (GTK_CONTAINER (window), scroller);
-
-  gtk_widget_realize (window);
-  frame_clock = gtk_widget_get_frame_clock (window);
-  g_assert (frame_clock != NULL);
-
-  gtk_widget_show (window);
-  g_signal_connect (frame_clock, "layout", G_CALLBACK (gtk_main_quit), NULL);
-
-  benchmark_start (b);
-  gtk_main ();
-  benchmark_stop (b);
-
-  gtk_widget_hide (window);
-  gtk_widget_destroy (window);
-
-  g_free (widgets);
-}
-
-
-int
-main (int argc, char **argv)
-{
-  BenchmarkSuite suite;
-  GOptionContext *option_context;
-  GError *error = NULL;
-
-  option_context = g_option_context_new ("");
-  g_option_context_add_main_entries (option_context, options, NULL);
-  if (!g_option_context_parse (option_context, &argc, &argv, &error))
-    {
-      g_printerr ("Option parsing failed: %s\n", error->message);
-      return 1;
-    }
-
-  benchmark_suite_init (&suite, profile_benchmark_name);
-  gtk_init ();
-
-  benchmark_suite_add (&suite, "css compute", 10000, css_compute_benchmark, NULL);
-
-  return benchmark_suite_run (&suite);
-}

benchmarks/meson.build

@@ -1,21 +0,0 @@
-
-# benchmark name, optional extra sources
-gtk_benchmarks = [
-  ['containers'],
-  ['css'],
-  ['widget'],
-  ['renderers'],
-]
-
-foreach b : gtk_benchmarks
-  b_name = b.get(0)
-  b_sources = ['@0@.c'.format(b_name), b.get(1, [])]
-  b_exec = executable (
-    b_name,
-    b_sources,
-    include_directories: [confinc, gdkinc],
-    dependencies: [libgtk_dep, libm]
-  )
-  benchmark(b_name, b_exec)
-
-endforeach

benchmarks/renderers.c

@@ -1,275 +0,0 @@
-#include <gtk/gtk.h>
-#include "benchmark.h"
-
-/* Command line options */
-const char *profile_benchmark_name = NULL;
-static GOptionEntry options[] = {
-  { "profile", 'p', 0, G_OPTION_ARG_STRING, &profile_benchmark_name, "Benchmark name to profile using callgrind", NULL },
-  { NULL }
-};
-
-
-static void
-borders_benchmark (Benchmark *b,
-                   gsize      size,
-                   gpointer   user_data)
-{
-  GskRenderer *renderer = user_data;
-  GskRenderNode *root_node;
-  GskRenderNode **child_nodes;
-  guint i;
-
-  child_nodes = g_malloc (sizeof (GskRenderNode *) * size);
-  for (i = 0; i < size; i ++)
-    {
-      GskRoundedRect outline;
-
-      gsk_rounded_rect_init (&outline,
-                             &GRAPHENE_RECT_INIT (0, 0, 1920, 1080),
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4});
-
-      child_nodes[i] = gsk_border_node_new (&outline,
-                                            (float[4]){2, 2, 2 ,2},   /* Widths */
-                                            (GdkRGBA[4]) { /* Colors */
-                                              {1, 0, 0, 1},
-                                              {1, 0, 0, 1},
-                                              {1, 0, 0, 1},
-                                              {1, 0, 0, 1},
-                                            });
-    }
-
-  root_node = gsk_container_node_new (child_nodes, size);
-
-  for (i = 0; i < size; i ++)
-    gsk_render_node_unref (child_nodes[i]);
-
-  benchmark_start (b);
-  gsk_renderer_render_texture (renderer, root_node, NULL);
-  benchmark_stop (b);
-
-  g_free (child_nodes);
-  gsk_render_node_unref (root_node);
-}
-
-static void
-outset_shadows_unblurred_benchmark (Benchmark *b,
-                                    gsize      size,
-                                    gpointer   user_data)
-{
-  GskRenderer *renderer = user_data;
-  GskRenderNode *root_node;
-  GskRenderNode **child_nodes;
-  GdkTexture *texture;
-  guint i;
-
-  child_nodes = g_malloc (sizeof (GskRenderNode *) * size);
-  for (i = 0; i < size; i ++)
-    {
-      GskRoundedRect outline;
-
-      gsk_rounded_rect_init (&outline,
-                             &GRAPHENE_RECT_INIT (0, 0, 1920, 1080),
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4});
-
-      child_nodes[i] = gsk_outset_shadow_node_new (&outline,
-                                                   &(GdkRGBA){0, 0, 0, 1},
-                                                   0, 0, /* Offset */
-                                                   10, /* Spread */
-                                                   0); /* Blur */
-    }
-
-
-  root_node = gsk_container_node_new (child_nodes, size);
-
-  for (i = 0; i < size; i ++)
-    gsk_render_node_unref (child_nodes[i]);
-
-  benchmark_start (b);
-  texture = gsk_renderer_render_texture (renderer, root_node, NULL);
-  g_object_unref (texture);
-  benchmark_stop (b);
-
-  g_free (child_nodes);
-  gsk_render_node_unref (root_node);
-}
-
-static void
-outset_shadows_blurred_benchmark (Benchmark *b,
-                                  gsize      size,
-                                  gpointer   user_data)
-{
-  GskRenderer *renderer = user_data;
-  GskRenderNode *root_node;
-  GskRenderNode **child_nodes;
-  GdkTexture *texture;
-  guint i;
-
-  child_nodes = g_malloc (sizeof (GskRenderNode *) * size);
-  for (i = 0; i < size; i ++)
-    {
-      GskRoundedRect outline;
-
-      gsk_rounded_rect_init (&outline,
-                             &GRAPHENE_RECT_INIT (0, 0, 1920, 1080),
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4},
-                             &(graphene_size_t){4, 4});
-
-      child_nodes[i] = gsk_outset_shadow_node_new (&outline,
-                                                   &(GdkRGBA){0, 0, 0, 1},
-                                                   0, 0, /* Offset */
-                                                   10, /* Spread */
-                                                   10); /* Blur */
-    }
-
-  root_node = gsk_container_node_new (child_nodes, size);
-  for (i = 0; i < size; i ++)
-    gsk_render_node_unref (child_nodes[i]);
-
-
-  benchmark_start (b);
-  texture = gsk_renderer_render_texture (renderer, root_node, NULL);
-  g_object_unref (texture);
-  benchmark_stop (b);
-
-  g_free (child_nodes);
-  gsk_render_node_unref (root_node);
-}
-
-static void
-linear_gradient_benchmark (Benchmark *b,
-                           gsize      size,
-                           gpointer   user_data)
-{
-  GskRenderer *renderer = user_data;
-  GskRenderNode *root_node;
-  GskRenderNode **child_nodes;
-  GdkTexture *texture;
-  guint i;
-
-  child_nodes = g_malloc (sizeof (GskRenderNode *) * size);
-  for (i = 0; i < size; i ++)
-    {
-      if (i % 2 == 0)
-        child_nodes[i] = gsk_linear_gradient_node_new (&GRAPHENE_RECT_INIT (0, 0, 1920, 1080),
-                                                       &(graphene_point_t){0, 0},
-                                                       &(graphene_point_t){0, 20},
-                                                       (GskColorStop[3]) {
-                                                         {0.0, (GdkRGBA){1, 0, 0, 1}},
-                                                         {0.5, (GdkRGBA){0, 1, 0, 1}},
-                                                         {1.0, (GdkRGBA){0, 0, 1, 1}},
-                                                       }, 3);
-      else
-        child_nodes[i] = gsk_linear_gradient_node_new (&GRAPHENE_RECT_INIT (0, 0, 1920, 1080),
-                                                       &(graphene_point_t){0, 0},
-                                                       &(graphene_point_t){20, 20},
-                                                       (GskColorStop[3]) {
-                                                         {0.0, (GdkRGBA){1, 0, 0, 1}},
-                                                         {0.5, (GdkRGBA){0, 1, 1, 1}},
-                                                         {1.0, (GdkRGBA){1, 0, 1, 1}},
-                                                       }, 3);
-
-    }
-
-  root_node = gsk_container_node_new (child_nodes, size);
-  for (i = 0; i < size; i ++)
-    gsk_render_node_unref (child_nodes[i]);
-
-
-  benchmark_start (b);
-  texture = gsk_renderer_render_texture (renderer, root_node, NULL);
-  g_object_unref (texture);
-  benchmark_stop (b);
-
-  g_free (child_nodes);
-  gsk_render_node_unref (root_node);
-}
-
-int
-main (int argc, char **argv)
-{
-  BenchmarkSuite suite;
-  GOptionContext *option_context;
-  GError *error = NULL;
-  static const struct {
-    const char *type_name;
-    const char *renderer_name;
-  } renderers[] = {
-    {"GskCairoRenderer",  "cairo"},
-    {"GskGLRenderer",     "opengl"},
-#ifdef GDK_RENDERING_VULKAN
-    {"GskVulkanRenderer", "vulkan"},
-#endif
-  };
-  guint i;
-
-  option_context = g_option_context_new ("");
-  g_option_context_add_main_entries (option_context, options, NULL);
-  if (!g_option_context_parse (option_context, &argc, &argv, &error))
-    {
-      g_printerr ("Option parsing failed: %s\n", error->message);
-      return 1;
-    }
-
-  benchmark_suite_init (&suite, profile_benchmark_name);
-  gtk_init ();
-
-  for (i = 0; i < G_N_ELEMENTS (renderers); i ++)
-    {
-      GskRenderer *renderer;
-      GdkSurface *surface;
-      gsize s = 0;
-
-      g_setenv ("GSK_RENDERER", renderers[i].renderer_name, TRUE);
-
-      surface = gdk_surface_new_toplevel (gdk_display_get_default (), 10, 10);
-      renderer = gsk_renderer_new_for_surface (surface);
-
-      if (strcmp (g_type_name (G_OBJECT_TYPE (renderer)), renderers[i].type_name) != 0)
-        {
-          g_message ("%s != %s, skipping...",
-                     g_type_name (G_OBJECT_TYPE (renderer)),
-                     renderers[i].type_name);
-          continue;
-        }
-
-      for (s = 2; s < 256; s *= 2)
-        {
-          /* All the benchmarks for this renderer type */
-          benchmark_suite_add (&suite,
-                               g_strdup_printf ("%s borders", renderers[i].renderer_name),
-                               s,
-                               borders_benchmark,
-                               renderer);
-          benchmark_suite_add (&suite,
-                               g_strdup_printf ("%s outset shadows unblurred", renderers[i].renderer_name),
-                               s,
-                               outset_shadows_unblurred_benchmark,
-                               renderer);
-          benchmark_suite_add (&suite,
-                               g_strdup_printf ("%s outset shadows blurred", renderers[i].renderer_name),
-                               s,
-                               outset_shadows_blurred_benchmark,
-                               renderer);
-          benchmark_suite_add (&suite,
-                               g_strdup_printf ("%s linear gradient", renderers[i].renderer_name),
-                               s,
-                               linear_gradient_benchmark,
-                               renderer);
-        }
-
-      /* XXX We can't do this here of course since the renderers have to live until
-       * benchmark_suite_run is done. */
-      /*g_object_unref (renderer);*/
-      /*g_object_unref (surface);*/
-    }
-
-  return benchmark_suite_run (&suite);
-}

benchmarks/widget.c

@@ -1,260 +0,0 @@
-#include <gtk/gtk.h>
-#include "benchmark.h"
-
-/* Command line options */
-const char *profile_benchmark_name = NULL;
-static GOptionEntry options[] = {
-  { "profile", 'p', 0, G_OPTION_ARG_STRING, &profile_benchmark_name, "Benchmark name to profile using callgrind", NULL },
-  { NULL }
-};
-
-
-static void
-set_parent_benchmark (Benchmark *b,
-                      gsize      size,
-                      gpointer   user_data)
-{
-  guint i;
-  GtkWidget *w;
-  GtkWidget **widgets;
-
-  widgets = g_malloc (sizeof (GtkWidget *) * size);
-  w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-
-  for (i = 0; i < size; i ++)
-    {
-      widgets[i] = gtk_button_new ();
-    }
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    {
-      gtk_widget_set_parent (widgets[i], w);
-    }
-  benchmark_stop (b);
-
-
-  g_free (widgets);
-}
-
-static void
-reorder_benchmark (Benchmark *b,
-                   gsize      size,
-                   gpointer   user_data)
-{
-  guint i;
-  GtkWidget *w;
-  GtkWidget **widgets;
-
-  widgets = g_malloc (sizeof (GtkWidget *) * size);
-  w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-
-  for (i = 0; i < size; i ++)
-    {
-      widgets[i] = gtk_button_new ();
-      gtk_widget_set_parent (widgets[i], w);
-    }
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    {
-      /* Move this child to the very end */
-      gtk_widget_insert_before (widgets[i], w, NULL);
-    }
-  benchmark_stop (b);
-
-  g_free (widgets);
-}
-
-static void
-get_size_benchmark (Benchmark *b,
-                    gsize      size,
-                    gpointer   user_data)
-{
-  guint i;
-  GtkWidget *w;
-  int width, height;
-  int button_width;
-  int button_height;
-
-  w = gtk_button_new ();
-
-  gtk_widget_measure (w, GTK_ORIENTATION_HORIZONTAL, -1, &width, NULL, NULL, NULL);
-  gtk_widget_measure (w, GTK_ORIENTATION_VERTICAL, width, &height, NULL, NULL, NULL);
-
-  button_width = 200 + width;
-  button_height = 300 + height;
-
-  gtk_widget_size_allocate (w,
-                            &(GtkAllocation){0, 0, button_width, button_height}, -1);
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    {
-      width = gtk_widget_get_width (w);
-      height = gtk_widget_get_height (w);
-    }
-  benchmark_stop (b);
-
-  g_assert_cmpint (width, <=, button_width);
-  g_assert_cmpint (height, <=, button_height);
-}
-
-
-static void
-compute_bounds_benchmark (Benchmark *b,
-                          gsize      size,
-                          gpointer   user_data)
-{
-  guint i;
-  GtkWidget *w;
-  int width, height;
-  int button_width;
-  int button_height;
-
-  w = gtk_button_new ();
-
-  gtk_widget_measure (w, GTK_ORIENTATION_HORIZONTAL, -1, &width, NULL, NULL, NULL);
-  gtk_widget_measure (w, GTK_ORIENTATION_VERTICAL, width, &height, NULL, NULL, NULL);
-
-  button_width = 200 + width;
-  button_height = 300 + height;
-
-  gtk_widget_size_allocate (w,
-                            &(GtkAllocation){0, 0, button_width, button_height}, -1);
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    {
-      graphene_rect_t r;
-
-      gtk_widget_compute_bounds (w, w, &r);
-    }
-  benchmark_stop (b);
-}
-
-static void
-translate_coords_benchmark (Benchmark *b,
-                            gsize      size,
-                            gpointer   user_data)
-{
-  guint i;
-  GtkWidget *root;
-  GtkWidget *widget_a;
-  GtkWidget *widget_b;
-  GtkWidget *iter;
-  int x = 0;
-  int y = 0;
-
-  /* Create an unbalanced widget tree with depth @size on one side and
-   * depth 1 on the other. */
-
-  root = gtk_button_new ();
-  widget_a = gtk_button_new ();
-  widget_b = gtk_button_new ();
-
-  iter = root;
-  for (i = 0; i < size; i ++)
-    {
-      GtkWidget *w = gtk_button_new ();
-
-      gtk_widget_set_parent (w, iter);
-      iter = w;
-    }
-
-  gtk_widget_set_parent (widget_a, root);
-  gtk_widget_set_parent (widget_b, iter);
-
-  /* This will create all the CSS styles, which is the actual slow part... */
-  gtk_widget_translate_coordinates (widget_a, widget_b, x, y, &x, &y);
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    {
-      x = 0;
-      y = 0;
-
-      gtk_widget_translate_coordinates (widget_a, widget_b, x, y, &x, &y);
-    }
-  benchmark_stop (b);
-}
-
-static void
-measure_benchmark (Benchmark *b,
-                   gsize      size,
-                   gpointer   user_data)
-{
-  guint i;
-  GtkWidget *root;
-  int min;
-
-  /* Create an unbalanced widget tree with depth @size on one side and
-   * depth 1 on the other. */
-
-  root = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-
-  for (i = 0; i < size; i ++)
-    {
-      GtkWidget *w = gtk_button_new ();
-
-      gtk_container_add (GTK_CONTAINER (root), w);
-    }
-
-  gtk_widget_measure (root, GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL);
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    {
-      gtk_widget_measure (root, GTK_ORIENTATION_HORIZONTAL, min + i, &min, NULL, NULL, NULL);
-    }
-  benchmark_stop (b);
-}
-
-static void
-templates_benchmark (Benchmark *b,
-                     gsize      size,
-                     gpointer   user_data)
-{
-  guint i;
-  GtkWidget **widgets = g_malloc (sizeof (GtkWidget *)  * size);
-
-  /* Just load some widget using composite templates a bunch of times. */
-
-  benchmark_start (b);
-  for (i = 0; i < size; i ++)
-    {
-      widgets[i] = gtk_info_bar_new ();
-    }
-  benchmark_stop (b);
-
-  g_free (widgets);
-}
-
-int
-main (int argc, char **argv)
-{
-  BenchmarkSuite suite;
-  GOptionContext *option_context;
-  GError *error = NULL;
-
-  option_context = g_option_context_new ("");
-  g_option_context_add_main_entries (option_context, options, NULL);
-  if (!g_option_context_parse (option_context, &argc, &argv, &error))
-    {
-      g_printerr ("Option parsing failed: %s\n", error->message);
-      return 1;
-    }
-
-  benchmark_suite_init (&suite, profile_benchmark_name);
-  gtk_init ();
-
-  benchmark_suite_add (&suite, "set_parent", 10000, set_parent_benchmark, NULL);
-  benchmark_suite_add (&suite, "reorder", 10000, reorder_benchmark, NULL);
-  benchmark_suite_add (&suite, "get_size", 10000, get_size_benchmark, NULL);
-  benchmark_suite_add (&suite, "compute_bounds", 10000, compute_bounds_benchmark, NULL);
-  benchmark_suite_add (&suite, "translate_coords", 1000, translate_coords_benchmark, NULL);
-  benchmark_suite_add (&suite, "measure", 10000, measure_benchmark, NULL);
-  benchmark_suite_add (&suite, "templates", 10000, templates_benchmark, NULL);
-
-  return benchmark_suite_run (&suite);
-}

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

@@ -46,9 +46,7 @@
             "buildsystem": "meson",
             "builddir": true,
             "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
+                "--libdir=/app/lib"
             ],
             "sources": [
                 {

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

@@ -46,9 +46,7 @@
             "buildsystem": "meson",
             "builddir": true,
             "config-opts": [
-                "--libdir=/app/lib",
-                "-Dtests=false",
-                "-Dbenchmarks=false"
+                "--libdir=/app/lib"
             ],
             "sources": [
                 {

config.h.meson

@@ -286,10 +286,6 @@
 /* Define to 1 if linux/memfd.h exists */
 #mesondefine HAVE_LINUX_MEMFD_H
 
-#mesondefine HAVE_LINUX_INPUT_H
-
-#mesondefine HAVE_DEV_EVDEV_INPUT_H
-
 #mesondefine GTK_SYSCONFDIR
 
 #mesondefine GTK_LOCALEDIR

demos/gtk-demo/clipboard.c

@@ -321,10 +321,10 @@ do_clipboard (GtkWidget *do_widget)
                         G_CALLBACK (drag_data_received), image);
 
       /* context menu on image */
-      gesture = gtk_gesture_multi_press_new ();
+      gesture = gtk_gesture_multi_press_new (image);
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
+      g_object_set_data_full (G_OBJECT (image), "gesture", gesture, g_object_unref);
       g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
 
       /* Create the second image */
       image = gtk_image_new_from_icon_name ("process-stop");
@@ -346,10 +346,10 @@ do_clipboard (GtkWidget *do_widget)
                         G_CALLBACK (drag_data_received), image);
 
       /* context menu on image */
-      gesture = gtk_gesture_multi_press_new ();
+      gesture = gtk_gesture_multi_press_new (image);
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), GDK_BUTTON_SECONDARY);
+      g_object_set_data_full (G_OBJECT (image), "gesture", gesture, g_object_unref);
       g_signal_connect (gesture, "pressed", G_CALLBACK (pressed_cb), image);
-      gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/demo.gresource.xml

@@ -160,6 +160,7 @@
     <file>expander.c</file>
     <file>filtermodel.c</file>
     <file>fishbowl.c</file>
+    <file>widgetbowl.c</file>
     <file>flowbox.c</file>
     <file>foreigndrawing.c</file>
     <file>font_features.c</file>

demos/gtk-demo/dnd.c

@@ -356,11 +356,10 @@ do_dnd (GtkWidget *do_widget)
       gtk_widget_set_hexpand (fixed, TRUE);
       gtk_widget_set_vexpand (fixed, TRUE);
 
-      multipress = gtk_gesture_multi_press_new ();
+      multipress = gtk_gesture_multi_press_new (fixed);
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (multipress), 0);
       g_signal_connect (multipress, "pressed", G_CALLBACK (pressed_cb), NULL);
       g_signal_connect (multipress, "released", G_CALLBACK (released_cb), NULL);
-      gtk_widget_add_controller (fixed, GTK_EVENT_CONTROLLER (multipress));
 
       provider = gtk_css_provider_new ();
       gtk_css_provider_load_from_resource (provider, "/dnd/dnd.css");

demos/gtk-demo/drawingarea.c

@@ -244,14 +244,13 @@ do_drawingarea (GtkWidget *do_widget)
       g_signal_connect (da, "size-allocate",
                         G_CALLBACK (scribble_size_allocate), NULL);
 
-      drag = gtk_gesture_drag_new ();
+      drag = gtk_gesture_drag_new (da);
       gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
-      gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
+      g_object_set_data_full (G_OBJECT (da), "drag", drag, g_object_unref);
 
       g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);
       g_signal_connect (drag, "drag-update", G_CALLBACK (drag_update), da);
       g_signal_connect (drag, "drag-end", G_CALLBACK (drag_end), da);
-
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/event_axes.c

@@ -581,7 +581,8 @@ init_pad_controller (GtkWidget *window,
   gint i;
 
   action_group = g_simple_action_group_new ();
-  pad_controller = gtk_pad_controller_new (G_ACTION_GROUP (action_group),
+  pad_controller = gtk_pad_controller_new (GTK_WINDOW (window),
+                                           G_ACTION_GROUP (action_group),
                                            NULL);
 
   for (i = 0; i < G_N_ELEMENTS (pad_actions); i++)
@@ -606,7 +607,8 @@ init_pad_controller (GtkWidget *window,
 
   gtk_pad_controller_set_action_entries (pad_controller, pad_actions,
                                          G_N_ELEMENTS (pad_actions));
-  gtk_widget_add_controller (window, GTK_EVENT_CONTROLLER (pad_controller));
+  g_object_set_data_full (G_OBJECT (window), "pad-controller",
+                          pad_controller, g_object_unref);
 
   g_object_unref (action_group);
 }

demos/gtk-demo/fishbowl.c

@@ -8,245 +8,167 @@
 #include <gtk/gtk.h>
 
 #include "gtkfishbowl.h"
-#include "gtkgears.h"
 
-const char *const css =
-".blurred-button {"
-"  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
-"}"
-"";
+GtkWidget *info_label;
+GtkWidget *allow_changes;
 
-char **icon_names = NULL;
-gsize n_icon_names = 0;
+#define N_STATS 5
 
-static void
-init_icon_names (GtkIconTheme *theme)
-{
-  GPtrArray *icons;
-  GList *l, *icon_list;
+#define STATS_UPDATE_TIME G_USEC_PER_SEC
 
-  if (icon_names)
-    return;
-
-  icon_list = gtk_icon_theme_list_icons (theme, NULL);
-  icons = g_ptr_array_new ();
-
-  for (l = icon_list; l; l = l->next)
-    {
-      if (g_str_has_suffix (l->data, "symbolic"))
-        continue;
-
-      g_ptr_array_add (icons, g_strdup (l->data));
-    }
-
-  n_icon_names = icons->len;
-  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
-  icon_names = (char **) g_ptr_array_free (icons, FALSE);
-
-  /* don't free strings, we assigned them to the array */
-  g_list_free_full (icon_list, g_free);
-}
-
-static const char *
-get_random_icon_name (GtkIconTheme *theme)
-{
-  init_icon_names (theme);
-
-  return icon_names[g_random_int_range(0, n_icon_names)];
-}
-
-GtkWidget *
-create_icon (void)
-{
-  GtkWidget *image;
-
-  image = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()));
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-
-  return image;
-}
-
-static GtkWidget *
-create_button (void)
-{
-  return gtk_button_new_with_label ("Button");
-}
-
-static GtkWidget *
-create_blurred_button (void)
-{
-  GtkWidget *w = gtk_button_new ();
-
-  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");
-
-  return w;
-}
-
-static GtkWidget *
-create_font_button (void)
-{
-  return gtk_font_button_new ();
-}
-
-static GtkWidget *
-create_level_bar (void)
-{
-  GtkWidget *w = gtk_level_bar_new_for_interval (0, 100);
-
-  gtk_level_bar_set_value (GTK_LEVEL_BAR (w), 50);
-
-  /* Force them to be a bit larger */
-  gtk_widget_set_size_request (w, 200, -1);
-
-  return w;
-}
-
-static GtkWidget *
-create_spinner (void)
-{
-  GtkWidget *w = gtk_spinner_new ();
-
-  gtk_spinner_start (GTK_SPINNER (w));
-
-  return w;
-}
-
-static GtkWidget *
-create_spinbutton (void)
-{
-  GtkWidget *w = gtk_spin_button_new_with_range (0, 10, 1);
-
-  return w;
-}
-
-static GtkWidget *
-create_label (void)
-{
-  GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
-
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
-
-  return w;
-}
-
-static GtkWidget *
-create_video (void)
-{
-  GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
-  GtkWidget *w = gtk_image_new_from_paintable (GDK_PAINTABLE (stream));
-  gtk_media_stream_set_loop (stream, TRUE);
-  gtk_media_stream_play (stream);
-  g_object_unref (stream);
-
-  return w;
-}
-
-static GtkWidget *
-create_gears (void)
-{
-  GtkWidget *w = gtk_gears_new ();
-
-  gtk_widget_set_size_request (w, 100, 100);
-
-  return w;
-}
-
-static GtkWidget *
-create_switch (void)
-{
-  GtkWidget *w = gtk_switch_new ();
-
-  gtk_switch_set_state (GTK_SWITCH (w), TRUE);
-
-  return w;
-}
-
-static const struct {
-  const char *name;
-  GtkWidget * (*create_func) (void);
-} widget_types[] = {
-  { "Icon",       create_icon           },
-  { "Button",     create_button         },
-  { "Blurbutton", create_blurred_button },
-  { "Fontbutton", create_font_button    },
-  { "Levelbar",   create_level_bar      },
-  { "Label",      create_label          },
-  { "Spinner",    create_spinner        },
-  { "Spinbutton", create_spinbutton     },
-  { "Video",      create_video          },
-  { "Gears",      create_gears          },
-  { "Switch",     create_switch         },
+typedef struct _Stats Stats;
+struct _Stats {
+  gint last_suggestion;
 };
 
-static int selected_widget_type = -1;
-static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
+static Stats *
+get_stats (GtkWidget *widget)
+{
+  static GQuark stats_quark = 0;
+  Stats *stats;
+
+  if (G_UNLIKELY (stats_quark == 0))
+    stats_quark = g_quark_from_static_string ("stats");
+
+  stats = g_object_get_qdata (G_OBJECT (widget), stats_quark);
+  if (stats == NULL)
+    {
+      stats = g_new0 (Stats, 1);
+      g_object_set_qdata_full (G_OBJECT (widget), stats_quark, stats, g_free);
+    }
+
+  return stats;
+}
+
+static gint64
+guess_refresh_interval (GdkFrameClock *frame_clock)
+{
+  gint64 interval;
+  gint64 i;
+
+  interval = G_MAXINT64;
+
+  for (i = gdk_frame_clock_get_history_start (frame_clock);
+       i < gdk_frame_clock_get_frame_counter (frame_clock);
+       i++)
+    {
+      GdkFrameTimings *t, *before;
+      gint64 ts, before_ts;
+
+      t = gdk_frame_clock_get_timings (frame_clock, i);
+      before = gdk_frame_clock_get_timings (frame_clock, i - 1);
+      if (t == NULL || before == NULL)
+        continue;
+
+      ts = gdk_frame_timings_get_frame_time (t);
+      before_ts = gdk_frame_timings_get_frame_time (before);
+      if (ts == 0 || before_ts == 0)
+        continue;
+
+      interval = MIN (interval, ts - before_ts);
+    }
+
+  if (interval == G_MAXINT64)
+    return 0;
+
+  return interval;
+}
 
 static void
-set_widget_type (GtkFishbowl *fishbowl,
-                 int          widget_type_index)
+do_stats (GtkWidget *widget,
+          gint      *suggested_change)
 {
-  GtkWidget *window, *headerbar;
+  GdkFrameClock *frame_clock;
+  Stats *stats;
+  GdkFrameTimings *start, *end;
+  gint64 start_counter, end_counter;
+  gint64 n_frames, expected_frames;
+  gint64 start_timestamp, end_timestamp;
+  gint64 interval;
+  char *new_label;
 
-  if (widget_type_index == selected_widget_type)
+  stats = get_stats (widget);
+  frame_clock = gtk_widget_get_frame_clock (widget);
+  if (frame_clock == NULL)
     return;
 
-  selected_widget_type = widget_type_index;
+  start_counter = gdk_frame_clock_get_history_start (frame_clock);
+  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
+  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
+  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
+       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
+       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
+    end_counter--;
+  if (end_counter - start_counter < 4)
+    return;
 
-  gtk_fishbowl_set_creation_func (fishbowl,
-                                  widget_types[selected_widget_type].create_func);
+  start_timestamp = gdk_frame_timings_get_presentation_time (start);
+  end_timestamp = gdk_frame_timings_get_presentation_time (end);
+  if (start_timestamp == 0 || end_timestamp == 0)
+    {
+      start_timestamp = gdk_frame_timings_get_frame_time (start);
+      end_timestamp = gdk_frame_timings_get_frame_time (end);
+    }
 
-  window = gtk_widget_get_toplevel (GTK_WIDGET (fishbowl));
-  headerbar = gtk_window_get_titlebar (GTK_WINDOW (window));
-  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
-                            widget_types[selected_widget_type].name);
-}
+  interval = gdk_frame_timings_get_refresh_interval (end);
+  if (interval == 0)
+    {
+      interval = guess_refresh_interval (frame_clock);
+      if (interval == 0)
+        return;
+    }
+  n_frames = end_counter - start_counter;
+  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
 
-void
-next_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
+  new_label = g_strdup_printf ("icons - %.1f fps",
+                               ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp));
+  gtk_label_set_label (GTK_LABEL (info_label), new_label);
+  g_free (new_label);
 
-  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
-    new_index = 0;
+  if (n_frames >= expected_frames)
+    {
+      if (stats->last_suggestion > 0)
+        stats->last_suggestion *= 2;
+      else
+        stats->last_suggestion = 1;
+    }
+  else if (n_frames + 1 < expected_frames)
+    {
+      if (stats->last_suggestion < 0)
+        stats->last_suggestion--;
+      else
+        stats->last_suggestion = -1;
+    }
   else
-    new_index = selected_widget_type + 1;
+    {
+      stats->last_suggestion = 0;
+    }
 
-  set_widget_type (fishbowl, new_index);
-}
-
-void
-prev_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
-
-  if (selected_widget_type - 1 < 0)
-    new_index = N_WIDGET_TYPES - 1;
+  if (suggested_change)
+    *suggested_change = stats->last_suggestion;
   else
-    new_index = selected_widget_type - 1;
-
-  set_widget_type (fishbowl, new_index);
+    stats->last_suggestion = 0;
 }
 
+static gboolean
+move_fish (gpointer bowl)
+{
+  gint suggested_change = 0, new_count;
+  
+  do_stats (bowl,
+            !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);
+
+  new_count = gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change;
+  new_count = MAX (1, new_count);
+  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl), new_count);
+
+  return G_SOURCE_CONTINUE;
+}
 
 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
-  static GtkCssProvider *provider = NULL;
-
-  if (provider == NULL)
-    {
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css, -1);
-      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                                  GTK_STYLE_PROVIDER (provider),
-                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }
 
   if (!window)
     {
@@ -256,20 +178,23 @@ do_fishbowl (GtkWidget *do_widget)
       g_type_ensure (GTK_TYPE_FISHBOWL);
 
       builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
-      gtk_builder_add_callback_symbols (builder,
-                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
-                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
-                                        NULL);
       gtk_builder_connect_signals (builder, NULL);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
-      set_widget_type (GTK_FISHBOWL (bowl), 0);
+      gtk_fishbowl_set_use_icons (GTK_FISHBOWL (bowl), TRUE);
+      info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
+      allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_widget_realize (window);
+      g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE,
+                                  1,
+                                  move_fish,
+                                  bowl,
+                                  NULL);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/fishbowl.ui

@@ -7,43 +7,7 @@
       <object class="GtkHeaderBar" id="">
         <property name="show-title-buttons">1</property>
         <child>
-          <object class="GtkBox">
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">pan-start-symbolic</property>
-                <signal name="clicked" handler="prev_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="icon-name">pan-end-symbolic</property>
-                <signal name="clicked" handler="next_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">fps</property>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label" bind-source="bowl" bind-property="framerate"/>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Icons, </property>
+          <object class="GtkLabel" id="info_label">
           </object>
           <packing>
             <property name="pack-type">end</property>
@@ -84,7 +48,6 @@
       <object class="GtkFishbowl" id="bowl">
         <property name="visible">True</property>
         <property name="animating">True</property>
-        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
       </object>
     </child>
   </object>

demos/gtk-demo/font_features.c

@@ -1718,10 +1718,9 @@ do_font_features (GtkWidget *do_widget)
       entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
       edit_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "edit_toggle"));
 
-      controller = gtk_event_controller_key_new ();
+      controller = gtk_event_controller_key_new (entry);
       g_object_set_data_full (G_OBJECT (entry), "controller", controller, g_object_unref);
       g_signal_connect (controller, "key-pressed", G_CALLBACK (entry_key_press), entry);
-      gtk_widget_add_controller (entry, controller);
 
       add_check_group (feature_list, _("Kerning"), (const char *[]){ "kern", NULL });
       add_check_group (feature_list, _("Ligatures"), (const char *[]){ "liga",

demos/gtk-demo/fontplane.c

@@ -68,7 +68,8 @@ plane_snapshot (GtkWidget   *widget,
   height = gtk_widget_get_allocated_height (widget);
 
   cr = gtk_snapshot_append_cairo (snapshot,
-                                  &GRAPHENE_RECT_INIT (0, 0, width, height));
+                                  &GRAPHENE_RECT_INIT (0, 0, width, height),
+                                  "FontPlane");
 
   cairo_set_source_rgb (cr, 0, 0, 0);
   cairo_rectangle (cr, 0, 0, width, height);
@@ -207,27 +208,23 @@ plane_drag_gesture_end (GtkGestureDrag *gesture,
 static void
 gtk_font_plane_init (GtkFontPlane *plane)
 {
-  GtkGesture *gesture;
-
   gtk_widget_set_has_surface (GTK_WIDGET (plane), FALSE);
   gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
 
-  gesture = gtk_gesture_drag_new ();
-  g_signal_connect (gesture, "drag-begin",
+  plane->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (plane));
+  g_signal_connect (plane->drag_gesture, "drag-begin",
 		    G_CALLBACK (plane_drag_gesture_begin), plane);
-  g_signal_connect (gesture, "drag-update",
+  g_signal_connect (plane->drag_gesture, "drag-update",
 		    G_CALLBACK (plane_drag_gesture_update), plane);
-  g_signal_connect (gesture, "drag-end",
+  g_signal_connect (plane->drag_gesture, "drag-end",
 		    G_CALLBACK (plane_drag_gesture_end), plane);
-  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (gesture), 0);
-  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (plane->drag_gesture), 0);
 
-  gesture = gtk_gesture_long_press_new ();
-  g_signal_connect (gesture, "pressed",
+  plane->long_press_gesture = gtk_gesture_long_press_new (GTK_WIDGET (plane));
+  g_signal_connect (plane->long_press_gesture, "pressed",
                     G_CALLBACK (hold_action), plane);
-  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture),
+  gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (plane->long_press_gesture),
                                      TRUE);
-  gtk_widget_add_controller (GTK_WIDGET (plane), GTK_EVENT_CONTROLLER (gesture));
 }
 
 static void
@@ -238,6 +235,9 @@ plane_finalize (GObject *object)
   g_clear_object (&plane->weight_adj);
   g_clear_object (&plane->width_adj);
 
+  g_clear_object (&plane->drag_gesture);
+  g_clear_object (&plane->long_press_gesture);
+
   G_OBJECT_CLASS (gtk_font_plane_parent_class)->finalize (object);
 }
 

demos/gtk-demo/fontplane.h

@@ -41,6 +41,7 @@ struct _GtkFontPlane
   GtkAdjustment *width_adj;
 
   GtkGesture *drag_gesture;
+  GtkGesture *long_press_gesture;
 };
 
 struct _GtkFontPlaneClass

demos/gtk-demo/gestures.c

@@ -157,15 +157,16 @@ do_gestures (GtkWidget *do_widget)
                                       NULL, NULL);
 
       /* Swipe */
-      gesture = gtk_gesture_swipe_new ();
+      gesture = gtk_gesture_swipe_new (drawing_area);
       g_signal_connect (gesture, "swipe",
                         G_CALLBACK (swipe_gesture_swept), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* 3fg swipe for touchpads */
       gesture = g_object_new (GTK_TYPE_GESTURE_SWIPE,
+                              "widget", drawing_area,
                               "n-points", 3,
                               NULL);
       g_signal_connect (gesture, "begin",
@@ -174,34 +175,33 @@ do_gestures (GtkWidget *do_widget)
                         G_CALLBACK (swipe_gesture_swept), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
-
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* Long press */
-      gesture = gtk_gesture_long_press_new ();
+      gesture = gtk_gesture_long_press_new (drawing_area);
       g_signal_connect (gesture, "pressed",
                         G_CALLBACK (long_press_gesture_pressed), drawing_area);
       g_signal_connect (gesture, "end",
                         G_CALLBACK (long_press_gesture_end), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* Rotate */
-      rotate = gesture = gtk_gesture_rotate_new ();
+      rotate = gesture = gtk_gesture_rotate_new (drawing_area);
       g_signal_connect (gesture, "angle-changed",
                         G_CALLBACK (rotation_angle_changed), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
 
       /* Zoom */
-      zoom = gesture = gtk_gesture_zoom_new ();
+      zoom = gesture = gtk_gesture_zoom_new (drawing_area);
       g_signal_connect (gesture, "scale-changed",
                         G_CALLBACK (zoom_scale_changed), drawing_area);
       gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
                                                   GTK_PHASE_BUBBLE);
-      gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (gesture));
+      g_object_weak_ref (G_OBJECT (drawing_area), (GWeakNotify) g_object_unref, gesture);
     }
 
   if (!gtk_widget_get_visible (window))

demos/gtk-demo/gtkfishbowl.c

@@ -24,18 +24,13 @@ typedef struct _GtkFishbowlChild         GtkFishbowlChild;
 
 struct _GtkFishbowlPrivate
 {
-  GtkFishCreationFunc creation_func;
   GList *children;
   guint count;
 
   gint64 last_frame_time;
-  gint64 update_delay;
   guint tick_id;
 
-  double framerate;
-  int last_benchmark_change;
-
-  guint benchmark : 1;
+  guint use_icons: 1;
 };
 
 struct _GtkFishbowlChild
@@ -50,25 +45,18 @@ struct _GtkFishbowlChild
 enum {
    PROP_0,
    PROP_ANIMATING,
-   PROP_BENCHMARK,
    PROP_COUNT,
-   PROP_FRAMERATE,
-   PROP_UPDATE_DELAY,
    NUM_PROPERTIES
 };
 
 static GParamSpec *props[NUM_PROPERTIES] = { NULL, };
 
-G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_CONTAINER)
 
 static void
 gtk_fishbowl_init (GtkFishbowl *fishbowl)
 {
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
   gtk_widget_set_has_surface (GTK_WIDGET (fishbowl), FALSE);
-
-  priv->update_delay = G_USEC_PER_SEC;
 }
 
 /**
@@ -84,6 +72,15 @@ gtk_fishbowl_new (void)
   return g_object_new (GTK_TYPE_FISHBOWL, NULL);
 }
 
+void
+gtk_fishbowl_set_use_icons (GtkFishbowl *fishbowl,
+                            gboolean     use_icons)
+{
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+
+  priv->use_icons = use_icons;
+}
+
 static void
 gtk_fishbowl_measure (GtkWidget      *widget,
                       GtkOrientation  orientation,
@@ -164,9 +161,10 @@ new_speed (void)
 }
 
 static void
-gtk_fishbowl_add (GtkFishbowl *fishbowl,
-                  GtkWidget   *widget)
+gtk_fishbowl_add (GtkContainer *container,
+                  GtkWidget    *widget)
 {
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
   GtkFishbowlChild *child_info;
 
@@ -188,12 +186,13 @@ gtk_fishbowl_add (GtkFishbowl *fishbowl,
 }
 
 static void
-gtk_fishbowl_remove (GtkFishbowl *fishbowl,
-                     GtkWidget   *widget)
+gtk_fishbowl_remove (GtkContainer *container,
+                     GtkWidget    *widget)
 {
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
   GtkFishbowlChild *child;
-  GtkWidget *widget_bowl = GTK_WIDGET (fishbowl);
+  GtkWidget *widget_container = GTK_WIDGET (container);
   GList *children;
 
   for (children = priv->children; children; children = children->next)
@@ -210,8 +209,8 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
           g_list_free (children);
           g_free (child);
 
-          if (was_visible && gtk_widget_get_visible (widget_bowl))
-            gtk_widget_queue_resize (widget_bowl);
+          if (was_visible && gtk_widget_get_visible (widget_container))
+            gtk_widget_queue_resize (widget_container);
 
           priv->count--;
           g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
@@ -220,6 +219,26 @@ gtk_fishbowl_remove (GtkFishbowl *fishbowl,
     }
 }
 
+static void
+gtk_fishbowl_forall (GtkContainer *container,
+                     GtkCallback   callback,
+                     gpointer      callback_data)
+{
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+  GtkFishbowlChild *child;
+  GList *children;
+
+  children = priv->children;
+  while (children)
+    {
+      child = children->data;
+      children = children->next;
+
+      (* callback) (child->widget, callback_data);
+    }
+}
+
 static void
 gtk_fishbowl_dispose (GObject *object)
 {
@@ -245,18 +264,10 @@ gtk_fishbowl_set_property (GObject         *object,
       gtk_fishbowl_set_animating (fishbowl, g_value_get_boolean (value));
       break;
 
-    case PROP_BENCHMARK:
-      gtk_fishbowl_set_benchmark (fishbowl, g_value_get_boolean (value));
-      break;
-
     case PROP_COUNT:
       gtk_fishbowl_set_count (fishbowl, g_value_get_uint (value));
       break;
 
-    case PROP_UPDATE_DELAY:
-      gtk_fishbowl_set_update_delay (fishbowl, g_value_get_int64 (value));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -277,22 +288,10 @@ gtk_fishbowl_get_property (GObject         *object,
       g_value_set_boolean (value, gtk_fishbowl_get_animating (fishbowl));
       break;
 
-    case PROP_BENCHMARK:
-      g_value_set_boolean (value, gtk_fishbowl_get_benchmark (fishbowl));
-      break;
-
     case PROP_COUNT:
       g_value_set_uint (value, gtk_fishbowl_get_count (fishbowl));
       break;
 
-    case PROP_FRAMERATE:
-      g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
-      break;
-
-    case PROP_UPDATE_DELAY:
-      g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -304,6 +303,7 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
 
   object_class->dispose = gtk_fishbowl_dispose;
   object_class->set_property = gtk_fishbowl_set_property;
@@ -312,6 +312,10 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
   widget_class->measure = gtk_fishbowl_measure;
   widget_class->size_allocate = gtk_fishbowl_size_allocate;
 
+  container_class->add = gtk_fishbowl_add;
+  container_class->remove = gtk_fishbowl_remove;
+  container_class->forall = gtk_fishbowl_forall;
+
   props[PROP_ANIMATING] =
       g_param_spec_boolean ("animating",
                             "animating",
@@ -319,36 +323,13 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                             FALSE,
                             G_PARAM_READWRITE);
 
-  props[PROP_BENCHMARK] =
-      g_param_spec_boolean ("benchmark",
-                            "Benchmark",
-                            "Adapt the count property to hit the maximum framerate",
-                            FALSE,
-                            G_PARAM_READWRITE);
-
   props[PROP_COUNT] =
       g_param_spec_uint ("count",
                          "Count",
                          "Number of widgets",
                          0, G_MAXUINT,
                          0,
-                         G_PARAM_READWRITE);
-
-  props[PROP_FRAMERATE] =
-      g_param_spec_double ("framerate",
-                           "Framerate",
-                           "Framerate of this widget in frames per second",
-                           0, G_MAXDOUBLE,
-                           0,
-                           G_PARAM_READABLE);
-
-  props[PROP_UPDATE_DELAY] =
-      g_param_spec_int64 ("update-delay",
-                          "Update delay",
-                          "Number of usecs between updates",
-                          0, G_MAXINT64,
-                          G_USEC_PER_SEC,
-                          G_PARAM_READWRITE);
+                         G_PARAM_READABLE);
 
   g_object_class_install_properties (object_class, NUM_PROPERTIES, props);
 }
@@ -361,58 +342,96 @@ gtk_fishbowl_get_count (GtkFishbowl *fishbowl)
   return priv->count;
 }
 
+char **icon_names = NULL;
+gsize n_icon_names = 0;
+
+static void
+init_icon_names (GtkIconTheme *theme)
+{
+  GPtrArray *icons;
+  GList *l, *icon_list;
+
+  if (icon_names)
+    return;
+
+  icon_list = gtk_icon_theme_list_icons (theme, NULL);
+  icons = g_ptr_array_new ();
+
+  for (l = icon_list; l; l = l->next)
+    {
+      if (g_str_has_suffix (l->data, "symbolic"))
+        continue;
+
+      g_ptr_array_add (icons, g_strdup (l->data));
+    }
+
+  n_icon_names = icons->len;
+  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
+  icon_names = (char **) g_ptr_array_free (icons, FALSE);
+
+  /* don't free strings, we assigned them to the array */
+  g_list_free_full (icon_list, g_free);
+}
+
+static const char *
+get_random_icon_name (GtkIconTheme *theme)
+{
+  init_icon_names (theme);
+
+  return icon_names[g_random_int_range(0, n_icon_names)];
+}
+
+static GType
+get_random_widget_type ()
+{
+  GType types[] = {
+    GTK_TYPE_SWITCH,
+    GTK_TYPE_BUTTON,
+    GTK_TYPE_ENTRY,
+    GTK_TYPE_SPIN_BUTTON,
+    GTK_TYPE_FONT_BUTTON,
+    GTK_TYPE_SCROLLBAR,
+    GTK_TYPE_SCALE,
+    GTK_TYPE_LEVEL_BAR,
+    GTK_TYPE_PROGRESS_BAR,
+    GTK_TYPE_RADIO_BUTTON,
+    GTK_TYPE_CHECK_BUTTON
+  };
+  return types[g_random_int_range (0, G_N_ELEMENTS (types))];
+}
+
 void
 gtk_fishbowl_set_count (GtkFishbowl *fishbowl,
                         guint        count)
 {
   GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
 
-  if (priv->count == count)
-    return;
-
   g_object_freeze_notify (G_OBJECT (fishbowl));
 
   while (priv->count > count)
     {
-      gtk_fishbowl_remove (fishbowl, gtk_widget_get_first_child (GTK_WIDGET (fishbowl)));
+      gtk_container_remove (GTK_CONTAINER (fishbowl),
+                            ((GtkFishbowlChild *) priv->children->data)->widget);
     }
 
   while (priv->count < count)
     {
       GtkWidget *new_widget;
 
-      new_widget = priv->creation_func ();
+      if (priv->use_icons)
+        {
+          new_widget = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()));
+          gtk_image_set_icon_size (GTK_IMAGE (new_widget), GTK_ICON_SIZE_LARGE);
+        }
+      else
+        new_widget = g_object_new (get_random_widget_type (), NULL);
 
-      gtk_fishbowl_add (fishbowl, new_widget);
+      gtk_container_add (GTK_CONTAINER (fishbowl), new_widget);
     }
 
   g_object_thaw_notify (G_OBJECT (fishbowl));
 }
 
-gboolean
-gtk_fishbowl_get_benchmark (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->benchmark;
-}
-
-void
-gtk_fishbowl_set_benchmark (GtkFishbowl *fishbowl,
-                            gboolean     benchmark)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (priv->benchmark == benchmark)
-    return;
-
-  priv->benchmark = benchmark;
-  if (!benchmark)
-    priv->last_benchmark_change = 0;
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_BENCHMARK]);
-}
-
 gboolean
 gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
 {
@@ -421,111 +440,6 @@ gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
   return priv->tick_id != 0;
 }
 
-static gint64
-guess_refresh_interval (GdkFrameClock *frame_clock)
-{
-  gint64 interval;
-  gint64 i;
-
-  interval = G_MAXINT64;
-
-  for (i = gdk_frame_clock_get_history_start (frame_clock);
-       i < gdk_frame_clock_get_frame_counter (frame_clock);
-       i++)
-    {
-      GdkFrameTimings *t, *before;
-      gint64 ts, before_ts;
-
-      t = gdk_frame_clock_get_timings (frame_clock, i);
-      before = gdk_frame_clock_get_timings (frame_clock, i - 1);
-      if (t == NULL || before == NULL)
-        continue;
-
-      ts = gdk_frame_timings_get_frame_time (t);
-      before_ts = gdk_frame_timings_get_frame_time (before);
-      if (ts == 0 || before_ts == 0)
-        continue;
-
-      interval = MIN (interval, ts - before_ts);
-    }
-
-  if (interval == G_MAXINT64)
-    return 0;
-
-  return interval;
-}
-
-static void
-gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GdkFrameClock *frame_clock;
-  GdkFrameTimings *start, *end;
-  gint64 start_counter, end_counter;
-  gint64 n_frames, expected_frames;
-  gint64 start_timestamp, end_timestamp;
-  gint64 interval;
-
-  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (fishbowl));
-  if (frame_clock == NULL)
-    return;
-
-  start_counter = gdk_frame_clock_get_history_start (frame_clock);
-  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
-  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
-  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
-       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
-       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
-    end_counter--;
-  if (end_counter - start_counter < 4)
-    return;
-
-  start_timestamp = gdk_frame_timings_get_presentation_time (start);
-  end_timestamp = gdk_frame_timings_get_presentation_time (end);
-  if (start_timestamp == 0 || end_timestamp == 0)
-    {
-      start_timestamp = gdk_frame_timings_get_frame_time (start);
-      end_timestamp = gdk_frame_timings_get_frame_time (end);
-    }
-
-  n_frames = end_counter - start_counter;
-  priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
-
-  if (!priv->benchmark)
-    return;
-
-  interval = gdk_frame_timings_get_refresh_interval (end);
-  if (interval == 0)
-    {
-      interval = guess_refresh_interval (frame_clock);
-      if (interval == 0)
-        return;
-    }
-  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
-
-  if (n_frames >= expected_frames)
-    {
-      if (priv->last_benchmark_change > 0)
-        priv->last_benchmark_change *= 2;
-      else
-        priv->last_benchmark_change = 1;
-    }
-  else if (n_frames + 1 < expected_frames)
-    {
-      if (priv->last_benchmark_change < 0)
-        priv->last_benchmark_change--;
-      else
-        priv->last_benchmark_change = -1;
-    }
-  else
-    {
-      priv->last_benchmark_change = 0;
-    }
-
-  gtk_fishbowl_set_count (fishbowl, MAX (1, (int) priv->count + priv->last_benchmark_change));
-}
-
 static gboolean
 gtk_fishbowl_tick (GtkWidget     *widget,
                    GdkFrameClock *frame_clock,
@@ -536,11 +450,9 @@ gtk_fishbowl_tick (GtkWidget     *widget,
   GtkFishbowlChild *child;
   GList *l;
   gint64 frame_time, elapsed;
-  gboolean do_update;
 
   frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
   elapsed = frame_time - priv->last_frame_time;
-  do_update = frame_time / priv->update_delay != priv->last_frame_time / priv->update_delay;
   priv->last_frame_time = frame_time;
 
   /* last frame was 0, so we're just starting to animate */
@@ -579,9 +491,6 @@ gtk_fishbowl_tick (GtkWidget     *widget,
 
   gtk_widget_queue_allocate (widget);
 
-  if (do_update)
-    gtk_fishbowl_do_update (fishbowl);
-
   return G_SOURCE_CONTINUE;
 }
 
@@ -606,57 +515,8 @@ gtk_fishbowl_set_animating (GtkFishbowl *fishbowl,
       priv->last_frame_time = 0;
       gtk_widget_remove_tick_callback (GTK_WIDGET (fishbowl), priv->tick_id);
       priv->tick_id = 0;
-      priv->framerate = 0;
-      g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
     }
 
   g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_ANIMATING]);
 }
 
-double
-gtk_fishbowl_get_framerate (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->framerate;
-}
-
-gint64
-gtk_fishbowl_get_update_delay (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->update_delay;
-}
-
-void
-gtk_fishbowl_set_update_delay (GtkFishbowl *fishbowl,
-                               gint64       update_delay)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (priv->update_delay == update_delay)
-    return;
-
-  priv->update_delay = update_delay;
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_UPDATE_DELAY]);
-}
-
-void
-gtk_fishbowl_set_creation_func (GtkFishbowl         *fishbowl,
-                                GtkFishCreationFunc  creation_func)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  g_object_freeze_notify (G_OBJECT (fishbowl));
-
-  gtk_fishbowl_set_count (fishbowl, 0);
-  priv->last_benchmark_change = 0;
-
-  priv->creation_func = creation_func;
-
-  gtk_fishbowl_set_count (fishbowl, 1);
-
-  g_object_thaw_notify (G_OBJECT (fishbowl));
-}

demos/gtk-demo/gtkfishbowl.h

@@ -32,37 +32,29 @@ G_BEGIN_DECLS
 typedef struct _GtkFishbowl              GtkFishbowl;
 typedef struct _GtkFishbowlClass         GtkFishbowlClass;
 
-typedef GtkWidget * (* GtkFishCreationFunc) (void);
-
 struct _GtkFishbowl
 {
-  GtkWidget parent;
+  GtkContainer container;
 };
 
 struct _GtkFishbowlClass
 {
-  GtkWidgetClass parent_class;
+  GtkContainerClass parent_class;
 };
 
 GType      gtk_fishbowl_get_type          (void) G_GNUC_CONST;
 
 GtkWidget* gtk_fishbowl_new               (void);
 
+void       gtk_fishbowl_set_use_icons     (GtkFishbowl       *fishbowl,
+                                           gboolean           use_icons);
+
 guint      gtk_fishbowl_get_count         (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_count         (GtkFishbowl       *fishbowl,
                                            guint              count);
 gboolean   gtk_fishbowl_get_animating     (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_animating     (GtkFishbowl       *fishbowl,
                                            gboolean           animating);
-gboolean   gtk_fishbowl_get_benchmark     (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_benchmark     (GtkFishbowl       *fishbowl,
-                                           gboolean           animating);
-double     gtk_fishbowl_get_framerate     (GtkFishbowl       *fishbowl);
-gint64     gtk_fishbowl_get_update_delay  (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_update_delay  (GtkFishbowl       *fishbowl,
-                                           gint64             update_delay);
-void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
-                                           GtkFishCreationFunc creation_func);
 
 G_END_DECLS
 

demos/gtk-demo/hypertext.c

@@ -256,9 +256,9 @@ do_hypertext (GtkWidget *do_widget)
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
       gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);
       gtk_text_view_set_right_margin (GTK_TEXT_VIEW (view), 20);
-      controller = gtk_event_controller_key_new ();
+      controller = gtk_event_controller_key_new (view);
+      g_object_set_data_full (G_OBJECT (view), "controller", controller, g_object_unref);
       g_signal_connect (controller, "key-pressed", G_CALLBACK (key_pressed), view);
-      gtk_widget_add_controller (view, controller);
       g_signal_connect (view, "event",
                         G_CALLBACK (event_cb), NULL);
 

demos/gtk-demo/meson.build

@@ -26,6 +26,7 @@ demos = files([
   'expander.c',
   'filtermodel.c',
   'fishbowl.c',
+  'widgetbowl.c',
   'foreigndrawing.c',
   'gestures.c',
   'glarea.c',

demos/gtk-demo/modelbutton.ui

@@ -56,7 +56,6 @@
         <child>
           <object class="GtkModelButton">
             <property name="action-name">win.color</property>
-            <property name="action-target">'red'</property>
             <property name="text">Red</property>
             <property name="inverted">1</property>
           </object>
@@ -64,7 +63,6 @@
         <child>
           <object class="GtkModelButton">
             <property name="action-name">win.color</property>
-            <property name="action-target">'green'</property>
             <property name="text">Green</property>
             <property name="inverted">1</property>
           </object>
@@ -72,7 +70,6 @@
         <child>
           <object class="GtkModelButton">
             <property name="action-name">win.color</property>
-            <property name="action-target">'blue'</property>
             <property name="text">Blue</property>
             <property name="inverted">1</property>
           </object>

demos/gtk-demo/paint.c

@@ -11,6 +11,8 @@ typedef struct
   cairo_surface_t *surface;
   cairo_t *cr;
   GdkRGBA draw_color;
+
+  GtkGesture *stylus_gesture;
 } DrawingArea;
 
 typedef struct
@@ -100,7 +102,8 @@ drawing_area_snapshot (GtkWidget   *widget,
                                     0, 0,
 				    allocation.width,
 				    allocation.height
-                                  ));
+                                  ),
+                                  "DrawingArea");
 
   cairo_set_source_rgb (cr, 1, 1, 1);
   cairo_paint (cr);
@@ -205,16 +208,13 @@ stylus_gesture_motion (GtkGestureStylus *gesture,
 static void
 drawing_area_init (DrawingArea *area)
 {
-  GtkGesture *gesture;
-
   gtk_widget_set_has_surface (GTK_WIDGET (area), FALSE);
 
-  gesture = gtk_gesture_stylus_new ();
-  g_signal_connect (gesture, "down",
+  area->stylus_gesture = gtk_gesture_stylus_new (GTK_WIDGET (area));
+  g_signal_connect (area->stylus_gesture, "down",
                     G_CALLBACK (stylus_gesture_down), area);
-  g_signal_connect (gesture, "motion",
+  g_signal_connect (area->stylus_gesture, "motion",
                     G_CALLBACK (stylus_gesture_motion), area);
-  gtk_widget_add_controller (GTK_WIDGET (area), GTK_EVENT_CONTROLLER (gesture));
 
   area->draw_color = (GdkRGBA) { 0, 0, 0, 1 };
 }

demos/gtk-demo/paintable.c

@@ -56,13 +56,15 @@ gtk_nuclear_snapshot (GtkSnapshot *snapshot,
 
   gtk_snapshot_append_color (snapshot,
                              &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 },
-                             &GRAPHENE_RECT_INIT (0, 0, width, height));
+                             &GRAPHENE_RECT_INIT (0, 0, width, height),
+                             "Yellow background");
 
   size = MIN (width, height);
   cr = gtk_snapshot_append_cairo (snapshot,
                                   &GRAPHENE_RECT_INIT ((width - size) / 2.0,
                                                        (height - size) / 2.0,
-                                                       size, size));
+                                                       size, size),
+                                  "Radioactive Icon");
   cairo_translate (cr, width / 2.0, height / 2.0);
   cairo_scale (cr, size, size);
   cairo_rotate (cr, rotation);

demos/gtk-demo/popover.c

@@ -119,7 +119,7 @@ day_selected_cb (GtkCalendar *calendar,
 
   gtk_widget_show (popover);
 
-  g_object_unref (event);
+  gdk_event_free (event);
 }
 
 GtkWidget *

demos/gtk-demo/search_entry2.c

@@ -27,9 +27,9 @@ changed_cb (GtkEditable *editable)
 }
 
 static gboolean
-window_event_cb (GtkWidget    *widget,
-                 GdkEvent     *event,
-                 GtkSearchBar *bar)
+window_key_press_event_cb (GtkWidget    *widget,
+			   GdkEvent     *event,
+			   GtkSearchBar *bar)
 {
   if (gdk_event_get_event_type (event) == GDK_KEY_PRESS)
     return gtk_search_bar_handle_event (bar, event);
@@ -102,7 +102,7 @@ do_search_entry2 (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), searchbar);
 
       /* Hook the search bar to key presses */
-      g_signal_connect (window, "event", G_CALLBACK (window_event_cb), searchbar);
+      g_signal_connect (window, "event", G_CALLBACK (window_key_press_event_cb), searchbar);
 
       /* Help */
       label = gtk_label_new ("Start Typing to search");

demos/gtk-demo/spinbutton.c

@@ -33,14 +33,14 @@ hex_spin_output (GtkSpinButton *spin_button)
 {
   GtkAdjustment *adjustment;
   gchar *buf;
-  gdouble val;
+  gint val;
 
   adjustment = gtk_spin_button_get_adjustment (spin_button);
-  val = gtk_adjustment_get_value (adjustment);
+  val = (gint) gtk_adjustment_get_value (adjustment);
   if (fabs (val) < 1e-5)
     buf = g_strdup ("0x00");
   else
-    buf = g_strdup_printf ("0x%.2X", (gint) val);
+    buf = g_strdup_printf ("0x%.2X", val);
   if (strcmp (buf, gtk_spin_button_get_text (spin_button)))
     gtk_spin_button_set_text (spin_button, buf);
   g_free (buf);

demos/gtk-demo/widgetbowl.c

@@ -0,0 +1,423 @@
+/* Benchmark/Widgetbowl
+ *
+ * This is a version of the Fishbowl demo that instead shows different
+ * kinds of widgets, which is useful for comparing the rendering performance
+ * of theme specifics.
+ */
+
+#include <gtk/gtk.h>
+
+#include "gtkfishbowl.h"
+#include "gtkgears.h"
+
+const char *const css =
+".blurred-button {"
+"  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
+"}"
+"";
+
+GtkWidget *fishbowl;
+
+static GtkWidget *
+create_button (void)
+{
+  return gtk_button_new_with_label ("Button");
+}
+static GtkWidget *
+create_blurred_button (void)
+{
+  GtkWidget *w = gtk_button_new ();
+
+  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");
+
+  return w;
+}
+
+static GtkWidget *
+create_font_button (void)
+{
+  return gtk_font_button_new ();
+}
+
+static GtkWidget *
+create_level_bar (void)
+{
+  GtkWidget *w = gtk_level_bar_new_for_interval (0, 100);
+
+  gtk_level_bar_set_value (GTK_LEVEL_BAR (w), 50);
+
+  /* Force them to be a bit larger */
+  gtk_widget_set_size_request (w, 200, -1);
+
+  return w;
+}
+
+static GtkWidget *
+create_spinner (void)
+{
+  GtkWidget *w = gtk_spinner_new ();
+
+  gtk_spinner_start (GTK_SPINNER (w));
+
+  return w;
+}
+
+static GtkWidget *
+create_spinbutton (void)
+{
+  GtkWidget *w = gtk_spin_button_new_with_range (0, 10, 1);
+
+  return w;
+}
+
+static GtkWidget *
+create_label (void)
+{
+  GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
+
+  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
+  gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
+
+  return w;
+}
+
+static GtkWidget *
+create_video (void)
+{
+  GtkMediaStream *stream = gtk_media_file_new_for_resource ("/images/gtk-logo.webm");
+  GtkWidget *w = gtk_image_new_from_paintable (GDK_PAINTABLE (stream));
+  gtk_media_stream_set_loop (stream, TRUE);
+  gtk_media_stream_play (stream);
+  g_object_unref (stream);
+
+  return w;
+}
+
+static GtkWidget *
+create_gears (void)
+{
+  GtkWidget *w = gtk_gears_new ();
+
+  gtk_widget_set_size_request (w, 100, 100);
+
+  return w;
+}
+
+static GtkWidget *
+create_switch (void)
+{
+  GtkWidget *w = gtk_switch_new ();
+
+  gtk_switch_set_state (GTK_SWITCH (w), TRUE);
+
+  return w;
+}
+
+static const struct {
+  const char *name;
+  GtkWidget * (*create_func) (void);
+} widget_types[] = {
+  { "Button",     create_button         },
+  { "Blurbutton", create_blurred_button },
+  { "Fontbutton", create_font_button    },
+  { "Levelbar"  , create_level_bar      },
+  { "Label"     , create_label          },
+  { "Spinner"   , create_spinner        },
+  { "Spinbutton", create_spinbutton     },
+  { "Video",      create_video          },
+  { "Gears",      create_gears          },
+  { "Switch",     create_switch         },
+};
+
+static int selected_widget_type = -1;
+static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
+
+#define N_STATS 5
+
+#define STATS_UPDATE_TIME G_USEC_PER_SEC
+
+static void
+set_widget_type (GtkWidget *headerbar,
+                 int        widget_type_index)
+{
+  GList *children, *l;
+
+  if (widget_type_index == selected_widget_type)
+    return;
+
+  /* Remove everything */
+  children = gtk_container_get_children (GTK_CONTAINER (fishbowl));
+  for (l = children; l; l = l->next)
+    {
+      gtk_container_remove (GTK_CONTAINER (fishbowl), (GtkWidget*)l->data);
+    }
+
+  g_list_free (children);
+
+  selected_widget_type = widget_type_index;
+
+  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
+                            widget_types[selected_widget_type].name);
+}
+
+
+typedef struct _Stats Stats;
+struct _Stats {
+  gint64 last_stats;
+  gint64 last_frame;
+  gint last_suggestion;
+  guint frame_counter_max;
+
+  guint stats_index;
+  guint frame_counter[N_STATS];
+  guint item_counter[N_STATS];
+};
+
+static Stats *
+get_stats (GtkWidget *widget)
+{
+  static GQuark stats_quark = 0;
+  Stats *stats;
+
+  if (G_UNLIKELY (stats_quark == 0))
+    stats_quark = g_quark_from_static_string ("stats");
+
+  stats = g_object_get_qdata (G_OBJECT (widget), stats_quark);
+  if (stats == NULL)
+    {
+      stats = g_new0 (Stats, 1);
+      g_object_set_qdata_full (G_OBJECT (widget), stats_quark, stats, g_free);
+      stats->last_frame = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+      stats->last_stats = stats->last_frame;
+    }
+
+  return stats;
+}
+
+static void
+do_stats (GtkWidget *widget,
+          GtkWidget *info_label,
+          gint      *suggested_change)
+{
+  Stats *stats;
+  gint64 frame_time;
+
+  stats = get_stats (widget);
+  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+
+  if (stats->last_stats + STATS_UPDATE_TIME < frame_time)
+    {
+      char *new_label;
+      guint i, n_frames;
+
+      n_frames = 0;
+      for (i = 0; i < N_STATS; i++)
+        {
+          n_frames += stats->frame_counter[i];
+        }
+
+      new_label = g_strdup_printf ("widgets - %.1f fps",
+                                   (double) G_USEC_PER_SEC * n_frames
+                                       / (N_STATS * STATS_UPDATE_TIME));
+      gtk_label_set_label (GTK_LABEL (info_label), new_label);
+      g_free (new_label);
+
+      if (stats->frame_counter[stats->stats_index] >= 19 * stats->frame_counter_max / 20)
+        {
+          if (stats->last_suggestion > 0)
+            stats->last_suggestion *= 2;
+          else
+            stats->last_suggestion = 1;
+        }
+      else
+        {
+          if (stats->last_suggestion < 0)
+            stats->last_suggestion--;
+          else
+            stats->last_suggestion = -1;
+          stats->last_suggestion = MAX (stats->last_suggestion, 1 - (int) stats->item_counter[stats->stats_index]);
+        }
+
+      stats->stats_index = (stats->stats_index + 1) % N_STATS;
+      stats->frame_counter[stats->stats_index] = 0;
+      stats->item_counter[stats->stats_index] = stats->item_counter[(stats->stats_index + N_STATS - 1) % N_STATS];
+      stats->last_stats = frame_time;
+
+      if (suggested_change)
+        *suggested_change = stats->last_suggestion;
+      else
+        stats->last_suggestion = 0;
+    }
+  else
+    {
+      if (suggested_change)
+        *suggested_change = 0;
+    }
+
+  stats->last_frame = frame_time;
+  stats->frame_counter[stats->stats_index]++;
+  stats->frame_counter_max = MAX (stats->frame_counter_max, stats->frame_counter[stats->stats_index]);
+}
+
+static void
+stats_update (GtkWidget *widget)
+{
+  Stats *stats;
+
+  stats = get_stats (widget);
+
+  stats->item_counter[stats->stats_index] = gtk_fishbowl_get_count (GTK_FISHBOWL (widget));
+}
+
+static gboolean
+move_fish (GtkWidget     *bowl,
+           GdkFrameClock *frame_clock,
+           gpointer       info_label)
+{
+  gint suggested_change = 0;
+
+  do_stats (bowl, info_label, &suggested_change);
+
+  if (suggested_change > 0)
+    {
+      int i;
+
+      for (i = 0; i < suggested_change; i ++)
+        {
+          GtkWidget *new_widget = widget_types[selected_widget_type].create_func ();
+
+          gtk_container_add (GTK_CONTAINER (fishbowl), new_widget);
+
+        }
+    }
+  else if (suggested_change < 0)
+    {
+      GList *children, *l;
+      int n_removed = 0;
+
+      children = gtk_container_get_children (GTK_CONTAINER (fishbowl));
+      for (l = children; l; l = l->next)
+        {
+          gtk_container_remove (GTK_CONTAINER (fishbowl), (GtkWidget *)l->data);
+          n_removed ++;
+
+          if (n_removed >= (-suggested_change))
+            break;
+        }
+
+      g_list_free (children);
+    }
+
+  stats_update (bowl);
+
+  return G_SOURCE_CONTINUE;
+}
+
+static void
+next_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
+{
+  GtkWidget *headerbar = user_data;
+  int new_index;
+
+  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
+    new_index = 0;
+  else
+    new_index = selected_widget_type + 1;
+
+  set_widget_type (headerbar, new_index);
+}
+
+static void
+prev_button_clicked_cb (GtkButton *source,
+                        gpointer   user_data)
+{
+  GtkWidget *headerbar = user_data;
+  int new_index;
+
+  if (selected_widget_type - 1 < 0)
+    new_index = N_WIDGET_TYPES - 1;
+  else
+    new_index = selected_widget_type - 1;
+
+  set_widget_type (headerbar, new_index);
+}
+
+GtkWidget *
+do_widgetbowl (GtkWidget *do_widget)
+{
+  static GtkWidget *window = NULL;
+  static GtkCssProvider *provider = NULL;
+
+  gtk_init ();
+
+  if (provider == NULL)
+    {
+      provider = gtk_css_provider_new ();
+      gtk_css_provider_load_from_data (provider, css, -1);
+      gtk_style_context_add_provider_for_display (gdk_display_get_default (),
+                                                  GTK_STYLE_PROVIDER (provider),
+                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
+
+  if (!window)
+    {
+      GtkWidget *info_label;
+      GtkWidget *count_label;
+      GtkWidget *titlebar;
+      GtkWidget *title_box;
+      GtkWidget *left_box;
+      GtkWidget *next_button;
+      GtkWidget *prev_button;
+
+      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      titlebar = gtk_header_bar_new ();
+      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (titlebar), TRUE);
+      info_label = gtk_label_new ("widget - 00.0 fps");
+      count_label = gtk_label_new ("0");
+      fishbowl = gtk_fishbowl_new ();
+      title_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+      prev_button = gtk_button_new_from_icon_name ("pan-start-symbolic");
+      next_button = gtk_button_new_from_icon_name ("pan-end-symbolic");
+      left_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+      g_object_bind_property (fishbowl, "count", count_label, "label", 0);
+      g_signal_connect (next_button, "clicked", G_CALLBACK (next_button_clicked_cb), titlebar);
+      g_signal_connect (prev_button, "clicked", G_CALLBACK (prev_button_clicked_cb), titlebar);
+
+      gtk_fishbowl_set_animating (GTK_FISHBOWL (fishbowl), TRUE);
+
+      gtk_widget_set_hexpand (title_box, TRUE);
+      gtk_widget_set_halign (title_box, GTK_ALIGN_END);
+
+      gtk_window_set_titlebar (GTK_WINDOW (window), titlebar);
+      gtk_container_add (GTK_CONTAINER (title_box), count_label);
+      gtk_container_add (GTK_CONTAINER (title_box), info_label);
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (titlebar), title_box);
+      gtk_container_add (GTK_CONTAINER (window), fishbowl);
+
+
+      gtk_style_context_add_class (gtk_widget_get_style_context (left_box), "linked");
+      gtk_container_add (GTK_CONTAINER (left_box), prev_button);
+      gtk_container_add (GTK_CONTAINER (left_box), next_button);
+      gtk_header_bar_pack_start (GTK_HEADER_BAR (titlebar), left_box);
+
+      gtk_window_set_display (GTK_WINDOW (window),
+                              gtk_widget_get_display (do_widget));
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
+      gtk_widget_realize (window);
+      gtk_widget_add_tick_callback (fishbowl, move_fish, info_label, NULL);
+
+      set_widget_type (titlebar, 0);
+    }
+
+  if (!gtk_widget_get_visible (window))
+    gtk_widget_show (window);
+  else
+    gtk_widget_destroy (window);
+
+
+  return window;
+}

demos/icon-browser/icon.list

@@ -32,7 +32,7 @@ media-view-subtitles=The icon used to show subtitles in a media player
 
 [network]
 Name=Network
-Description=Icons related to network status
+Description=Icons related to network status");
 
 network-transmit-receive=The icon used data is being both transmitted and received simultaneously, while the computing device is connected to a network
 network-transmit=The icon used when data is being transmitted, while the computing device is connected to a network

demos/icon-browser/iconbrowserwin.c

@@ -54,6 +54,7 @@ struct _IconBrowserWindow
   GtkWidget *image6;
   GtkWidget *label6;
   GtkWidget *description;
+  GtkEventController *controller;
 };
 
 struct _IconBrowserWindowClass
@@ -454,7 +455,6 @@ static void
 icon_browser_window_init (IconBrowserWindow *win)
 {
   GdkContentFormats *list;
-  GtkEventController *controller;
 
   gtk_widget_init_template (GTK_WIDGET (win));
 
@@ -484,9 +484,8 @@ icon_browser_window_init (IconBrowserWindow *win)
 
   symbolic_toggled (GTK_TOGGLE_BUTTON (win->symbolic_radio), win);
 
-  controller = gtk_event_controller_key_new ();
-  g_signal_connect (controller, "key-pressed", G_CALLBACK (key_event_cb), win);
-  gtk_widget_add_controller (GTK_WIDGET (win), controller);
+  win->controller = gtk_event_controller_key_new (GTK_WIDGET (win));
+  g_signal_connect (win->controller, "key-pressed", G_CALLBACK (key_event_cb), win);
 
   populate (win);
 }
@@ -498,6 +497,8 @@ icon_browser_window_finalize (GObject *object)
 
   g_hash_table_unref (win->contexts);
 
+  g_object_unref (win->controller);
+
   G_OBJECT_CLASS (icon_browser_window_parent_class)->finalize (object);
 }
 

demos/widget-factory/widget-factory.c

@@ -1646,6 +1646,7 @@ activate (GApplication *app)
   gint i;
   GPermission *permission;
   GAction *action;
+  GtkGesture *gesture;
 
   g_type_ensure (my_text_view_get_type ());
 
@@ -1670,7 +1671,6 @@ activate (GApplication *app)
   gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
   gtk_builder_add_callback_symbol (builder, "scale_format_value", (GCallback)scale_format_value);
   gtk_builder_add_callback_symbol (builder, "scale_format_value_blank", (GCallback)scale_format_value_blank);
-  gtk_builder_add_callback_symbol (builder, "osd_frame_pressed", (GCallback)osd_frame_pressed);
 
   gtk_builder_connect_signals (builder, NULL);
 
@@ -1888,6 +1888,10 @@ activate (GApplication *app)
   g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget);
   g_signal_connect (adj, "value-changed", G_CALLBACK (adjustment3_value_changed), widget2);
 
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "osd_frame");
+  gesture = gtk_gesture_multi_press_new (widget);
+  g_signal_connect (gesture, "pressed", G_CALLBACK (osd_frame_pressed), widget);
+
   gtk_widget_show (GTK_WIDGET (window));
 
   g_object_unref (builder);

demos/widget-factory/widget-factory.ui

@@ -468,8 +468,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <child>
                           <object class="GtkEntry" id="entry1">
                             <property name="can-focus">1</property>
-                            <property name="enable-emoji-completion">1</property>
-                            <property name="invisible_char">•</property>
+                            <property name="invisible-char">•</property>
                             <property name="placeholder-text" translatable="yes">Click icon to change mode</property>
                             <property name="secondary-icon-name">view-refresh-symbolic</property>
                             <property name="secondary-icon-tooltip-text">Change mode</property>
@@ -3101,11 +3100,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 </child>
                               </object>
                             </child>
-                            <child>
-                              <object class="GtkGestureMultiPress">
-                                <signal name="pressed" handler="osd_frame_pressed" object="osd_frame" swapped="no"/>
-                              </object>
-                            </child>
                           </object>
                         </child>
                       </object>

docs/dnd_internals.txt

@@ -71,6 +71,9 @@ straightforward manner.
 void             gdk_drag_status        (GdkDragContext   *context,
 				         GdkDragAction     action,
 					 guint32           time);
+void             gdk_drop_reply         (GdkDragContext   *context,
+					 gboolean          ok,
+					 guint32           time);
 void             gdk_drop_finish        (GdkDragContext   *context,
 					 gboolean          success,
 					 guint32           time);

docs/reference/gdk/gdk4-docs.xml

@@ -27,12 +27,12 @@
     <xi:include href="xml/gdkmonitor.xml" />
     <xi:include href="xml/regions.xml" />
     <xi:include href="xml/textures.xml" />
-    <xi:include href="xml/gdkpaintable.xml" />
     <xi:include href="xml/rgba_colors.xml" />
     <xi:include href="xml/cursors.xml" />
-    <xi:include href="xml/gdksurface.xml" />
+    <xi:include href="xml/windows.xml" />
     <xi:include href="xml/gdkframeclock.xml" />
     <xi:include href="xml/gdkframetimings.xml" />
+    <xi:include href="xml/gdkdrawingcontext.xml" />
     <xi:include href="xml/gdkdrawcontext.xml" />
     <xi:include href="xml/gdkglcontext.xml" />
     <xi:include href="xml/gdkvulkancontext.xml" />

docs/reference/gdk/gdk4-sections.txt

@@ -167,8 +167,8 @@ gdk_rgba_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>GdkSurface</TITLE>
-<FILE>gdksurface</FILE>
+<TITLE>Windows</TITLE>
+<FILE>windows</FILE>
 GdkSurface
 GdkSurfaceType
 GdkSurfaceClass
@@ -233,6 +233,10 @@ gdk_surface_set_opaque_region
 gdk_surface_create_gl_context
 gdk_surface_create_vulkan_context
 
+<SUBSECTION>
+gdk_surface_begin_draw_frame
+gdk_surface_end_draw_frame
+
 <SUBSECTION>
 gdk_surface_invalidate_rect
 gdk_surface_invalidate_region
@@ -627,6 +631,7 @@ GDK_BUTTON_SECONDARY
 <SUBSECTION>
 gdk_event_new
 gdk_event_copy
+gdk_event_free
 gdk_event_get_axes
 gdk_event_get_button
 gdk_event_get_click_count
@@ -654,7 +659,7 @@ gdk_event_get_crossing_detail
 gdk_event_get_crossing_mode
 gdk_event_get_drag_context
 gdk_event_get_focus_in
-gdk_event_get_grab_surface
+gdk_event_get_grab_window
 gdk_event_get_motion_history
 gdk_event_get_key_group
 gdk_event_get_key_is_modifier
@@ -697,27 +702,20 @@ gdk_event_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gdkpaintable</FILE>
-<TITLE>GdkPaintable/TITLE>
+<TITLE>Paintable</TITLE>
+<FILE>paintable</FILE>
 GdkPaintable
-GdkPaintableFlags
-gdk_paintable_get_current_image
 gdk_paintable_snapshot
+gdk_paintable_get_current_image
 gdk_paintable_get_flags
 gdk_paintable_get_intrinsic_width
 gdk_paintable_get_intrinsic_height
 gdk_paintable_get_intrinsic_aspect_ratio
 gdk_paintable_compute_concrete_size
-
-<SUBSECTION>
 gdk_paintable_invalidate_contents
 gdk_paintable_invalidate_size
 gdk_paintable_new_empty
-
-<SUBSECTION Private>
-GDK_TYPE_PAINTABLE
-gdk_paintable_get_type
-</SECTION>
+<SECTION>
 
 <SECTION>
 <TITLE>Textures</TITLE>
@@ -731,7 +729,7 @@ gdk_texture_get_height
 gdk_texture_download
 gdk_texture_save_to_png
 GdkMemoryFormat
-GDK_MEMORY_DEFAULT
+GDK_MEMORY_FORMAT_DEFAULT
 gdk_memory_texture_new
 gdk_gl_texture_new
 gdk_gl_texture_release
@@ -781,11 +779,13 @@ gdk_cursor_get_type
 <FILE>dnd</FILE>
 GdkDragContext
 GdkDragCancelReason
+gdk_drop_reply
 gdk_drag_drop_done
 gdk_drag_begin
 gdk_drop_finish
 GdkDragAction
 gdk_drag_status
+gdk_drag_drop_succeeded
 
 gdk_drag_context_get_display
 gdk_drag_context_get_actions
@@ -1106,10 +1106,6 @@ gdk_frame_timings_get_type
 GdkDrawContext
 gdk_draw_context_get_display
 gdk_draw_context_get_surface
-gdk_draw_context_begin_frame
-gdk_draw_context_end_frame
-gdk_draw_context_is_in_frame
-gdk_draw_context_get_frame_region
 
 <SUBSECTION Standard>
 GDK_DRAW_CONTEXT
@@ -1143,6 +1139,7 @@ gdk_gl_context_is_legacy
 <SUBSECTION>
 GdkGLError
 gdk_gl_context_realize
+gdk_gl_context_get_damage
 gdk_gl_context_make_current
 gdk_gl_context_get_current
 gdk_gl_context_clear_current
@@ -1187,12 +1184,21 @@ GDK_IS_MONITOR
 </SECTION>
 
 <SECTION>
-<FILE>gdkcairocontext</FILE>
-GdkCairoContext
-gdk_cairo_context_cairo_create
+<FILE>gdkdrawingcontext</FILE>
+GdkDrawingContext
+gdk_drawing_context_get_clip
+gdk_drawing_context_get_cairo_context
+gdk_drawing_context_get_paint_context
 
 <SUBSECTION Standard>
-gdk_cairo_context_get_type
+gdk_drawing_context_get_type
+GdkDrawingContextClass
+GDK_TYPE_DRAWING_CONTEXT
+GDK_DRAWING_CONTEXT_CLASS
+GDK_DRAWING_CONTEXT_GET_CLASS
+GDK_IS_DRAWING_CONTEXT_CLASS
+GDK_DRAWING_CONTEXT
+GDK_IS_DRAWING_CONTEXT
 </SECTION>
 
 <SECTION>
@@ -1324,4 +1330,3 @@ GDK_CONTENT_DESERIALIZER
 GDK_IS_CONTENT_DESERIALIZER
 gdk_content_deserializer_get_type
 </SECTION>
-

docs/reference/gdk/gdk4.types

@@ -1,26 +1,18 @@
 gdk_app_launch_context_get_type
-gdk_clipboard_get_type
-gdk_content_deserializer_get_type
-gdk_content_formats_get_type
-gdk_content_serializer_get_type
 gdk_cursor_get_type
 gdk_device_get_type
 gdk_device_pad_get_type
-gdk_device_tool_get_type
 gdk_display_get_type
 gdk_display_manager_get_type
 gdk_drag_context_get_type
-gdk_event_get_type
+gdk_drawing_context_get_type
 gdk_frame_clock_get_type
 gdk_gl_context_get_type
-gdk_gl_texture_get_type
 gdk_keymap_get_type
-gdk_memory_texture_get_type
 gdk_monitor_get_type
-gdk_paintable_get_type
-gdk_rgba_get_type
 gdk_seat_get_type
-gdk_snapshot_get_type
 gdk_surface_get_type
-gdk_texture_get_type
-gdk_vulkan_context_get_type
+gdk_content_serializer_get_type
+gdk_content_deserializer_get_type
+gdk_clipboard_get_type
+gdk_content_formats_get_type

docs/reference/gdk/meson.build

@@ -3,6 +3,7 @@ private_headers = [
   'gdkmarshalers.h',
   'gdkkeysyms.h',
   'gdkinternals.h',
+  'gdkprivate.h',
   'gdk-private.h',
   'gdkapplaunchcontextprivate.h',
   'gdkclipboardprivate.h',
@@ -10,39 +11,31 @@ private_headers = [
   'gdkcontentproviderprivate.h',
   'gdkcursorprivate.h',
   'gdkdeviceprivate.h',
-  'gdkdevicepadprivate.h',
-  'gdkdevicetoolprivate.h',
   'gdkdisplaymanagerprivate.h',
   'gdkdisplayprivate.h',
   'gdkdndprivate.h',
   'gdkdrawcontextprivate.h',
   'gdkeventsprivate.h',
-  'gdkframeclockidleprivate.h',
   'gdkframeclockprivate.h',
   'gdkglcontextprivate.h',
-  'gdkgltextureprivate.h',
   'gdkkeysprivate.h',
   'gdkmonitorprivate.h',
-  'gdkmemorytextureprivate.h',
   'gdkpipeiostreamprivate.h',
   'gdkscreenprivate.h',
   'gdkseatdefaultprivate.h',
   'gdkseatprivate.h',
-  'gdksnapshotprivate.h',
-  'gdksurfaceimpl.h',
   'gdktextureprivate.h',
+  'gdkvisualprivate.h',
   'gdkvulkancontextprivate.h',
   'keyname-table.h',
-  'gdkprivate-x11.h',
+  'x11/gdkprivate-x11.h',
   'x11/gdkeventsource.h',
-  'gtk-primary-selection-client-protocol.h',
-  'gtk-shell-client-protocol.h',
-  'keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h',
-  'pointer-gestures-unstable-v1-client-protocol.h',
-  'server-decoration-client-protocol.h',
-  'tablet-unstable-v2-client-protocol.h',
-  'xdg-foreign-unstable-v1-client-protocol.h',
-  'xdg-shell-unstable-v6-client-protocol.h',
+  'wayland/keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h',
+  'wayland/pointer-gestures-unstable-v1-client-protocol.h',
+  'wayland/server-decoration-client-protocol.h',
+  'wayland/tablet-unstable-v2-client-protocol.h',
+  'wayland/xdg-foreign-unstable-v1-client-protocol.h',
+  'wayland/xdg-shell-unstable-v6-client-protocol.h',
   'win32',
   'quartz',
   'broadway',
@@ -93,12 +86,13 @@ gnome.gtkdoc('gdk4',
              mode: 'none',
              main_xml: 'gdk4-docs.xml',
              src_dir: [
-               gdkinc,
-               gdkx11_inc,
-               gdkwayland_inc,
+	       join_paths(meson.source_root(), 'gdk'),
+	       join_paths(meson.source_root(), 'gdk', 'x11'),
+	       join_paths(meson.source_root(), 'gdk', 'wayland'),
+	       join_paths(meson.build_root(), 'gdk'),
 	     ],
              dependencies: libgtk_dep,
-             gobject_typesfile: join_paths(meson.current_source_dir(), 'gdk4.types'),
+             gobject_typesfile: join_paths(meson.source_root(), 'docs/reference/gdk/gdk4.types'),
              scan_args: [
                '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
                '--ignore-headers=' + ' '.join(private_headers),

docs/reference/gsk/gsk4-sections.txt

@@ -29,6 +29,8 @@ gsk_render_node_serialize
 gsk_render_node_deserialize
 gsk_render_node_write_to_file
 GskScalingFilter
+gsk_render_node_set_name
+gsk_render_node_get_name
 gsk_render_node_get_bounds
 
 <SUBSECTION Nodes>
@@ -68,10 +70,6 @@ gsk_container_node_get_child
 gsk_transform_node_new
 gsk_transform_node_get_child
 gsk_transform_node_peek_transform
-gsk_offset_node_new
-gsk_offset_node_get_child
-gsk_offset_node_get_x_offset
-gsk_offset_node_get_y_offset
 gsk_opacity_node_new
 gsk_opacity_node_get_child
 gsk_opacity_node_get_opacity
@@ -110,9 +108,6 @@ gsk_text_node_get_y
 gsk_blur_node_new
 gsk_blur_node_get_child
 gsk_blur_node_get_radius
-gsk_debug_node_new
-gsk_debug_node_get_child
-gsk_debug_node_get_message
 <SUBSECTION Standard>
 GSK_IS_RENDER_NODE
 GSK_RENDER_NODE

docs/reference/gsk/meson.build

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

docs/reference/gtk/broadway.xml

@@ -46,7 +46,7 @@ broadwayd :5
 Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
 Start your applications like this:
 <programlisting>
-GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
+GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk3-demo
 </programlisting>
 </para>
 

docs/reference/gtk/building.sgml

@@ -294,52 +294,13 @@ How to compile GTK+ itself
           <command>meson</command>
           <sbr/>
           <group>
-            <arg choice="plain">-Dx11-backend=true</arg>
-            <arg choice="plain">-Dx11-backend=false</arg>
+            <arg choice="plain">-Ddocumentation=true</arg>
+            <arg choice="plain">-Ddocumentation=false</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">-Dwayland-backend=true</arg>
-            <arg choice="plain">-Dwayland-backend=false</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">-Dbroadway-backend=true</arg>
-            <arg choice="plain">-Dbroadway-backend=false</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">-Dwin32-backend=true</arg>
-            <arg choice="plain">-Dwin32-backend=false</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">-Dquartz-backend=true</arg>
-            <arg choice="plain">-Dquartz-backend=false</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">-Dmedia=gstreamer</arg>
-            <arg choice="plain">-Dmedia=ffmpeg</arg>
-            <arg choice="plain">-Dmedia=all</arg>
-            <arg choice="plain">-Dmedia=none</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">-Dvulkan=yes</arg>
-            <arg choice="plain">-Dvulkan=no</arg>
-            <arg choice="plain">-Dvulkan=auto</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">-Dxinerama=yes</arg>
-            <arg choice="plain">-Dxinerama=no</arg>
-            <arg choice="plain">-Dxinerama=auto</arg>
-          </group>
-          <sbr/>
-          <group>
-            <arg choice="plain">-Dcloudproviders=true</arg>
-            <arg choice="plain">-Dcloudproviders=false</arg>
+            <arg choice="plain">-Dman-pages=true</arg>
+            <arg choice="plain">-Dman-pages=false</arg>
           </group>
           <sbr/>
           <group>
@@ -355,13 +316,45 @@ How to compile GTK+ itself
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">-Ddocumentation=true</arg>
-            <arg choice="plain">-Ddocumentation=false</arg>
+            <arg choice="plain">-Dvulkan=yes</arg>
+            <arg choice="plain">-Dvulkan=no</arg>
+            <arg choice="plain">-Dvulkan=auto</arg>
           </group>
           <sbr/>
           <group>
-            <arg choice="plain">-Dman-pages=true</arg>
-            <arg choice="plain">-Dman-pages=false</arg>
+            <arg choice="plain">-Dx11-backend=true</arg>
+            <arg choice="plain">-Dx11-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dcloudproviders=true</arg>
+            <arg choice="plain">-Dcloudproviders=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dxinerama=yes</arg>
+            <arg choice="plain">-Dxinerama=no</arg>
+            <arg choice="plain">-Dxinerama=auto</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dwin32-backend=true</arg>
+            <arg choice="plain">-Dwin32-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dquartz-backend=true</arg>
+            <arg choice="plain">-Dquartz-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dbroadway-backend=true</arg>
+            <arg choice="plain">-Dbroadway-backend=false</arg>
+          </group>
+          <sbr/>
+          <group>
+            <arg choice="plain">-Dwayland-backend=true</arg>
+            <arg choice="plain">-Dwayland-backend=false</arg>
           </group>
           <sbr/>
           <group>

docs/reference/gtk/getting_started.xml

@@ -50,7 +50,7 @@
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-0 example-0.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-0 example-0.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
 
@@ -160,7 +160,7 @@
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-1 example-1.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-1 example-1.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
   </section>
@@ -238,7 +238,7 @@
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-2 example-2.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-2 example-2.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
   </section>
@@ -264,7 +264,7 @@
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-3 example-3.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-3 example-3.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
 
@@ -1078,7 +1078,7 @@ example_app_window_init (ExampleAppWindow *win)
     <para>
       You can compile the program above with GCC using:
       <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-4.0` -o example-4 example-4.c `pkg-config --libs gtk+-4.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-4 example-4.c `pkg-config --libs gtk+-3.0`</literal>
       </literallayout>
     </para>
   </section>

docs/reference/gtk/gtk4-broadwayd.xml

@@ -52,7 +52,7 @@ gtk4-broadwayd :5
 Then point your web browser at <literal>http://127.0.0.1:8085</literal>.
 Start your applications like this:
 <programlisting>
-GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk4-demo
+GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 gtk3-demo
 </programlisting>
 
 You can add password protection for your session by creating a file in

docs/reference/gtk/gtk4-docs.xml

@@ -99,15 +99,6 @@
       <xi:include href="xml/gtklevelbar.xml" />
       <xi:include href="xml/gtkstatusbar.xml" />
       <xi:include href="xml/gtkaccellabel.xml" />
-      <xi:include href="xml/gtkcalendar.xml" />
-    </chapter>
-
-    <chapter id="MediaSupport">
-      <title>Media Support</title>
-      <xi:include href="xml/gtkvideo.xml" />
-      <xi:include href="xml/gtkmediacontrols.xml" />
-      <xi:include href="xml/gtkmediastream.xml" />
-      <xi:include href="xml/gtkmediafile.xml" />
     </chapter>
 
     <chapter id="ButtonWidgets">
@@ -219,12 +210,6 @@
       <xi:include href="xml/gtkfontchooserdialog.xml" />
     </chapter>
 
-    <chapter id="DrawingWidgets">
-      <title>Widgets for custom drawing</title>
-      <xi:include href="xml/gtkdrawingarea.xml" />
-      <xi:include href="xml/gtkglarea.xml" />
-    </chapter>
-
     <chapter id="Ornaments">
       <title>Ornaments</title>
       <xi:include href="xml/gtkframe.xml" />
@@ -236,7 +221,6 @@
       <xi:include href="xml/gtkscrollbar.xml" />
       <xi:include href="xml/gtkscrolledwindow.xml" />
       <xi:include href="xml/gtkscrollable.xml" />
-      <xi:include href="xml/gtkviewport.xml" />
     </chapter>
 
     <chapter id="Printing">
@@ -263,12 +247,16 @@
     <chapter id="MiscObjects">
       <title>Miscellaneous</title>
       <xi:include href="xml/gtkadjustment.xml" />
+      <xi:include href="xml/gtkcalendar.xml" />
+      <xi:include href="xml/gtkdrawingarea.xml" />
+      <xi:include href="xml/gtkglarea.xml" />
       <xi:include href="xml/gtkimcontextsimple.xml" />
       <xi:include href="xml/gtkimmulticontext.xml" />
       <xi:include href="xml/gtksizegroup.xml" />
       <xi:include href="xml/gtktooltip.xml" />
+      <xi:include href="xml/gtkviewport.xml" />
+      <xi:include href="xml/gtkaccessible.xml" />
       <xi:include href="xml/gtksnapshot.xml" />
-      <xi:include href="xml/gtkwidgetpaintable.xml" />
     </chapter>
 
     <chapter id="AbstractObjects">
@@ -280,7 +268,6 @@
       <xi:include href="xml/gtkrange.xml" />
       <xi:include href="xml/gtkimcontext.xml" />
       <xi:include href="xml/gtknativedialog.xml" />
-      <xi:include href="xml/gtkaccessible.xml" />
     </chapter>
 
     <chapter id="RecentDocuments">
@@ -310,7 +297,6 @@
       <xi:include href="xml/gtkgestureswipe.xml" />
       <xi:include href="xml/gtkgesturerotate.xml" />
       <xi:include href="xml/gtkgesturezoom.xml" />
-      <xi:include href="xml/gtkgesturestylus.xml" />
       <xi:include href="xml/gtkpadcontroller.xml" />
     </chapter>
 

docs/reference/gtk/gtk4-sections.txt

@@ -1270,6 +1270,8 @@ gtk_fixed_get_type
 GtkFontButton
 gtk_font_button_new
 gtk_font_button_new_with_font
+gtk_font_button_set_font_name
+gtk_font_button_get_font_name
 gtk_font_button_set_use_font
 gtk_font_button_get_use_font
 gtk_font_button_set_use_size
@@ -1300,7 +1302,7 @@ gtk_font_chooser_set_font
 gtk_font_chooser_get_font_desc
 gtk_font_chooser_set_font_desc
 gtk_font_chooser_get_font_features
-gtk_font_chooser_set_language
+gtk_font_chooser_get_font_language
 gtk_font_chooser_get_preview_text
 gtk_font_chooser_set_preview_text
 gtk_font_chooser_get_show_preview_entry
@@ -1481,24 +1483,24 @@ GtkIconViewPrivate
 <TITLE>GtkImage</TITLE>
 GtkImage
 GtkImageType
-gtk_image_new
-gtk_image_new_from_file
-gtk_image_new_from_resource
-gtk_image_new_from_pixbuf
-gtk_image_new_from_paintable
-gtk_image_new_from_icon_name
-gtk_image_new_from_gicon
-gtk_image_clear
-gtk_image_set_from_file
-gtk_image_set_from_resource
-gtk_image_set_from_pixbuf
-gtk_image_set_from_paintable
-gtk_image_set_from_icon_name
-gtk_image_set_from_gicon
-gtk_image_get_storage_type
-gtk_image_get_paintable
+gtk_image_get_texture
 gtk_image_get_icon_name
 gtk_image_get_gicon
+gtk_image_get_storage_type
+gtk_image_new_from_file
+gtk_image_new_from_pixbuf
+gtk_image_new_from_icon_name
+gtk_image_new_from_gicon
+gtk_image_new_from_resource
+gtk_image_new_from_texture
+gtk_image_set_from_file
+gtk_image_set_from_pixbuf
+gtk_image_set_from_icon_name
+gtk_image_set_from_gicon
+gtk_image_set_from_resource
+gtk_image_set_from_texture
+gtk_image_clear
+gtk_image_new
 gtk_image_set_pixel_size
 gtk_image_get_pixel_size
 gtk_image_set_icon_size
@@ -1921,8 +1923,8 @@ gtk_info_bar_set_message_type
 gtk_info_bar_get_message_type
 gtk_info_bar_get_action_area
 gtk_info_bar_get_content_area
-gtk_info_bar_get_show_close_button
-gtk_info_bar_set_show_close_button
+gtk_info_bar_get_show_title_buttons
+gtk_info_bar_set_show_title_buttons
 gtk_info_bar_get_revealed
 gtk_info_bar_set_revealed
 
@@ -4170,10 +4172,15 @@ gtk_volume_button_get_type
 <TITLE>GtkSnapshot</TITLE>
 GtkSnapshot
 gtk_snapshot_new
+gtk_snapshot_ref
+gtk_snapshot_unref
 gtk_snapshot_to_node
 gtk_snapshot_to_paintable
 gtk_snapshot_free_to_node
 gtk_snapshot_free_to_paintable
+gtk_snapshot_get_renderer
+gtk_snapshot_get_record_names
+gtk_snapshot_push
 gtk_snapshot_push_transform
 gtk_snapshot_push_opacity
 gtk_snapshot_push_color_matrix
@@ -4190,6 +4197,7 @@ gtk_snapshot_append_cairo
 gtk_snapshot_append_texture
 gtk_snapshot_append_color
 gtk_snapshot_append_layout
+gtk_snapshot_clips_rect
 gtk_snapshot_render_background
 gtk_snapshot_render_frame
 gtk_snapshot_render_focus
@@ -4265,8 +4273,6 @@ gtk_widget_get_toplevel
 gtk_widget_get_ancestor
 gtk_widget_is_ancestor
 gtk_widget_translate_coordinates
-gtk_widget_add_controller
-gtk_widget_remove_controller
 gtk_widget_set_direction
 GtkTextDirection
 gtk_widget_get_direction
@@ -4334,7 +4340,6 @@ gtk_widget_get_can_focus
 gtk_widget_set_can_focus
 gtk_widget_get_focus_on_click
 gtk_widget_set_focus_on_click
-gtk_widget_set_focus_child
 gtk_widget_get_has_surface
 gtk_widget_set_has_surface
 gtk_widget_get_sensitive
@@ -4886,6 +4891,7 @@ gtk_render_line
 gtk_render_option
 gtk_render_slider
 gtk_render_activity
+gtk_render_icon_surface
 gtk_render_icon
 gtk_render_insertion_cursor
 
@@ -5272,7 +5278,6 @@ gtk_printer_request_details
 gtk_printer_get_capabilities
 gtk_printer_get_default_page_size
 gtk_printer_get_hard_margins
-gtk_printer_get_hard_margins_for_paper_size
 GtkPrinterFunc
 gtk_enumerate_printers
 
@@ -6471,24 +6476,6 @@ GTK_EVENT_CONTROLLER_MOTION_GET_CLASS
 gtk_event_controller_motion_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkeventcontrollerkey</FILE>
-<TITLE>GtkEventControlerKey</TITLE>
-GtkEventControllerKey
-gtk_event_controller_key_new
-
-<SUBSECTION Standard>
-GTK_TYPE_EVENT_CONTROLLER_KEY
-GTK_EVENT_CONTROLLER_KEY
-GTK_EVENT_CONTROLLER_KEY_CLASS
-GTK_IS_EVENT_CONTROLLER_KEY
-GTK_IS_EVENT_CONTROLLER_KEY_CLASS
-GTK_EVENT_CONTROLLER_KEY_GET_CLASS
-
-<SUBSECTION Private>
-gtk_event_controller_key_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkgesturedrag</FILE>
 <TITLE>GtkGestureDrag</TITLE>
@@ -6647,39 +6634,15 @@ GTK_PAD_CONTROLLER_GET_CLASS
 gtk_pad_controller_get_type
 </SECTION>
 
-<SECTION>
-<FILE>gtkgesturestylus</FILE>
-<TITLE>GtkGestureStylus</TITLE>
-GtkGestureStylus
-
-gtk_gesture_stylus_new
-gtk_gesture_stylus_get_axis
-gtk_gesture_stylus_get_axes
-gtk_gesture_stylus_get_backlog
-gtk_gesture_stylus_get_device_tool
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_STYLUS
-GTK_GESTURE_STYLUS
-GTK_GESTURE_STYLUS_CLASS
-GTK_IS_GESTURE_STYLUS
-GTK_IS_GESTURE_STYLUS_CLASS
-GTK_GESTURE_STYLUS_GET_CLASS
-GtkGestureStylusClass
-
-<SUBSECTION Private>
-gtk_gesture_stylus_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkstacksidebar</FILE>
 GtkStackSidebar
+GtkStackSidebarClass
 gtk_stack_sidebar_new
 gtk_stack_sidebar_set_stack
 gtk_stack_sidebar_get_stack
 
 <SUBSECTION Standard>
-GtkStackSidebarClass
 GTK_TYPE_STACK_SIDEBAR
 GTK_STACK_SIDEBAR
 GTK_STACK_SIDEBAR_CLASS
@@ -6704,6 +6667,8 @@ gtk_gl_area_attach_buffers
 gtk_gl_area_set_error
 gtk_gl_area_get_error
 <SUBSECTION>
+gtk_gl_area_set_has_alpha
+gtk_gl_area_get_has_alpha
 gtk_gl_area_set_has_depth_buffer
 gtk_gl_area_get_has_depth_buffer
 gtk_gl_area_set_has_stencil_buffer
@@ -6810,102 +6775,3 @@ GTK_SHORTCUT_LABEL_GET_CLASS
 GTK_IS_SHORTCUT_LABEL
 GTK_IS_SHORTCUT_LABEL_CLASS
 </SECTION>
-
-<SECTION>
-<FILE>gtkvideo</FILE>
-GtkVideo
-gtk_video_new
-gtk_video_new_for_media_stream
-gtk_video_new_for_file
-gtk_video_new_for_filename
-gtk_video_new_for_resource
-gtk_video_get_media_stream
-gtk_video_set_media_stream
-gtk_video_get_file
-gtk_video_set_file
-gtk_video_set_filename
-gtk_video_set_resource
-gtk_video_get_autoplay
-gtk_video_set_autoplay
-gtk_video_get_loop
-gtk_video_set_loop
-
-<SUBSECTION Private>
-gtk_video_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkmediacontrols</FILE>
-GtkMediaControls
-gtk_media_controls_new
-gtk_media_controls_get_media_stream
-gtk_media_controls_set_media_stream
-
-<SUBSECTION Private>
-gtk_media_controls_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkmediafile</FILE>
-GtkMediaFile
-gtk_media_file_new
-gtk_media_file_new_for_filename
-gtk_media_file_new_for_resource
-gtk_media_file_new_for_file
-gtk_media_file_new_for_input_stream
-gtk_media_file_clear
-gtk_media_file_set_filename
-gtk_media_file_set_resource
-gtk_media_file_set_file
-gtk_media_file_get_file
-gtk_media_file_set_input_stream
-gtk_media_file_get_input_stream
-
-<SUBSECTION Private>
-GTK_TYPE_MEDIA_FILE
-gtk_media_file_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkmediastream</FILE>
-GtkMediaStream
-GtkMediaStreamClass
-
-gtk_media_stream_is_prepared
-gtk_media_stream_get_error
-gtk_media_stream_has_audio
-gtk_media_stream_has_video
-gtk_media_stream_play
-gtk_media_stream_pause
-gtk_media_stream_get_playing
-gtk_media_stream_set_playing
-gtk_media_stream_get_ended
-gtk_media_stream_get_timestamp
-gtk_media_stream_get_duration
-gtk_media_stream_is_seekable
-gtk_media_stream_is_seeking
-gtk_media_stream_seek
-gtk_media_stream_get_loop
-gtk_media_stream_set_loop
-gtk_media_stream_get_muted
-gtk_media_stream_set_muted
-gtk_media_stream_get_volume
-gtk_media_stream_set_volume
-gtk_media_stream_realize
-gtk_media_stream_unrealize
-
-<SUBSECTION>
-gtk_media_stream_prepared
-gtk_media_stream_unprepared
-gtk_media_stream_update
-gtk_media_stream_ended
-gtk_media_stream_seek_success
-gtk_media_stream_seek_failed
-gtk_media_stream_gerror
-gtk_media_stream_error
-gtk_media_stream_error_valist
-
-<SUBSECTION Private>
-GTK_TYPE_MEDIA_STREAM
-gtk_media_stream_get_type
-</SECTION>

docs/reference/gtk/gtk4.types.in

@@ -53,9 +53,8 @@ gtk_entry_buffer_get_type
 gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_controller_get_type
-gtk_event_controller_key_get_type
-gtk_event_controller_motion_get_type
 gtk_event_controller_scroll_get_type
+gtk_event_controller_motion_get_type
 gtk_expander_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
@@ -77,7 +76,6 @@ gtk_gesture_multi_press_get_type
 gtk_gesture_pan_get_type
 gtk_gesture_rotate_get_type
 gtk_gesture_single_get_type
-gtk_gesture_stylus_get_type
 gtk_gesture_swipe_get_type
 gtk_gesture_zoom_get_type
 gtk_gl_area_get_type
@@ -98,9 +96,6 @@ gtk_list_store_get_type
 gtk_list_box_get_type
 gtk_list_box_row_get_type
 gtk_lock_button_get_type
-gtk_media_controls_get_type
-gtk_media_file_get_type
-gtk_media_stream_get_type
 gtk_menu_bar_get_type
 gtk_menu_button_get_type
 gtk_menu_get_type
@@ -184,7 +179,6 @@ gtk_tree_sortable_get_type
 gtk_tree_store_get_type
 gtk_tree_view_column_get_type
 gtk_tree_view_get_type
-gtk_video_get_type
 gtk_viewport_get_type
 gtk_volume_button_get_type
 gtk_widget_get_type

docs/reference/gtk/meson.build

@@ -1,195 +1,4 @@
 private_headers = [
-  'gdkpixbufutilsprivate.h',
-  'gtkaccelgroupprivate.h',
-  'gtkaccelmapprivate.h',
-  'gtkactionhelperprivate.h',
-  'gtkactionmuxerprivate.h',
-  'gtkadjustmentprivate.h',
-  'gtkallocatedbitmaskprivate.h',
-  'gtkappchooserprivate.h',
-  'gtkapplicationaccelsprivate.h',
-  'gtkapplicationprivate.h',
-  'gtkbindingsprivate.h',
-  'gtkbitmaskprivate.h',
-  'gtkboxprivate.h',
-  'gtkbuilderprivate.h',
-  'gtkbuttonprivate.h',
-  'gtkcellareaboxcontextprivate.h',
-  'gtkcheckbuttonprivate.h',
-  'gtkcheckmenuitemprivate.h',
-  'gtkcolorchooserprivate.h',
-  'gtkcoloreditorprivate.h',
-  'gtkcolorplaneprivate.h',
-  'gtkcolorscaleprivate.h',
-  'gtkcolorswatchprivate.h',
-  'gtkcomboboxprivate.h',
-  'gtkcontainerprivate.h',
-  'gtkcssanimatedstyleprivate.h',
-  'gtkcssanimationprivate.h',
-  'gtkcssarrayvalueprivate.h',
-  'gtkcssbgsizevalueprivate.h',
-  'gtkcssbordervalueprivate.h',
-  'gtkcsscalcvalueprivate.h',
-  'gtkcsscolorvalueprivate.h',
-  'gtkcsscornervalueprivate.h',
-  'gtkcssdimensionvalueprivate.h',
-  'gtkcssdynamicprivate.h',
-  'gtkcsseasevalueprivate.h',
-  'gtkcssenumvalueprivate.h',
-  'gtkcssfiltervalueprivate.h',
-  'gtkcssfontfeaturesvalueprivate.h',
-  'gtkcssfontvariationsvalueprivate.h',
-  'gtkcssiconthemevalueprivate.h',
-  'gtkcssimagebuiltinprivate.h',
-  'gtkcssimagecrossfadeprivate.h',
-  'gtkcssimagefallbackprivate.h',
-  'gtkcssimageiconthemeprivate.h',
-  'gtkcssimageinvalidprivate.h',
-  'gtkcssimagelinearprivate.h',
-  'gtkcssimagepaintableprivate.h',
-  'gtkcssimageprivate.h',
-  'gtkcssimageradialprivate.h',
-  'gtkcssimagerecolorprivate.h',
-  'gtkcssimagescaledprivate.h',
-  'gtkcssimageurlprivate.h',
-  'gtkcssimagevalueprivate.h',
-  'gtkcssimagewin32private.h',
-  'gtkcssinheritvalueprivate.h',
-  'gtkcssinitialvalueprivate.h',
-  'gtkcsskeyframesprivate.h',
-  'gtkcsslookupprivate.h',
-  'gtkcssmatcherprivate.h',
-  'gtkcssnodedeclarationprivate.h',
-  'gtkcssnodeprivate.h',
-  'gtkcssnodestylecacheprivate.h',
-  'gtkcssnumbervalueprivate.h',
-  'gtkcsspalettevalueprivate.h',
-  'gtkcssparserprivate.h',
-  'gtkcsspathnodeprivate.h',
-  'gtkcsspositionvalueprivate.h',
-  'gtkcssproviderprivate.h',
-  'gtkcssrepeatvalueprivate.h',
-  'gtkcssrgbavalueprivate.h',
-  'gtkcsssectionprivate.h',
-  'gtkcssselectorprivate.h',
-  'gtkcssshadowsvalueprivate.h',
-  'gtkcssshadowvalueprivate.h',
-  'gtkcssshorthandpropertyprivate.h',
-  'gtkcssstaticstyleprivate.h',
-  'gtkcssstringvalueprivate.h',
-  'gtkcssstylechangeprivate.h',
-  'gtkcssstyleprivate.h',
-  'gtkcssstylepropertyprivate.h',
-  'gtkcsstransformvalueprivate.h',
-  'gtkcsstransientnodeprivate.h',
-  'gtkcsstransitionprivate.h',
-  'gtkcsstypesprivate.h',
-  'gtkcssunsetvalueprivate.h',
-  'gtkcssvalueprivate.h',
-  'gtkcsswidgetnodeprivate.h',
-  'gtkcsswin32sizevalueprivate.h',
-  'gtkdialogprivate.h',
-  'gtkdndprivate.h',
-  'gtkentryprivate.h',
-  'gtkeventcontrollerlegacyprivate.h',
-  'gtkeventcontrollerprivate.h',
-  'gtkfilechoosererrorstackprivate.h',
-  'gtkfilechoosernativeprivate.h',
-  'gtkfilechooserprivate.h',
-  'gtkfilechooserwidgetprivate.h',
-  'gtkfilefilterprivate.h',
-  'gtkfontchooserprivate.h',
-  'gtkfontchooserwidgetprivate.h',
-  'gtkgesturedragprivate.h',
-  'gtkgesturelongpressprivate.h',
-  'gtkgesturemultipressprivate.h',
-  'gtkgesturepanprivate.h',
-  'gtkgestureprivate.h',
-  'gtkgesturerotateprivate.h',
-  'gtkgesturesingleprivate.h',
-  'gtkgesturestylusprivate.h',
-  'gtkgestureswipeprivate.h',
-  'gtkgesturezoomprivate.h',
-  'gtkgizmoprivate.h',
-  'gtkheaderbarprivate.h',
-  'gtkhslaprivate.h',
-  'gtkiconcacheprivate.h',
-  'gtkiconcachevalidatorprivate.h',
-  'gtkiconhelperprivate.h',
-  'gtkiconprivate.h',
-  'gtkiconthemeprivate.h',
-  'gtkiconviewprivate.h',
-  'gtkimagedefinitionprivate.h',
-  'gtkimageprivate.h',
-  'gtkimcontextsimpleprivate.h',
-  'gtkimmoduleprivate.h',
-  'gtkkineticscrollingprivate.h',
-  'gtklabelprivate.h',
-  'gtklockbuttonprivate.h',
-  'gtkmagnifierprivate.h',
-  'gtkmediafileprivate.h',
-  'gtkmenubuttonprivate.h',
-  'gtkmenuitemprivate.h',
-  'gtkmenuprivate.h',
-  'gtkmenushellprivate.h',
-  'gtkmodulesprivate.h',
-  'gtkmountoperationprivate.h',
-  'gtknativedialogprivate.h',
-  'gtknomediafileprivate.h',
-  'gtkorientableprivate.h',
-  'gtkplacessidebarprivate.h',
-  'gtkplacesviewprivate.h',
-  'gtkplacesviewrowprivate.h',
-  'gtkpointerfocusprivate.h',
-  'gtkpopoverprivate.h',
-  'gtkprinter-private.h',
-  'gtkprintoperation-private.h',
-  'gtkprivate.h',
-  'gtkprogresstrackerprivate.h',
-  'gtkrangeprivate.h',
-  'gtkrbtreeprivate.h',
-  'gtkrenderbackgroundprivate.h',
-  'gtkrenderborderprivate.h',
-  'gtkrendericonprivate.h',
-  'gtkrendernodepaintableprivate.h',
-  'gtkroundedboxprivate.h',
-  'gtkscalerprivate.h',
-  'gtksearchentryprivate.h',
-  'gtkselectionprivate.h',
-  'gtksettingsprivate.h',
-  'gtkshortcutsshortcutprivate.h',
-  'gtkshortcutswindowprivate.h',
-  'gtksidebarrowprivate.h',
-  'gtksizegroup-private.h',
-  'gtksizerequestcacheprivate.h',
-  'gtksnapshotprivate.h',
-  'gtkstyleanimationprivate.h',
-  'gtkstylecascadeprivate.h',
-  'gtkstylecontextprivate.h',
-  'gtkstylepropertyprivate.h',
-  'gtkstyleproviderprivate.h',
-  'gtktextbufferprivate.h',
-  'gtktextchildprivate.h',
-  'gtktextdisplayprivate.h',
-  'gtktexthandleprivate.h',
-  'gtktextiterprivate.h',
-  'gtktextlayoutprivate.h',
-  'gtktextmarkprivate.h',
-  'gtktexttagprivate.h',
-  'gtktextviewprivate.h',
-  'gtktogglebuttonprivate.h',
-  'gtktoolbarprivate.h',
-  'gtktooltipprivate.h',
-  'gtktooltipwindowprivate.h',
-  'gtktreeprivate.h',
-  'gtkutilsprivate.h',
-  'gtkwidgetpaintableprivate.h',
-  'gtkwidgetpathprivate.h',
-  'gtkwidgetprivate.h',
-  'gtkwin32drawprivate.h',
-  'gtkwin32themeprivate.h',
-  'gtkwindowprivate.h',
-  'gtk-text-input-client-protocol.h',
 ]
 
 images = [
@@ -398,18 +207,17 @@ else
   types_conf.set('DISABLE_ON_QUARTZ', '')
 endif
 
+configure_file(input: 'gtk4.types.in', output: 'gtk4.types', configuration: types_conf)
+
 gnome.gtkdoc('gtk4',
              mode: 'none',
              main_xml: 'gtk4-docs.xml',
              src_dir: [
-               gtkinc,
+	       join_paths(meson.source_root(), 'gtk'),
+	       join_paths(meson.build_root(), 'gtk'),
 	     ],
              dependencies: libgtk_dep,
-             gobject_typesfile: configure_file(
-               input: 'gtk4.types.in',
-               output: 'gtk4.types',
-               configuration: types_conf,
-             ),
+             gobject_typesfile: 'gtk4.types',
              scan_args: [
                '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
                '--ignore-headers=' + ' '.join(private_headers),

docs/reference/gtk/migrating-3to4.xml

@@ -217,12 +217,9 @@
     </section>
 
     <section>
-      <title>Adapt to GdkWindow API changes</title>
+      <title>Adapt to GdkSurface API changes</title>
       <para>
-        GdkWindow has been renamed to GdkSurface.
-      </para>
-      <para>
-        The gdk_window_new() function has been replaced by a number of more
+        The gdk_surface_new() function has been replaced by a number of more
         specialized constructors: gdk_surface_new_toplevel(), gdk_surface_new_popup(),
         gdk_surface_new_temp(), gdk_surface_new_child(), gdk_surface_new_input(),
         gdk_wayland_surface_new_subsurface(). Use the appropriate ones to create
@@ -233,7 +230,7 @@
         complicating the code and could not be supported across backends.
       </para>
       <para>
-        gdk_window_reparent() is no longer available.
+        gdk_surface_reparent() is no longer available.
       </para>
     </section>
 
@@ -419,8 +416,8 @@
       <title>GdkPixbuf is deemphasized</title>
       <para>
         A number of #GdkPixbuf-based APIs have been removed. The available replacements
-        are either using #GIcon, or the newly introduced #GdkTexture or #GdkPaintable
-        classes instead.
+        are either using #GIcon, cairo_surface_t or the newly introduced #GdkTexture class
+        instead.
       </para>
       <para>
         If you are dealing with pixbufs, you can use gdk_texture_new_for_pixbuf()
@@ -429,37 +426,12 @@
     </section>
 
     <section>
-      <title>GtkWidget event signals are removed</title>
+      <title>GtkWidget event signals are deemphasized</title>
       <para>
         Event controllers and #GtkGestures have already been introduced in GTK+ 3 to handle
         input for many cases. In GTK+ 4, even more are available, such as #GtkEventControllerScroll
         and GtkEventControllerMotion, and the traditional widget signals for handling input,
-        such as #GtkWidget::motion-event or #GtkWidget::event have been removed.
-      </para>
-    </section>
-
-    <section>
-      <title>Invalidation handling has changed</title>
-      <para>
-        Only gtk_widget_queue_draw() is left to mark a widget as needing redraw.
-        Variations like gtk_widget_queue_draw_rectangle() or gtk_widget_queue_draw_region()
-        are no longer available.
-      </para>
-    </section>
-
-    <section>
-      <title>Stop using GtkWidget::draw</title>
-      <para>
-        The #GtkWidget::draw signal has been removed. Widgets need to implement the
-        #GtkWidget::snapshot function now. Connecting draw signal handlers is no longer possible.
-      </para>
-    </section>
-
-    <section>
-      <title>Window content observation has changed</title>
-      <para>
-        Observing widget contents and widget size is now done by using the
-        #GtkWidgetPaintable object instead of connecting to widget signals.
+        such as #GtkWidget::motion-event or #GtkWidget::event have been deprecated.
       </para>
     </section>
 
@@ -503,7 +475,6 @@
         #GtkCellRendererPixbuf:icon-size.
       </para>
     </section>
-
   </section>
 
 </chapter>

docs/reference/gtk/running.sgml

@@ -162,10 +162,10 @@ additional environment variables.
     Linux and Unix, and the ';' character on Windows.
   </para>
   <warning>
-    Note that this environment variable is read by GTK+ 2.x and GTK+ 3.x too,
-    which makes it unsuitable for setting it system-wide (or session-wide),
-    since doing so will cause applications using different GTK+ versions
-    to see incompatible modules.
+    Note that this environment variable is read by GTK+ 2.x too, which
+    makes it unsuitable for setting it system-wide (or session-wide),
+    since doing so will cause either GTK+ 2.x applications or GTK+ 3
+    applications to see incompatible modules.
   </warning>
 </formalpara>
 
@@ -309,7 +309,7 @@ nevertheless.
       <listitem><para>Use a legacy OpenGL context</para></listitem>
     </varlistentry>
     <varlistentry>
-      <term>gl-gles</term>
+      <term>gl-legacy</term>
       <listitem><para>Use a GLES OpenGL context</para></listitem>
     </varlistentry>
     <varlistentry>
@@ -320,6 +320,11 @@ nevertheless.
       <term>vulkan-validate</term>
       <listitem><para>Load the Vulkan validation layer, if available</para></listitem>
     </varlistentry>
+    <varlistentry>
+      <term>cairo-image</term>
+      <listitem><para>Use image surfaces for cairo rendering. This essentially
+         turns off all hardware acceleration with the cairo renderer</para></listitem>
+    </varlistentry>
   </variablelist>
   The special value <literal>all</literal> can be used to turn on all
   debug options. The special value <literal>help</literal> can be used
@@ -347,14 +352,6 @@ nevertheless.
       <term>opengl</term>
       <listitem><para>OpenGL renderer information</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term>shaders</term>
-      <listitem><para>Shaders</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term>ssurface</term>
-      <listitem><para>Surfaces</para></listitem>
-    </varlistentry>
     <varlistentry>
       <term>vulkan</term>
       <listitem><para>Vulkan renderer information</para></listitem>
@@ -370,10 +367,6 @@ nevertheless.
   </variablelist>
   A number of options affect behavior instead of logging:
   <variablelist>
-    <varlistentry>
-      <term>diff</term>
-      <listitem><para>Show differences</para></listitem>
-    </varlistentry>
     <varlistentry>
       <term>geometry</term>
       <listitem><para>Show borders</para></listitem>
@@ -460,44 +453,6 @@ nevertheless.
   </para>
 </formalpara>
 
-<formalpara>
-  <title><envar>GSK_RENDERER</envar></title>
-
-  <para>
-    If set, selects the GSK renderer to use. The following renderers can
-    be selected, provided they are included in the GTK library you are using
-    and the GDK backend supports them:
-    <variablelist>
-
-      <varlistentry>
-        <term>help</term>
-        <listitem><para>Prints information about available options</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>broadway</term>
-        <listitem><para>Selects the Broadway-backend specific renderer</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>cairo</term>
-        <listitem><para>Selects the fallback Cairo renderer</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>gl</term>
-        <listitem><para>Selects the default OpenGL renderer</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>vulkan</term>
-        <listitem><para>Selects the Vulkan renderer</para></listitem>
-      </varlistentry>
-
-    </variablelist>
-  </para>
-</formalpara>
-
 <formalpara>
   <title><envar>GTK_CSD</envar></title>
 

examples/application1/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 
 SRC = main.c exampleapp.c exampleappwin.c
 

examples/application10/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)
 

examples/application10/exampleappprefs.c

@@ -7,36 +7,43 @@
 struct _ExampleAppPrefs
 {
   GtkDialog parent;
+};
 
+typedef struct _ExampleAppPrefsPrivate ExampleAppPrefsPrivate;
+
+struct _ExampleAppPrefsPrivate
+{
   GSettings *settings;
   GtkWidget *font;
   GtkWidget *transition;
 };
 
-G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
-  gtk_widget_init_template (GTK_WIDGET (prefs));
-  prefs->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppPrefsPrivate *priv;
 
-  g_settings_bind (prefs->settings, "font",
-                   prefs->font, "font",
+  priv = example_app_prefs_get_instance_private (prefs);
+  gtk_widget_init_template (GTK_WIDGET (prefs));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "font",
+                   priv->font, "font",
                    G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind (prefs->settings, "transition",
-                   prefs->transition, "active-id",
+  g_settings_bind (priv->settings, "transition",
+                   priv->transition, "active-id",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
 example_app_prefs_dispose (GObject *object)
 {
-  ExampleAppPrefs *prefs;
+  ExampleAppPrefsPrivate *priv;
 
-  prefs = EXAMPLE_APP_PREFS (object);
-
-  g_clear_object (&prefs->settings);
+  priv = example_app_prefs_get_instance_private (EXAMPLE_APP_PREFS (object));
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_prefs_parent_class)->dispose (object);
 }
@@ -48,8 +55,8 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/prefs.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
 }
 
 ExampleAppPrefs *

examples/application10/exampleappwin.c

@@ -6,7 +6,12 @@
 struct _ExampleAppWindow
 {
   GtkApplicationWindow parent;
+};
 
+typedef struct _ExampleAppWindowPrivate ExampleAppWindowPrivate;
+
+struct _ExampleAppWindowPrivate
+{
   GSettings *settings;
   GtkWidget *stack;
   GtkWidget *search;
@@ -19,12 +24,13 @@ struct _ExampleAppWindow
   GtkWidget *lines_label;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
-search_text_changed (GtkEntry         *entry,
-                     ExampleAppWindow *win)
+search_text_changed (GtkEntry *entry)
 {
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -36,7 +42,10 @@ search_text_changed (GtkEntry         *entry,
   if (text[0] == '\0')
     return;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -55,15 +64,19 @@ static void
 find_word (GtkButton        *button,
            ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   const gchar *word;
 
+  priv = example_app_window_get_instance_private (win);
+
   word = gtk_button_get_label (button);
-  gtk_entry_set_text (GTK_ENTRY (win->searchentry), word);
+  gtk_entry_set_text (GTK_ENTRY (priv->searchentry), word);
 }
 
 static void
 update_words (ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   GHashTable *strings;
   GHashTableIter iter;
   GtkWidget *tab, *view, *row;
@@ -72,7 +85,9 @@ update_words (ExampleAppWindow *win)
   GList *children, *l;
   gchar *word, *key;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
 
   if (tab == NULL)
     return;
@@ -100,9 +115,9 @@ update_words (ExampleAppWindow *win)
     }
 
 done:
-  children = gtk_container_get_children (GTK_CONTAINER (win->words));
+  children = gtk_container_get_children (GTK_CONTAINER (priv->words));
   for (l = children; l; l = l->next)
-    gtk_container_remove (GTK_CONTAINER (win->words), GTK_WIDGET (l->data));
+    gtk_container_remove (GTK_CONTAINER (priv->words), GTK_WIDGET (l->data));
   g_list_free (children);
 
   g_hash_table_iter_init (&iter, strings);
@@ -111,7 +126,8 @@ done:
       row = gtk_button_new_with_label (key);
       g_signal_connect (row, "clicked",
                         G_CALLBACK (find_word), win);
-      gtk_container_add (GTK_CONTAINER (win->words), row);
+      gtk_widget_show (row);
+      gtk_container_add (GTK_CONTAINER (priv->words), row);
     }
 
   g_hash_table_unref (strings);
@@ -120,12 +136,16 @@ done:
 static void
 update_lines (ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   GtkWidget *tab, *view;
   GtkTextBuffer *buffer;
+  GtkTextIter iter;
   int count;
   gchar *lines;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
 
   if (tab == NULL)
     return;
@@ -133,21 +153,34 @@ update_lines (ExampleAppWindow *win)
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
-  count = gtk_text_buffer_get_line_count (buffer);
+  count = 0;
+
+  gtk_text_buffer_get_start_iter (buffer, &iter);
+  while (!gtk_text_iter_is_end (&iter))
+    {
+      count++;
+      if (!gtk_text_iter_forward_line (&iter))
+        break;
+    }
+
   lines = g_strdup_printf ("%d", count);
-  gtk_label_set_text (GTK_LABEL (win->lines), lines);
+  gtk_label_set_text (GTK_LABEL (priv->lines), lines);
   g_free (lines);
 }
 
 static void
-visible_child_changed (GObject          *stack,
-                       GParamSpec       *pspec,
-                       ExampleAppWindow *win)
+visible_child_changed (GObject    *stack,
+                       GParamSpec *pspec)
 {
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
+
   if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
     return;
 
-  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
+  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (stack)));
+  priv = example_app_window_get_instance_private (win);
+  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->searchbar), FALSE);
   update_words (win);
   update_lines (win);
 }
@@ -163,43 +196,45 @@ words_changed (GObject          *sidebar,
 static void
 example_app_window_init (ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   GtkBuilder *builder;
   GMenuModel *menu;
   GAction *action;
 
+  priv = example_app_window_get_instance_private (win);
   gtk_widget_init_template (GTK_WIDGET (win));
-  win->settings = g_settings_new ("org.gtk.exampleapp");
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind (win->settings, "transition",
-                   win->stack, "transition-type",
+  g_settings_bind (priv->settings, "transition",
+                   priv->stack, "transition-type",
                    G_SETTINGS_BIND_DEFAULT);
 
-  g_settings_bind (win->settings, "show-words",
-                   win->sidebar, "reveal-child",
+  g_settings_bind (priv->settings, "show-words",
+                   priv->sidebar, "reveal-child",
                    G_SETTINGS_BIND_DEFAULT);
 
-  g_object_bind_property (win->search, "active",
-                          win->searchbar, "search-mode-enabled",
+  g_object_bind_property (priv->search, "active",
+                          priv->searchbar, "search-mode-enabled",
                           G_BINDING_BIDIRECTIONAL);
 
-  g_signal_connect (win->sidebar, "notify::reveal-child",
+  g_signal_connect (priv->sidebar, "notify::reveal-child",
                     G_CALLBACK (words_changed), win);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/gears-menu.ui");
   menu = G_MENU_MODEL (gtk_builder_get_object (builder, "menu"));
-  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (win->gears), menu);
+  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (priv->gears), menu);
   g_object_unref (builder);
 
-  action = g_settings_create_action (win->settings, "show-words");
+  action = g_settings_create_action (priv->settings, "show-words");
   g_action_map_add_action (G_ACTION_MAP (win), action);
   g_object_unref (action);
 
-  action = (GAction*) g_property_action_new ("show-lines", win->lines, "visible");
+  action = (GAction*) g_property_action_new ("show-lines", priv->lines, "visible");
   g_action_map_add_action (G_ACTION_MAP (win), action);
   g_object_unref (action);
 
-  g_object_bind_property (win->lines, "visible",
-                          win->lines_label, "visible",
+  g_object_bind_property (priv->lines, "visible",
+                          priv->lines_label, "visible",
                           G_BINDING_DEFAULT);
 
   g_object_set (gtk_settings_get_default (), "gtk-shell-shows-app-menu", FALSE, NULL);
@@ -210,10 +245,12 @@ static void
 example_app_window_dispose (GObject *object)
 {
   ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
 
   win = EXAMPLE_APP_WINDOW (object);
+  priv = example_app_window_get_instance_private (win);
 
-  g_clear_object (&win->settings);
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
 }
@@ -226,15 +263,15 @@ example_app_window_class_init (ExampleAppWindowClass *class)
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
 
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines_label);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines_label);
 
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), visible_child_changed);
@@ -250,6 +287,7 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
@@ -258,16 +296,19 @@ example_app_window_open (ExampleAppWindow *win,
   GtkTextTag *tag;
   GtkTextIter start_iter, end_iter;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -278,7 +319,7 @@ example_app_window_open (ExampleAppWindow *win,
     }
 
   tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
-  g_settings_bind (win->settings, "font",
+  g_settings_bind (priv->settings, "font",
                    tag, "font",
                    G_SETTINGS_BIND_DEFAULT);
 
@@ -288,7 +329,7 @@ example_app_window_open (ExampleAppWindow *win,
 
   g_free (basename);
 
-  gtk_widget_set_sensitive (win->search, TRUE);
+  gtk_widget_set_sensitive (priv->search, TRUE);
 
   update_words (win);
   update_lines (win);

examples/application10/prefs.ui

@@ -9,13 +9,15 @@
       <object class="GtkBox" id="vbox">
         <child>
           <object class="GtkGrid" id="grid">
+            <property name="visible">True</property>
             <property name="margin">6</property>
             <property name="row-spacing">12</property>
             <property name="column-spacing">6</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
+                <property name="visible">True</property>
                 <property name="label">_Font:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
               </object>
@@ -26,6 +28,7 @@
             </child>
             <child>
               <object class="GtkFontButton" id="font">
+                <property name="visible">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
@@ -34,8 +37,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
+                <property name="visible">True</property>
                 <property name="label">_Transition:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
               </object>
@@ -46,6 +50,7 @@
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
+                <property name="visible">True</property>
                 <items>
                   <item translatable="yes" id="none">None</item>
                   <item translatable="yes" id="crossfade">Fade</item>

examples/application10/window.ui

@@ -5,79 +5,107 @@
     <property name="title" translatable="yes">Example Application</property>
     <property name="default-width">600</property>
     <property name="default-height">400</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkLabel" id="lines_label">
-            <property name="visible">0</property>
-            <property name="label" translatable="yes">Lines:</property>
+        <child type="titlebar">
+          <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
+            <property name="show-title-buttons">True</property>
+            <child>
+              <object class="GtkLabel" id="lines_label">
+                <property name="visible">False</property>
+                <property name="label" translatable="yes">Lines:</property>
+              </object>
+              <packing>
+                <property name="pack-type">start</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="lines">
+                <property name="visible">False</property>
+              </object>
+              <packing>
+                <property name="pack-type">start</property>
+              </packing>
+            </child>
+            <child type="title">
+              <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
+                <property name="stack">stack</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton" id="search">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="search-icon">
+                    <property name="visible">True</property>
+                    <property name="icon-name">edit-find-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkMenuButton" id="gears">
+                <property name="visible">True</property>
+                <property name="direction">none</property>
+                <property name="use-popover">True</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+              </object>
+              <packing>
+                <property name="pack-type">end</property>
+              </packing>
+            </child>
           </object>
         </child>
-        <child>
-          <object class="GtkLabel" id="lines">
-            <property name="visible">0</property>
-          </object>
-        </child>
-        <child type="title">
-          <object class="GtkStackSwitcher" id="tabs">
-            <property name="stack">stack</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleButton" id="search">
-            <property name="sensitive">0</property>
-            <property name="icon-name">edit-find-symbolic</property>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkMenuButton" id="gears">
-            <property name="direction">none</property>
-            <style>
-              <class name="image-button"/>
-            </style>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-      </object>
-    </child>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkSearchBar" id="searchbar">
+            <property name="visible">True</property>
             <child>
               <object class="GtkSearchEntry" id="searchentry">
                 <signal name="search-changed" handler="search_text_changed"/>
+                <property name="visible">True</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="hbox">
+            <property name="visible">True</property>
             <child>
               <object class="GtkRevealer" id="sidebar">
+                <property name="visible">True</property>
                 <property name="transition-type">slide-right</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="sidebar-sw">
-                    <property name="hscrollbar-policy">never</property>
-                    <child>
-                      <object class="GtkListBox" id="words">
-                        <property name="selection-mode">none</property>
-                      </object>
-                    </child>
-                  </object>
+                 <object class="GtkScrolledWindow" id="sidebar-sw">
+                   <property name="visible">True</property>
+                   <property name="hscrollbar-policy">never</property>
+                   <property name="vscrollbar-policy">automatic</property>
+                   <child>
+                     <object class="GtkListBox" id="words">
+                       <property name="visible">True</property>
+                       <property name="selection-mode">none</property>
+                     </object>
+                   </child>
+                 </object>
                 </child>
               </object>
             </child>
             <child>
               <object class="GtkStack" id="stack">
                 <signal name="notify::visible-child" handler="visible_child_changed"/>
+                <property name="visible">True</property>
               </object>
             </child>
           </object>

examples/application2/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 
 SRC = exampleapp.c exampleappwin.c main.c

examples/application2/window.ui

@@ -7,11 +7,14 @@
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -19,6 +22,7 @@
         </child>
         <child>
           <object class="GtkStack" id="stack">
+            <property name="visible">True</property>
           </object>
         </child>
       </object>

examples/application3/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 
 SRC = exampleapp.c exampleappwin.c main.c

examples/application3/exampleappwin.c

@@ -6,11 +6,16 @@
 struct _ExampleAppWindow
 {
   GtkApplicationWindow parent;
+};
 
+typedef struct _ExampleAppWindowPrivate ExampleAppWindowPrivate;
+
+struct _ExampleAppWindowPrivate
+{
   GtkWidget *stack;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
 example_app_window_init (ExampleAppWindow *win)
@@ -23,7 +28,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 {
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
 }
 
 ExampleAppWindow *
@@ -36,21 +41,25 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
   gsize length;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
     {

examples/application3/window.ui

@@ -7,11 +7,14 @@
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -19,6 +22,7 @@
         </child>
         <child>
           <object class="GtkStack" id="stack">
+            <property name="visible">True</property>
           </object>
         </child>
       </object>

examples/application4/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 
 SRC = exampleapp.c exampleappwin.c main.c

examples/application4/exampleappwin.c

@@ -6,11 +6,16 @@
 struct _ExampleAppWindow
 {
   GtkApplicationWindow parent;
+};
 
+typedef struct _ExampleAppWindowPrivate ExampleAppWindowPrivate;
+
+struct _ExampleAppWindowPrivate
+{
   GtkWidget *stack;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
 example_app_window_init (ExampleAppWindow *win)
@@ -23,7 +28,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 {
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
 }
 
 ExampleAppWindow *
@@ -36,21 +41,25 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
   gsize length;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
     {

examples/application4/window.ui

@@ -7,11 +7,14 @@
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -19,6 +22,7 @@
         </child>
         <child>
           <object class="GtkStack" id="stack">
+            <property name="visible">True</property>
           </object>
         </child>
       </object>

examples/application5/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)
 

examples/application5/exampleappwin.c

@@ -6,21 +6,29 @@
 struct _ExampleAppWindow
 {
   GtkApplicationWindow parent;
+};
 
+typedef struct _ExampleAppWindowPrivate ExampleAppWindowPrivate;
+
+struct _ExampleAppWindowPrivate
+{
   GSettings *settings;
   GtkWidget *stack;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
 example_app_window_init (ExampleAppWindow *win)
 {
-  gtk_widget_init_template (GTK_WIDGET (win));
-  win->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppWindowPrivate *priv;
 
-  g_settings_bind (win->settings, "transition",
-                   win->stack, "transition-type",
+  priv = example_app_window_get_instance_private (win);
+  gtk_widget_init_template (GTK_WIDGET (win));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "transition",
+                   priv->stack, "transition-type",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
@@ -28,10 +36,12 @@ static void
 example_app_window_dispose (GObject *object)
 {
   ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
 
   win = EXAMPLE_APP_WINDOW (object);
+  priv = example_app_window_get_instance_private (win);
 
-  g_clear_object (&win->settings);
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
 }
@@ -43,7 +53,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
 }
 
 ExampleAppWindow *
@@ -56,6 +66,7 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
@@ -64,16 +75,19 @@ example_app_window_open (ExampleAppWindow *win,
   GtkTextTag *tag;
   GtkTextIter start_iter, end_iter;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -84,7 +98,7 @@ example_app_window_open (ExampleAppWindow *win,
     }
 
   tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
-  g_settings_bind (win->settings, "font", tag, "font", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (priv->settings, "font", tag, "font", G_SETTINGS_BIND_DEFAULT);
 
   gtk_text_buffer_get_start_iter (buffer, &start_iter);
   gtk_text_buffer_get_end_iter (buffer, &end_iter);

examples/application5/window.ui

@@ -7,11 +7,14 @@
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -19,6 +22,7 @@
         </child>
         <child>
           <object class="GtkStack" id="stack">
+            <property name="visible">True</property>
           </object>
         </child>
       </object>

examples/application6/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)
 

examples/application6/exampleappprefs.c

@@ -7,36 +7,43 @@
 struct _ExampleAppPrefs
 {
   GtkDialog parent;
+};
 
+typedef struct _ExampleAppPrefsPrivate ExampleAppPrefsPrivate;
+
+struct _ExampleAppPrefsPrivate
+{
   GSettings *settings;
   GtkWidget *font;
   GtkWidget *transition;
 };
 
-G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
-  gtk_widget_init_template (GTK_WIDGET (prefs));
-  prefs->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppPrefsPrivate *priv;
 
-  g_settings_bind (prefs->settings, "font",
-                   prefs->font, "font",
+  priv = example_app_prefs_get_instance_private (prefs);
+  gtk_widget_init_template (GTK_WIDGET (prefs));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "font",
+                   priv->font, "font",
                    G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind (prefs->settings, "transition",
-                   prefs->transition, "active-id",
+  g_settings_bind (priv->settings, "transition",
+                   priv->transition, "active-id",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
 example_app_prefs_dispose (GObject *object)
 {
-  ExampleAppPrefs *prefs;
+  ExampleAppPrefsPrivate *priv;
 
-  prefs = EXAMPLE_APP_PREFS (object);
-
-  g_clear_object (&prefs->settings);
+  priv = example_app_prefs_get_instance_private (EXAMPLE_APP_PREFS (object));
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_prefs_parent_class)->dispose (object);
 }
@@ -48,8 +55,8 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/prefs.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
 }
 
 ExampleAppPrefs *

examples/application6/exampleappwin.c

@@ -6,21 +6,29 @@
 struct _ExampleAppWindow
 {
   GtkApplicationWindow parent;
+};
 
+typedef struct ExampleAppWindowPrivate ExampleAppWindowPrivate;
+
+struct ExampleAppWindowPrivate
+{
   GSettings *settings;
   GtkWidget *stack;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
 example_app_window_init (ExampleAppWindow *win)
 {
-  gtk_widget_init_template (GTK_WIDGET (win));
-  win->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppWindowPrivate *priv;
 
-  g_settings_bind (win->settings, "transition",
-                   win->stack, "transition-type",
+  priv = example_app_window_get_instance_private (win);
+  gtk_widget_init_template (GTK_WIDGET (win));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "transition",
+                   priv->stack, "transition-type",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
@@ -28,10 +36,12 @@ static void
 example_app_window_dispose (GObject *object)
 {
   ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
 
   win = EXAMPLE_APP_WINDOW (object);
+  priv = example_app_window_get_instance_private (win);
 
-  g_clear_object (&win->settings);
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
 }
@@ -43,7 +53,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
 }
 
 ExampleAppWindow *
@@ -56,6 +66,7 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
@@ -64,16 +75,19 @@ example_app_window_open (ExampleAppWindow *win,
   GtkTextTag *tag;
   GtkTextIter start_iter, end_iter;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -84,7 +98,7 @@ example_app_window_open (ExampleAppWindow *win,
     }
 
   tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
-  g_settings_bind (win->settings, "font", tag, "font", G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (priv->settings, "font", tag, "font", G_SETTINGS_BIND_DEFAULT);
 
   gtk_text_buffer_get_start_iter (buffer, &start_iter);
   gtk_text_buffer_get_end_iter (buffer, &end_iter);

examples/application6/prefs.ui

@@ -9,13 +9,15 @@
       <object class="GtkBox" id="vbox">
         <child>
           <object class="GtkGrid" id="grid">
+            <property name="visible">True</property>
             <property name="margin">6</property>
             <property name="row-spacing">12</property>
             <property name="column-spacing">6</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
+                <property name="visible">True</property>
                 <property name="label">_Font:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
               </object>
@@ -26,6 +28,7 @@
             </child>
             <child>
               <object class="GtkFontButton" id="font">
+                <property name="visible">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
@@ -34,8 +37,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
+                <property name="visible">True</property>
                 <property name="label">_Transition:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
               </object>
@@ -46,6 +50,7 @@
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
+                <property name="visible">True</property>
                 <items>
                   <item translatable="yes" id="none">None</item>
                   <item translatable="yes" id="crossfade">Fade</item>

examples/application6/window.ui

@@ -7,11 +7,14 @@
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
                 <property name="stack">stack</property>
               </object>
             </child>
@@ -19,6 +22,7 @@
         </child>
         <child>
           <object class="GtkStack" id="stack">
+            <property name="visible">True</property>
           </object>
         </child>
       </object>

examples/application7/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)
 

examples/application7/exampleappprefs.c

@@ -7,36 +7,43 @@
 struct _ExampleAppPrefs
 {
   GtkDialog parent;
+};
 
+typedef struct _ExampleAppPrefsPrivate ExampleAppPrefsPrivate;
+
+struct _ExampleAppPrefsPrivate
+{
   GSettings *settings;
   GtkWidget *font;
   GtkWidget *transition;
 };
 
-G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
-  gtk_widget_init_template (GTK_WIDGET (prefs));
-  prefs->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppPrefsPrivate *priv;
 
-  g_settings_bind (prefs->settings, "font",
-                   prefs->font, "font",
+  priv = example_app_prefs_get_instance_private (prefs);
+  gtk_widget_init_template (GTK_WIDGET (prefs));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "font",
+                   priv->font, "font",
                    G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind (prefs->settings, "transition",
-                   prefs->transition, "active-id",
+  g_settings_bind (priv->settings, "transition",
+                   priv->transition, "active-id",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
 example_app_prefs_dispose (GObject *object)
 {
-  ExampleAppPrefs *prefs;
+  ExampleAppPrefsPrivate *priv;
 
-  prefs = EXAMPLE_APP_PREFS (object);
-
-  g_clear_object (&prefs->settings);
+  priv = example_app_prefs_get_instance_private (EXAMPLE_APP_PREFS (object));
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_prefs_parent_class)->dispose (object);
 }
@@ -48,8 +55,8 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/prefs.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
 }
 
 ExampleAppPrefs *

examples/application7/exampleappwin.c

@@ -6,19 +6,25 @@
 struct _ExampleAppWindow
 {
   GtkApplicationWindow parent;
+};
 
+typedef struct _ExampleAppWindowPrivate ExampleAppWindowPrivate;
+
+struct _ExampleAppWindowPrivate
+{
   GSettings *settings;
   GtkWidget *stack;
   GtkWidget *search;
   GtkWidget *searchbar;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
-search_text_changed (GtkEntry         *entry,
-                     ExampleAppWindow *win)
+search_text_changed (GtkEntry *entry)
 {
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -30,7 +36,10 @@ search_text_changed (GtkEntry         *entry,
   if (text[0] == '\0')
     return;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -46,28 +55,36 @@ search_text_changed (GtkEntry         *entry,
 }
 
 static void
-visible_child_changed (GObject          *stack,
-                       GParamSpec       *pspec,
-                       ExampleAppWindow *win)
+visible_child_changed (GObject    *stack,
+                       GParamSpec *pspec)
 {
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
+
   if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
     return;
 
-  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
+  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (stack)));
+
+  priv = example_app_window_get_instance_private (win);
+  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->searchbar), FALSE);
 }
 
 static void
 example_app_window_init (ExampleAppWindow *win)
 {
-  gtk_widget_init_template (GTK_WIDGET (win));
-  win->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppWindowPrivate *priv;
 
-  g_settings_bind (win->settings, "transition",
-                   win->stack, "transition-type",
+  priv = example_app_window_get_instance_private (win);
+  gtk_widget_init_template (GTK_WIDGET (win));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "transition",
+                   priv->stack, "transition-type",
                    G_SETTINGS_BIND_DEFAULT);
 
-  g_object_bind_property (win->search, "active",
-                          win->searchbar, "search-mode-enabled",
+  g_object_bind_property (priv->search, "active",
+                          priv->searchbar, "search-mode-enabled",
                           G_BINDING_BIDIRECTIONAL);
 }
 
@@ -75,10 +92,12 @@ static void
 example_app_window_dispose (GObject *object)
 {
   ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
 
   win = EXAMPLE_APP_WINDOW (object);
+  priv = example_app_window_get_instance_private (win);
 
-  g_clear_object (&win->settings);
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
 }
@@ -91,9 +110,9 @@ example_app_window_class_init (ExampleAppWindowClass *class)
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
 
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
 
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), visible_child_changed);
@@ -109,6 +128,7 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
@@ -117,16 +137,19 @@ example_app_window_open (ExampleAppWindow *win,
   GtkTextTag *tag;
   GtkTextIter start_iter, end_iter;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -137,7 +160,7 @@ example_app_window_open (ExampleAppWindow *win,
     }
 
   tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
-  g_settings_bind (win->settings, "font",
+  g_settings_bind (priv->settings, "font",
                    tag, "font",
                    G_SETTINGS_BIND_DEFAULT);
 
@@ -147,5 +170,5 @@ example_app_window_open (ExampleAppWindow *win,
 
   g_free (basename);
 
-  gtk_widget_set_sensitive (win->search, TRUE);
+  gtk_widget_set_sensitive (priv->search, TRUE);
 }

examples/application7/prefs.ui

@@ -9,13 +9,15 @@
       <object class="GtkBox" id="vbox">
         <child>
           <object class="GtkGrid" id="grid">
+            <property name="visible">True</property>
             <property name="margin">6</property>
             <property name="row-spacing">12</property>
             <property name="column-spacing">6</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
+                <property name="visible">True</property>
                 <property name="label">_Font:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
               </object>
@@ -26,6 +28,7 @@
             </child>
             <child>
               <object class="GtkFontButton" id="font">
+                <property name="visible">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
@@ -34,8 +37,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
+                <property name="visible">True</property>
                 <property name="label">_Transition:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
               </object>
@@ -46,6 +50,7 @@
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
+                <property name="visible">True</property>
                 <items>
                   <item translatable="yes" id="none">None</item>
                   <item translatable="yes" id="crossfade">Fade</item>

examples/application7/window.ui

@@ -7,18 +7,30 @@
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
                 <property name="stack">stack</property>
               </object>
             </child>
             <child>
               <object class="GtkToggleButton" id="search">
-                <property name="sensitive">0</property>
-                <property name="icon-name">edit-find-symbolic</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="search-icon">
+                    <property name="visible">True</property>
+                    <property name="icon-name">edit-find-symbolic</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="pack-type">end</property>
@@ -28,9 +40,11 @@
         </child>
         <child>
           <object class="GtkSearchBar" id="searchbar">
+            <property name="visible">True</property>
             <child>
               <object class="GtkSearchEntry" id="searchentry">
                 <signal name="search-changed" handler="search_text_changed"/>
+                <property name="visible">True</property>
               </object>
             </child>
           </object>
@@ -38,6 +52,7 @@
         <child>
           <object class="GtkStack" id="stack">
             <signal name="notify::visible-child" handler="visible_child_changed"/>
+            <property name="visible">True</property>
           </object>
         </child>
       </object>

examples/application8/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)
 

examples/application8/exampleappprefs.c

@@ -7,36 +7,43 @@
 struct _ExampleAppPrefs
 {
   GtkDialog parent;
+};
 
+typedef struct _ExampleAppPrefsPrivate ExampleAppPrefsPrivate;
+
+struct _ExampleAppPrefsPrivate
+{
   GSettings *settings;
   GtkWidget *font;
   GtkWidget *transition;
 };
 
-G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
-  gtk_widget_init_template (GTK_WIDGET (prefs));
-  prefs->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppPrefsPrivate *priv;
 
-  g_settings_bind (prefs->settings, "font",
-                   prefs->font, "font",
+  priv = example_app_prefs_get_instance_private (prefs);
+  gtk_widget_init_template (GTK_WIDGET (prefs));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "font",
+                   priv->font, "font",
                    G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind (prefs->settings, "transition",
-                   prefs->transition, "active-id",
+  g_settings_bind (priv->settings, "transition",
+                   priv->transition, "active-id",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
 example_app_prefs_dispose (GObject *object)
 {
-  ExampleAppPrefs *prefs;
+  ExampleAppPrefsPrivate *priv;
 
-  prefs = EXAMPLE_APP_PREFS (object);
-
-  g_clear_object (&prefs->settings);
+  priv = example_app_prefs_get_instance_private (EXAMPLE_APP_PREFS (object));
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_prefs_parent_class)->dispose (object);
 }
@@ -48,8 +55,8 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/prefs.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
 }
 
 ExampleAppPrefs *

examples/application8/exampleappwin.c

@@ -6,7 +6,12 @@
 struct _ExampleAppWindow
 {
   GtkApplicationWindow parent;
+};
 
+typedef struct _ExampleAppWindowPrivate ExampleAppWindowPrivate;
+
+struct _ExampleAppWindowPrivate
+{
   GSettings *settings;
   GtkWidget *stack;
   GtkWidget *search;
@@ -17,12 +22,13 @@ struct _ExampleAppWindow
   GtkWidget *words;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
-search_text_changed (GtkEntry         *entry,
-                     ExampleAppWindow *win)
+search_text_changed (GtkEntry *entry)
 {
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -34,7 +40,10 @@ search_text_changed (GtkEntry         *entry,
   if (text[0] == '\0')
     return;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -53,15 +62,19 @@ static void
 find_word (GtkButton        *button,
            ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   const gchar *word;
 
+  priv = example_app_window_get_instance_private (win);
+
   word = gtk_button_get_label (button);
-  gtk_entry_set_text (GTK_ENTRY (win->searchentry), word);
+  gtk_entry_set_text (GTK_ENTRY (priv->searchentry), word);
 }
 
 static void
 update_words (ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   GHashTable *strings;
   GHashTableIter iter;
   GtkWidget *tab, *view, *row;
@@ -70,7 +83,9 @@ update_words (ExampleAppWindow *win)
   GList *children, *l;
   gchar *word, *key;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
 
   if (tab == NULL)
     return;
@@ -98,9 +113,9 @@ update_words (ExampleAppWindow *win)
     }
 
 done:
-  children = gtk_container_get_children (GTK_CONTAINER (win->words));
+  children = gtk_container_get_children (GTK_CONTAINER (priv->words));
   for (l = children; l; l = l->next)
-    gtk_container_remove (GTK_CONTAINER (win->words), GTK_WIDGET (l->data));
+    gtk_container_remove (GTK_CONTAINER (priv->words), GTK_WIDGET (l->data));
   g_list_free (children);
 
   g_hash_table_iter_init (&iter, strings);
@@ -109,21 +124,27 @@ done:
       row = gtk_button_new_with_label (key);
       g_signal_connect (row, "clicked",
                         G_CALLBACK (find_word), win);
-      gtk_container_add (GTK_CONTAINER (win->words), row);
+      gtk_widget_show (row);
+      gtk_container_add (GTK_CONTAINER (priv->words), row);
     }
 
   g_hash_table_unref (strings);
 }
 
 static void
-visible_child_changed (GObject          *stack,
-                       GParamSpec       *pspec,
-                       ExampleAppWindow *win)
+visible_child_changed (GObject    *stack,
+                       GParamSpec *pspec)
 {
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
+
   if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
     return;
 
-  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
+  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (stack)));
+
+  priv = example_app_window_get_instance_private (win);
+  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->searchbar), FALSE);
   update_words (win);
 }
 
@@ -138,34 +159,36 @@ words_changed (GObject          *sidebar,
 static void
 example_app_window_init (ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   GtkBuilder *builder;
   GMenuModel *menu;
   GAction *action;
 
+  priv = example_app_window_get_instance_private (win);
   gtk_widget_init_template (GTK_WIDGET (win));
-  win->settings = g_settings_new ("org.gtk.exampleapp");
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind (win->settings, "transition",
-                   win->stack, "transition-type",
+  g_settings_bind (priv->settings, "transition",
+                   priv->stack, "transition-type",
                    G_SETTINGS_BIND_DEFAULT);
 
-  g_settings_bind (win->settings, "show-words",
-                   win->sidebar, "reveal-child",
+  g_settings_bind (priv->settings, "show-words",
+                   priv->sidebar, "reveal-child",
                    G_SETTINGS_BIND_DEFAULT);
 
-  g_object_bind_property (win->search, "active",
-                          win->searchbar, "search-mode-enabled",
+  g_object_bind_property (priv->search, "active",
+                          priv->searchbar, "search-mode-enabled",
                           G_BINDING_BIDIRECTIONAL);
 
-  g_signal_connect (win->sidebar, "notify::reveal-child",
+  g_signal_connect (priv->sidebar, "notify::reveal-child",
                     G_CALLBACK (words_changed), win);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/gears-menu.ui");
   menu = G_MENU_MODEL (gtk_builder_get_object (builder, "menu"));
-  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (win->gears), menu);
+  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (priv->gears), menu);
   g_object_unref (builder);
 
-  action = g_settings_create_action (win->settings, "show-words");
+  action = g_settings_create_action (priv->settings, "show-words");
   g_action_map_add_action (G_ACTION_MAP (win), action);
   g_object_unref (action);
 }
@@ -174,10 +197,12 @@ static void
 example_app_window_dispose (GObject *object)
 {
   ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
 
   win = EXAMPLE_APP_WINDOW (object);
+  priv = example_app_window_get_instance_private (win);
 
-  g_clear_object (&win->settings);
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
 }
@@ -190,13 +215,13 @@ example_app_window_class_init (ExampleAppWindowClass *class)
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
 
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
 
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), visible_child_changed);
@@ -213,6 +238,7 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
@@ -221,16 +247,19 @@ example_app_window_open (ExampleAppWindow *win,
   GtkTextTag *tag;
   GtkTextIter start_iter, end_iter;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -241,7 +270,7 @@ example_app_window_open (ExampleAppWindow *win,
     }
 
   tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
-  g_settings_bind (win->settings, "font",
+  g_settings_bind (priv->settings, "font",
                    tag, "font",
                    G_SETTINGS_BIND_DEFAULT);
 
@@ -251,7 +280,7 @@ example_app_window_open (ExampleAppWindow *win,
 
   g_free (basename);
 
-  gtk_widget_set_sensitive (win->search, TRUE);
+  gtk_widget_set_sensitive (priv->search, TRUE);
 
   update_words (win);
 }

examples/application8/prefs.ui

@@ -9,13 +9,15 @@
       <object class="GtkBox" id="vbox">
         <child>
           <object class="GtkGrid" id="grid">
+            <property name="visible">True</property>
             <property name="margin">6</property>
             <property name="row-spacing">12</property>
             <property name="column-spacing">6</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
+                <property name="visible">True</property>
                 <property name="label">_Font:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
               </object>
@@ -26,6 +28,7 @@
             </child>
             <child>
               <object class="GtkFontButton" id="font">
+                <property name="visible">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
@@ -34,8 +37,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
+                <property name="visible">True</property>
                 <property name="label">_Transition:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
               </object>
@@ -46,6 +50,7 @@
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
+                <property name="visible">True</property>
                 <items>
                   <item translatable="yes" id="none">None</item>
                   <item translatable="yes" id="crossfade">Fade</item>

examples/application8/window.ui

@@ -7,18 +7,30 @@
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
                 <property name="stack">stack</property>
               </object>
             </child>
             <child>
               <object class="GtkToggleButton" id="search">
-                <property name="sensitive">0</property>
-                <property name="icon-name">edit-find-symbolic</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="search-icon">
+                    <property name="visible">True</property>
+                    <property name="icon-name">edit-find-symbolic</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="pack-type">end</property>
@@ -26,7 +38,9 @@
             </child>
             <child>
               <object class="GtkMenuButton" id="gears">
+                <property name="visible">True</property>
                 <property name="direction">none</property>
+                <property name="use-popover">True</property>
                 <style>
                   <class name="image-button"/>
                 </style>
@@ -39,33 +53,41 @@
         </child>
         <child>
           <object class="GtkSearchBar" id="searchbar">
+            <property name="visible">True</property>
             <child>
               <object class="GtkSearchEntry" id="searchentry">
                 <signal name="search-changed" handler="search_text_changed"/>
+                <property name="visible">True</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="hbox">
+            <property name="visible">True</property>
             <child>
               <object class="GtkRevealer" id="sidebar">
+                <property name="visible">True</property>
                 <property name="transition-type">slide-right</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="sidebar-sw">
-                    <property name="hscrollbar-policy">never</property>
-                    <child>
-                      <object class="GtkListBox" id="words">
-                        <property name="selection-mode">none</property>
-                      </object>
-                    </child>
-                  </object>
+                 <object class="GtkScrolledWindow" id="sidebar-sw">
+                   <property name="visible">True</property>
+                   <property name="hscrollbar-policy">never</property>
+                   <property name="vscrollbar-policy">automatic</property>
+                   <child>
+                     <object class="GtkListBox" id="words">
+                       <property name="visible">True</property>
+                       <property name="selection-mode">none</property>
+                     </object>
+                   </child>
+                 </object>
                 </child>
               </object>
             </child>
             <child>
               <object class="GtkStack" id="stack">
                 <signal name="notify::visible-child" handler="visible_child_changed"/>
+                <property name="visible">True</property>
               </object>
             </child>
           </object>

examples/application9/Makefile.example

@@ -1,7 +1,7 @@
 CC ?= gcc
 PKGCONFIG = $(shell which pkg-config)
-CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-4.0)
-LIBS = $(shell $(PKGCONFIG) --libs gtk+-4.0)
+CFLAGS = $(shell $(PKGCONFIG) --cflags gtk+-3.0)
+LIBS = $(shell $(PKGCONFIG) --libs gtk+-3.0)
 GLIB_COMPILE_RESOURCES = $(shell $(PKGCONFIG) --variable=glib_compile_resources gio-2.0)
 GLIB_COMPILE_SCHEMAS = $(shell $(PKGCONFIG) --variable=glib_compile_schemas gio-2.0)
 

examples/application9/exampleappprefs.c

@@ -7,36 +7,43 @@
 struct _ExampleAppPrefs
 {
   GtkDialog parent;
+};
 
+typedef struct _ExampleAppPrefsPrivate ExampleAppPrefsPrivate;
+
+struct _ExampleAppPrefsPrivate
+{
   GSettings *settings;
   GtkWidget *font;
   GtkWidget *transition;
 };
 
-G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
 
 static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
-  gtk_widget_init_template (GTK_WIDGET (prefs));
-  prefs->settings = g_settings_new ("org.gtk.exampleapp");
+  ExampleAppPrefsPrivate *priv;
 
-  g_settings_bind (prefs->settings, "font",
-                   prefs->font, "font",
+  priv = example_app_prefs_get_instance_private (prefs);
+  gtk_widget_init_template (GTK_WIDGET (prefs));
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (priv->settings, "font",
+                   priv->font, "font",
                    G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind (prefs->settings, "transition",
-                   prefs->transition, "active-id",
+  g_settings_bind (priv->settings, "transition",
+                   priv->transition, "active-id",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
 example_app_prefs_dispose (GObject *object)
 {
-  ExampleAppPrefs *prefs;
+  ExampleAppPrefsPrivate *priv;
 
-  prefs = EXAMPLE_APP_PREFS (object);
-
-  g_clear_object (&prefs->settings);
+  priv = example_app_prefs_get_instance_private (EXAMPLE_APP_PREFS (object));
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_prefs_parent_class)->dispose (object);
 }
@@ -48,8 +55,8 @@ example_app_prefs_class_init (ExampleAppPrefsClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/prefs.ui");
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
 }
 
 ExampleAppPrefs *

examples/application9/exampleappwin.c

@@ -6,7 +6,12 @@
 struct _ExampleAppWindow
 {
   GtkApplicationWindow parent;
+};
 
+typedef struct _ExampleAppWindowPrivate ExampleAppWindowPrivate;
+
+struct _ExampleAppWindowPrivate
+{
   GSettings *settings;
   GtkWidget *stack;
   GtkWidget *search;
@@ -19,12 +24,13 @@ struct _ExampleAppWindow
   GtkWidget *lines_label;
 };
 
-G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+G_DEFINE_TYPE_WITH_PRIVATE(ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW);
 
 static void
-search_text_changed (GtkEntry         *entry,
-                     ExampleAppWindow *win)
+search_text_changed (GtkEntry *entry)
 {
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
   const gchar *text;
   GtkWidget *tab;
   GtkWidget *view;
@@ -36,7 +42,10 @@ search_text_changed (GtkEntry         *entry,
   if (text[0] == '\0')
     return;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (entry)));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -55,15 +64,19 @@ static void
 find_word (GtkButton        *button,
            ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   const gchar *word;
 
+  priv = example_app_window_get_instance_private (win);
+
   word = gtk_button_get_label (button);
-  gtk_entry_set_text (GTK_ENTRY (win->searchentry), word);
+  gtk_entry_set_text (GTK_ENTRY (priv->searchentry), word);
 }
 
 static void
 update_words (ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   GHashTable *strings;
   GHashTableIter iter;
   GtkWidget *tab, *view, *row;
@@ -72,7 +85,9 @@ update_words (ExampleAppWindow *win)
   GList *children, *l;
   gchar *word, *key;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
 
   if (tab == NULL)
     return;
@@ -100,9 +115,9 @@ update_words (ExampleAppWindow *win)
     }
 
 done:
-  children = gtk_container_get_children (GTK_CONTAINER (win->words));
+  children = gtk_container_get_children (GTK_CONTAINER (priv->words));
   for (l = children; l; l = l->next)
-    gtk_container_remove (GTK_CONTAINER (win->words), GTK_WIDGET (l->data));
+    gtk_container_remove (GTK_CONTAINER (priv->words), GTK_WIDGET (l->data));
   g_list_free (children);
 
   g_hash_table_iter_init (&iter, strings);
@@ -111,7 +126,8 @@ done:
       row = gtk_button_new_with_label (key);
       g_signal_connect (row, "clicked",
                         G_CALLBACK (find_word), win);
-      gtk_container_add (GTK_CONTAINER (win->words), row);
+      gtk_widget_show (row);
+      gtk_container_add (GTK_CONTAINER (priv->words), row);
     }
 
   g_hash_table_unref (strings);
@@ -120,12 +136,16 @@ done:
 static void
 update_lines (ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   GtkWidget *tab, *view;
   GtkTextBuffer *buffer;
+  GtkTextIter iter;
   int count;
   gchar *lines;
 
-  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  priv = example_app_window_get_instance_private (win);
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (priv->stack));
 
   if (tab == NULL)
     return;
@@ -133,21 +153,34 @@ update_lines (ExampleAppWindow *win)
   view = gtk_bin_get_child (GTK_BIN (tab));
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
-  count = gtk_text_buffer_get_line_count (buffer);
+  count = 0;
+
+  gtk_text_buffer_get_start_iter (buffer, &iter);
+  while (!gtk_text_iter_is_end (&iter))
+    {
+      count++;
+      if (!gtk_text_iter_forward_line (&iter))
+        break;
+    }
+
   lines = g_strdup_printf ("%d", count);
-  gtk_label_set_text (GTK_LABEL (win->lines), lines);
+  gtk_label_set_text (GTK_LABEL (priv->lines), lines);
   g_free (lines);
 }
 
 static void
-visible_child_changed (GObject          *stack,
-                       GParamSpec       *pspec,
-                       ExampleAppWindow *win)
+visible_child_changed (GObject    *stack,
+                       GParamSpec *pspec)
 {
+  ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
+
   if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
     return;
 
-  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
+  win = EXAMPLE_APP_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (stack)));
+  priv = example_app_window_get_instance_private (win);
+  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->searchbar), FALSE);
   update_words (win);
   update_lines (win);
 }
@@ -163,43 +196,45 @@ words_changed (GObject          *sidebar,
 static void
 example_app_window_init (ExampleAppWindow *win)
 {
+  ExampleAppWindowPrivate *priv;
   GtkBuilder *builder;
   GMenuModel *menu;
   GAction *action;
 
+  priv = example_app_window_get_instance_private (win);
   gtk_widget_init_template (GTK_WIDGET (win));
-  win->settings = g_settings_new ("org.gtk.exampleapp");
+  priv->settings = g_settings_new ("org.gtk.exampleapp");
 
-  g_settings_bind (win->settings, "transition",
-                   win->stack, "transition-type",
+  g_settings_bind (priv->settings, "transition",
+                   priv->stack, "transition-type",
                    G_SETTINGS_BIND_DEFAULT);
 
-  g_settings_bind (win->settings, "show-words",
-                   win->sidebar, "reveal-child",
+  g_settings_bind (priv->settings, "show-words",
+                   priv->sidebar, "reveal-child",
                    G_SETTINGS_BIND_DEFAULT);
 
-  g_object_bind_property (win->search, "active",
-                          win->searchbar, "search-mode-enabled",
+  g_object_bind_property (priv->search, "active",
+                          priv->searchbar, "search-mode-enabled",
                           G_BINDING_BIDIRECTIONAL);
 
-  g_signal_connect (win->sidebar, "notify::reveal-child",
+  g_signal_connect (priv->sidebar, "notify::reveal-child",
                     G_CALLBACK (words_changed), win);
 
   builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/gears-menu.ui");
   menu = G_MENU_MODEL (gtk_builder_get_object (builder, "menu"));
-  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (win->gears), menu);
+  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (priv->gears), menu);
   g_object_unref (builder);
 
-  action = g_settings_create_action (win->settings, "show-words");
+  action = g_settings_create_action (priv->settings, "show-words");
   g_action_map_add_action (G_ACTION_MAP (win), action);
   g_object_unref (action);
 
-  action = (GAction*) g_property_action_new ("show-lines", win->lines, "visible");
+  action = (GAction*) g_property_action_new ("show-lines", priv->lines, "visible");
   g_action_map_add_action (G_ACTION_MAP (win), action);
   g_object_unref (action);
 
-  g_object_bind_property (win->lines, "visible",
-                          win->lines_label, "visible",
+  g_object_bind_property (priv->lines, "visible",
+                          priv->lines_label, "visible",
                           G_BINDING_DEFAULT);
 }
 
@@ -207,10 +242,12 @@ static void
 example_app_window_dispose (GObject *object)
 {
   ExampleAppWindow *win;
+  ExampleAppWindowPrivate *priv;
 
   win = EXAMPLE_APP_WINDOW (object);
+  priv = example_app_window_get_instance_private (win);
 
-  g_clear_object (&win->settings);
+  g_clear_object (&priv->settings);
 
   G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
 }
@@ -223,15 +260,15 @@ example_app_window_class_init (ExampleAppWindowClass *class)
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gtk/exampleapp/window.ui");
 
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines_label);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines_label);
 
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), visible_child_changed);
@@ -247,6 +284,7 @@ void
 example_app_window_open (ExampleAppWindow *win,
                          GFile            *file)
 {
+  ExampleAppWindowPrivate *priv;
   gchar *basename;
   GtkWidget *scrolled, *view;
   gchar *contents;
@@ -255,16 +293,19 @@ example_app_window_open (ExampleAppWindow *win,
   GtkTextTag *tag;
   GtkTextIter start_iter, end_iter;
 
+  priv = example_app_window_get_instance_private (win);
   basename = g_file_get_basename (file);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_show (scrolled);
   gtk_widget_set_hexpand (scrolled, TRUE);
   gtk_widget_set_vexpand (scrolled, TRUE);
   view = gtk_text_view_new ();
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
   gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_widget_show (view);
   gtk_container_add (GTK_CONTAINER (scrolled), view);
-  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+  gtk_stack_add_titled (GTK_STACK (priv->stack), scrolled, basename, basename);
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
@@ -275,7 +316,7 @@ example_app_window_open (ExampleAppWindow *win,
     }
 
   tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
-  g_settings_bind (win->settings, "font",
+  g_settings_bind (priv->settings, "font",
                    tag, "font",
                    G_SETTINGS_BIND_DEFAULT);
 
@@ -285,7 +326,7 @@ example_app_window_open (ExampleAppWindow *win,
 
   g_free (basename);
 
-  gtk_widget_set_sensitive (win->search, TRUE);
+  gtk_widget_set_sensitive (priv->search, TRUE);
 
   update_words (win);
   update_lines (win);

examples/application9/prefs.ui

@@ -9,13 +9,15 @@
       <object class="GtkBox" id="vbox">
         <child>
           <object class="GtkGrid" id="grid">
+            <property name="visible">True</property>
             <property name="margin">6</property>
             <property name="row-spacing">12</property>
             <property name="column-spacing">6</property>
             <child>
               <object class="GtkLabel" id="fontlabel">
+                <property name="visible">True</property>
                 <property name="label">_Font:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">font</property>
                 <property name="xalign">1</property>
               </object>
@@ -26,6 +28,7 @@
             </child>
             <child>
               <object class="GtkFontButton" id="font">
+                <property name="visible">True</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
@@ -34,8 +37,9 @@
             </child>
             <child>
               <object class="GtkLabel" id="transitionlabel">
+                <property name="visible">True</property>
                 <property name="label">_Transition:</property>
-                <property name="use-underline">1</property>
+                <property name="use-underline">True</property>
                 <property name="mnemonic-widget">transition</property>
                 <property name="xalign">1</property>
               </object>
@@ -46,6 +50,7 @@
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition">
+                <property name="visible">True</property>
                 <items>
                   <item translatable="yes" id="none">None</item>
                   <item translatable="yes" id="crossfade">Fade</item>

examples/application9/window.ui

@@ -7,29 +7,47 @@
     <property name="default-height">400</property>
     <child>
       <object class="GtkBox" id="content_box">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkHeaderBar" id="header">
+            <property name="visible">True</property>
             <child>
               <object class="GtkLabel" id="lines_label">
-                <property name="visible">0</property>
+                <property name="visible">False</property>
                 <property name="label" translatable="yes">Lines:</property>
               </object>
+              <packing>
+                <property name="pack-type">start</property>
+              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="lines">
-                <property name="visible">0</property>
+                <property name="visible">False</property>
               </object>
+              <packing>
+                <property name="pack-type">start</property>
+              </packing>
             </child>
             <child type="title">
               <object class="GtkStackSwitcher" id="tabs">
+                <property name="visible">True</property>
                 <property name="stack">stack</property>
               </object>
             </child>
             <child>
               <object class="GtkToggleButton" id="search">
-                <property name="sensitive">0</property>
-                <property name="icon-name">edit-find-symbolic</property>
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="search-icon">
+                    <property name="visible">True</property>
+                    <property name="icon-name">edit-find-symbolic</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="pack-type">end</property>
@@ -37,7 +55,9 @@
             </child>
             <child>
               <object class="GtkMenuButton" id="gears">
+                <property name="visible">True</property>
                 <property name="direction">none</property>
+                <property name="use-popover">True</property>
                 <style>
                   <class name="image-button"/>
                 </style>
@@ -50,33 +70,41 @@
         </child>
         <child>
           <object class="GtkSearchBar" id="searchbar">
+            <property name="visible">True</property>
             <child>
               <object class="GtkSearchEntry" id="searchentry">
                 <signal name="search-changed" handler="search_text_changed"/>
+                <property name="visible">True</property>
               </object>
             </child>
           </object>
         </child>
         <child>
           <object class="GtkBox" id="hbox">
+            <property name="visible">True</property>
             <child>
               <object class="GtkRevealer" id="sidebar">
+                <property name="visible">True</property>
                 <property name="transition-type">slide-right</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="sidebar-sw">
-                    <property name="hscrollbar-policy">never</property>
-                    <child>
-                      <object class="GtkListBox" id="words">
-                        <property name="selection-mode">none</property>
-                      </object>
-                    </child>
-                  </object>
+                 <object class="GtkScrolledWindow" id="sidebar-sw">
+                   <property name="visible">True</property>
+                   <property name="hscrollbar-policy">never</property>
+                   <property name="vscrollbar-policy">automatic</property>
+                   <child>
+                     <object class="GtkListBox" id="words">
+                       <property name="visible">True</property>
+                       <property name="selection-mode">none</property>
+                     </object>
+                   </child>
+                 </object>
                 </child>
               </object>
             </child>
             <child>
               <object class="GtkStack" id="stack">
                 <signal name="notify::visible-child" handler="visible_child_changed"/>
+                <property name="visible">True</property>
               </object>
             </child>
           </object>

examples/bp/gtk/help-overlay.ui

@@ -4,31 +4,37 @@
     <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
         <property name="section-name">shortcuts</property>
         <property name="max-height">12</property>
         <child>
           <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
             <property name="title">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">app.new</property>
                 <property name="title" translatable="yes">New Window</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">app.quit</property>
                 <property name="title" translatable="yes">Quit</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">win.fullscreen</property>
                 <property name="title" translatable="yes">Fullscreen</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">win.show-help-overlay</property>
                 <property name="title" translatable="yes">Shortcuts</property>
               </object>
@@ -37,33 +43,39 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
             <property name="title">Text</property>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">win.copy</property>
                 <property name="title" translatable="yes">Copy</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">win.paste</property>
                 <property name="title" translatable="yes">Paste</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">win.justify::left</property>
                 <property name="title" translatable="yes">Justify left</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">win.justify::center</property>
                 <property name="title" translatable="yes">Justify center</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
                 <property name="action-name">win.justify::right</property>
                 <property name="title" translatable="yes">Justify right</property>
               </object>

examples/bp/gtk/menus.ui

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <interface>
   <menu id="app-menu">
     <section>

examples/builder.ui

@@ -1,10 +1,13 @@
 <interface>
   <object id="window" class="GtkWindow">
+    <property name="visible">True</property>
     <property name="title">Grid</property>
     <child>
       <object id="grid" class="GtkGrid">
+        <property name="visible">True</property>
         <child>
           <object id="button1" class="GtkButton">
+            <property name="visible">True</property>
             <property name="label">Button 1</property>
           </object>
           <packing>
@@ -14,6 +17,7 @@
         </child>
         <child>
           <object id="button2" class="GtkButton">
+            <property name="visible">True</property>
             <property name="label">Button 2</property>
           </object>
           <packing>
@@ -23,6 +27,7 @@
         </child>
         <child>
           <object id="quit" class="GtkButton">
+            <property name="visible">True</property>
             <property name="label">Quit</property>
           </object>
           <packing>
@@ -32,6 +37,8 @@
           </packing>
         </child>
       </object>
+      <packing>
+      </packing>
     </child>
   </object>
 </interface>

examples/drawing.c

@@ -157,16 +157,17 @@ activate (GtkApplication *app,
   g_signal_connect_after (drawing_area, "size-allocate",
                           G_CALLBACK (size_allocate_cb), NULL);
 
-  drag = gtk_gesture_drag_new ();
+  drag = gtk_gesture_drag_new (drawing_area);
   gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
-  gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (drag));
+  g_object_set_data_full (G_OBJECT (drawing_area), "drag", drag, g_object_unref);
+
   g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), drawing_area);
   g_signal_connect (drag, "drag-update", G_CALLBACK (drag_update), drawing_area);
   g_signal_connect (drag, "drag-end", G_CALLBACK (drag_end), drawing_area);
 
-  press = gtk_gesture_multi_press_new ();
+  press = gtk_gesture_multi_press_new (drawing_area);
   gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (press), GDK_BUTTON_SECONDARY);
-  gtk_widget_add_controller (drawing_area, GTK_EVENT_CONTROLLER (press));
+  g_object_set_data_full (G_OBJECT (drawing_area), "press", press, g_object_unref);
 
   g_signal_connect (press, "pressed", G_CALLBACK (pressed), drawing_area);
 

examples/search-bar.c

@@ -41,11 +41,10 @@ activate_cb (GtkApplication *app,
 
   gtk_search_bar_connect_entry (GTK_SEARCH_BAR (search_bar), GTK_ENTRY (entry));
 
-  controller = gtk_event_controller_key_new ();
+  controller = gtk_event_controller_key_new (window);
   g_object_set_data_full (G_OBJECT (window), "controller", controller, g_object_unref);
   g_signal_connect (controller, "key-pressed",
                     G_CALLBACK (window_key_pressed), search_bar);
-  gtk_widget_add_controller (window, controller);
 }
 
 gint

gdk/broadway/gdkcairocontext-broadway.c

@@ -1,143 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- *
- * Copyright © 2018  Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include "gdkconfig.h"
-
-#include "gdkcairocontext-broadway.h"
-#include "gdktextureprivate.h"
-#include "gdkprivate-broadway.h"
-
-G_DEFINE_TYPE (GdkBroadwayCairoContext, gdk_broadway_cairo_context, GDK_TYPE_CAIRO_CONTEXT)
-
-static void
-gdk_broadway_cairo_context_dispose (GObject *object)
-{
-  G_OBJECT_CLASS (gdk_broadway_cairo_context_parent_class)->dispose (object);
-}
-
-static void
-gdk_broadway_cairo_context_begin_frame (GdkDrawContext *draw_context,
-                                        cairo_region_t *region)
-{
-  GdkBroadwayCairoContext *self = GDK_BROADWAY_CAIRO_CONTEXT (draw_context);
-  GdkSurface *surface = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (self));
-  cairo_t *cr;
-  cairo_region_t *repaint_region;
-  int width, height, scale;
-
-  width = gdk_surface_get_width (surface);
-  height = gdk_surface_get_height (surface);
-  scale = gdk_surface_get_scale_factor (surface);
-  self->paint_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                                    width * scale, height * scale);
-  cairo_surface_set_device_scale (self->paint_surface, scale, scale);
-
-  repaint_region = cairo_region_create_rectangle (&(cairo_rectangle_int_t) { 0, 0, width, height });
-  cairo_region_union (region, repaint_region);
-  cairo_region_destroy (repaint_region);
-
-  /* clear the repaint area */
-  cr = cairo_create (self->paint_surface);
-  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-  cairo_fill (cr);
-  cairo_destroy (cr);
-}
-
-static void
-add_uint32 (GArray *nodes, guint32 v)
-{
-  g_array_append_val (nodes, v);
-}
-
-static void
-add_float (GArray *nodes, float f)
-{
-  gint32 i = (gint32) (f * 256.0f);
-  guint u = (guint32) i;
-  g_array_append_val (nodes, u);
-}
-
-static void
-gdk_broadway_cairo_context_end_frame (GdkDrawContext *draw_context,
-                                      cairo_region_t *painted)
-{
-  GdkBroadwayCairoContext *self = GDK_BROADWAY_CAIRO_CONTEXT (draw_context);
-  GdkDisplay *display = gdk_draw_context_get_display (draw_context);
-  GdkSurface *surface = gdk_draw_context_get_surface (draw_context);
-  GdkTexture *texture;
-  GPtrArray *node_textures;
-  GArray *nodes;
-  guint32 texture_id;
-
-  nodes = g_array_new (FALSE, FALSE, sizeof(guint32));
-  node_textures = g_ptr_array_new_with_free_func (g_object_unref);
-
-  texture = gdk_texture_new_for_surface ((cairo_surface_t *)self->paint_surface);
-  g_ptr_array_add (node_textures, g_object_ref (texture)); /* Transfers ownership to node_textures */
-  texture_id = gdk_broadway_display_ensure_texture (display, texture);
-
-  add_uint32 (nodes, BROADWAY_NODE_TEXTURE);
-  add_float (nodes, 0);
-  add_float (nodes, 0);
-  add_float (nodes, cairo_image_surface_get_width (self->paint_surface));
-  add_float (nodes, cairo_image_surface_get_height (self->paint_surface));
-  add_uint32 (nodes, texture_id);
-
-  gdk_broadway_surface_set_nodes (surface, nodes, node_textures);
-  g_array_unref (nodes);
-  g_ptr_array_unref (node_textures);
-
-  cairo_surface_destroy (self->paint_surface);
-  self->paint_surface = NULL;
-}
-
-static void
-gdk_broadway_cairo_context_surface_resized (GdkDrawContext *draw_context)
-{
-}
-
-static cairo_t *
-gdk_broadway_cairo_context_cairo_create (GdkCairoContext *context)
-{
-  GdkBroadwayCairoContext *self = GDK_BROADWAY_CAIRO_CONTEXT (context);
-
-  return cairo_create (self->paint_surface);
-}
-
-static void
-gdk_broadway_cairo_context_class_init (GdkBroadwayCairoContextClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GdkDrawContextClass *draw_context_class = GDK_DRAW_CONTEXT_CLASS (klass);
-  GdkCairoContextClass *cairo_context_class = GDK_CAIRO_CONTEXT_CLASS (klass);
-
-  gobject_class->dispose = gdk_broadway_cairo_context_dispose;
-
-  draw_context_class->begin_frame = gdk_broadway_cairo_context_begin_frame;
-  draw_context_class->end_frame = gdk_broadway_cairo_context_end_frame;
-  draw_context_class->surface_resized = gdk_broadway_cairo_context_surface_resized;
-
-  cairo_context_class->cairo_create = gdk_broadway_cairo_context_cairo_create;
-}
-
-static void
-gdk_broadway_cairo_context_init (GdkBroadwayCairoContext *self)
-{
-}

gdk/broadway/gdkcairocontext-broadway.h

@@ -1,55 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- *
- * Copyright © 2018  Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GDK_BROADWAY_CAIRO_CONTEXT__
-#define __GDK_BROADWAY_CAIRO_CONTEXT__
-
-#include "gdkconfig.h"
-
-#include "gdkcairocontextprivate.h"
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_BROADWAY_CAIRO_CONTEXT		(gdk_broadway_cairo_context_get_type ())
-#define GDK_BROADWAY_CAIRO_CONTEXT(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_BROADWAY_CAIRO_CONTEXT, GdkBroadwayCairoContext))
-#define GDK_IS_BROADWAY_CAIRO_CONTEXT(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_BROADWAY_CAIRO_CONTEXT))
-#define GDK_BROADWAY_CAIRO_CONTEXT_CLASS(klass) 	(G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_BROADWAY_CAIRO_CONTEXT, GdkBroadwayCairoContextClass))
-#define GDK_IS_BROADWAY_CAIRO_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_BROADWAY_CAIRO_CONTEXT))
-#define GDK_BROADWAY_CAIRO_CONTEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_BROADWAY_CAIRO_CONTEXT, GdkBroadwayCairoContextClass))
-
-typedef struct _GdkBroadwayCairoContext GdkBroadwayCairoContext;
-typedef struct _GdkBroadwayCairoContextClass GdkBroadwayCairoContextClass;
-
-struct _GdkBroadwayCairoContext
-{
-  GdkCairoContext parent_instance;
-
-  cairo_surface_t *paint_surface;
-};
-
-struct _GdkBroadwayCairoContextClass
-{
-  GdkCairoContextClass parent_class;
-};
-
-GDK_AVAILABLE_IN_ALL
-GType gdk_broadway_cairo_context_get_type (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __GDK_BROADWAY_CAIRO_CONTEXT__ */