[glade] Revert "GtkBox, GtkGrid: support adding widgets even if there is no placeholder"
- From: Juan Pablo Ugarte <jpu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade] Revert "GtkBox, GtkGrid: support adding widgets even if there is no placeholder"
- Date: Sat, 19 Sep 2020 00:38:33 +0000 (UTC)
commit 3efb36627fd0eeb13a377fa18744df674847f6aa
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date: Thu Sep 17 19:37:53 2020 -0300
Revert "GtkBox, GtkGrid: support adding widgets even if there is no placeholder"
This reverts commit 3b94aec9d8733ab991d22cf447850c2cf6339fdd.
plugins/gtk+/glade-gtk-grid.c | 10 ++--------
plugins/gtk+/gtk+.xml | 2 --
2 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/plugins/gtk+/glade-gtk-grid.c b/plugins/gtk+/glade-gtk-grid.c
index c2094a11..27f069d9 100644
--- a/plugins/gtk+/glade-gtk-grid.c
+++ b/plugins/gtk+/glade-gtk-grid.c
@@ -151,7 +151,7 @@ glade_gtk_grid_refresh_placeholders (GtkGrid *grid,
}
static void
-glade_gtk_grid_refresh_size (GObject *container)
+glade_gtk_grid_parse_finished (GladeProject *project, GObject *container)
{
GladeWidget *gwidget = glade_widget_get_from_gobject (container);
gint initial_rows = 0, initial_columns = 0;
@@ -193,12 +193,6 @@ glade_gtk_grid_refresh_size (GObject *container)
glade_gtk_grid_refresh_placeholders (GTK_GRID (container), TRUE);
}
-static void
-glade_gtk_grid_parse_finished (GladeProject *project, GObject *container)
-{
- glade_gtk_grid_refresh_size (container);
-}
-
void
glade_gtk_grid_post_create (GladeWidgetAdaptor *adaptor,
GObject *container,
@@ -295,7 +289,7 @@ glade_gtk_grid_add_child (GladeWidgetAdaptor *adaptor,
gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (child));
- glade_gtk_grid_refresh_size (object);
+ glade_gtk_grid_refresh_placeholders (GTK_GRID (object), FALSE);
}
void
diff --git a/plugins/gtk+/gtk+.xml b/plugins/gtk+/gtk+.xml
index 77b19abf..a01466fa 100644
--- a/plugins/gtk+/gtk+.xml
+++ b/plugins/gtk+/gtk+.xml
@@ -617,7 +617,6 @@
<get-property-function>glade_gtk_box_get_property</get-property-function>
<verify-function>glade_gtk_box_verify_property</verify-function>
<add-child-function>glade_gtk_box_add_child</add-child-function>
- <add-child-verify-function>gtk_true</add-child-verify-function>
<remove-child-function>glade_gtk_box_remove_child</remove-child-function>
<replace-child-function>glade_gtk_box_replace_child</replace-child-function>
<child-set-property-function>glade_gtk_box_set_child_property</child-set-property-function>
@@ -2241,7 +2240,6 @@
<child-verify-function>glade_gtk_grid_child_verify_property</child-verify-function>
<get-children-function>glade_gtk_grid_get_children</get-children-function>
<add-child-function>glade_gtk_grid_add_child</add-child-function>
- <add-child-verify-function>gtk_true</add-child-verify-function>
<remove-child-function>glade_gtk_grid_remove_child</remove-child-function>
<replace-child-function>glade_gtk_grid_replace_child</replace-child-function>
<set-property-function>glade_gtk_grid_set_property</set-property-function>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]