From: Emmanuele Bassi <ebassi@gnome.org>
Date: Mon, 29 Nov 2021 16:57:21 +0000 (+0000)
Subject: stack: Assert that StackPage:child is set
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~4^2~68^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9eb6de403fbb66f690458861d2a4e8b5603b41c7;p=gtk4.git

stack: Assert that StackPage:child is set

Childless GtkStackPage instances are not allowed, otherwise everything
falls apart in random places.
---

diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
index 1df1ec244a..7c8d9afd75 100644
--- a/gtk/gtkstack.c
+++ b/gtk/gtkstack.c
@@ -395,6 +395,20 @@ gtk_stack_page_set_property (GObject      *object,
       break;
     }
 }
+
+static void
+gtk_stack_page_constructed (GObject *gobject)
+{
+  GtkStackPage *self = GTK_STACK_PAGE (gobject);
+
+  if (G_UNLIKELY (self->widget == NULL))
+    g_error ("GtkStackPage '%s' [%p] is missing a child widget",
+             self->name != NULL ? self->name : "<unnamed>",
+             self);
+
+  G_OBJECT_CLASS (gtk_stack_page_parent_class)->constructed (gobject);
+}
+
 static void
 gtk_stack_page_class_init (GtkStackPageClass *class)
 {
@@ -404,6 +418,7 @@ gtk_stack_page_class_init (GtkStackPageClass *class)
   object_class->dispose = gtk_stack_page_dispose;
   object_class->get_property = gtk_stack_page_get_property;
   object_class->set_property = gtk_stack_page_set_property;
+  object_class->constructed = gtk_stack_page_constructed;
 
   /**
    * GtkStackPage:child: (attributes org.gtk.Property.get=gtk_stack_page_get_child)
@@ -2627,7 +2642,7 @@ gtk_stack_measure (GtkWidget      *widget,
               int min_for_size;
 
               gtk_widget_measure (child, OPPOSITE_ORIENTATION (orientation), -1, &min_for_size, NULL, NULL, NULL);
-              
+
               gtk_widget_measure (child, orientation, MAX (min_for_size, for_size), &child_min, &child_nat, NULL, NULL);
             }
           else