summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-11-16 02:27:20 -0500
committerMatthias Clasen <mclasen@redhat.com>2014-11-16 02:30:19 -0500
commitecfcb3e2cc09297c48622a5aa293bd5fac2979cf (patch)
treee6f808d0f963d6abb4ee9fddc80bd464317adbc4
parent1e39790c49e0249ffb8b432e813e98fe76a8aee6 (diff)
downloadgtk+-ecfcb3e2cc09297c48622a5aa293bd5fac2979cf.tar.gz
Make gtk_container_remove work on popover menus
Extend the hack we have in place for composite containers to GtkPopoverMenu.
-rw-r--r--gtk/gtkcontainer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index ffcd09f11b..0d7c7cd898 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1722,7 +1722,10 @@ gtk_container_remove (GtkContainer *container,
{
g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_IS_WIDGET (widget));
- g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (container) || GTK_IS_ASSISTANT (container) || GTK_IS_ACTION_BAR (container));
+ g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (container) ||
+ GTK_IS_ASSISTANT (container) ||
+ GTK_IS_ACTION_BAR (container) ||
+ GTK_IS_POPOVER_MENU (container));
g_object_ref (container);
g_object_ref (widget);