[gtk+/wip/baedert/children: 34/54] widget: Check for containerness before calling container API
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/children: 34/54] widget: Check for containerness before calling container API
- Date: Mon, 28 Nov 2016 19:08:44 +0000 (UTC)
commit d3eb0b63d4297c92a93f42465943b1d7c3866c56
Author: Timm Bäder <mail baedert org>
Date: Fri Nov 18 09:53:58 2016 +0100
widget: Check for containerness before calling container API
gtk/gtkwidget.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index e183e7b..eea9cb9 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4027,8 +4027,11 @@ gtk_widget_unparent (GtkWidget *widget)
if (_gtk_widget_is_toplevel (toplevel))
_gtk_window_unset_focus_and_default (GTK_WINDOW (toplevel), widget);
- if (gtk_container_get_focus_child (GTK_CONTAINER (priv->parent)) == widget)
- gtk_container_set_focus_child (GTK_CONTAINER (priv->parent), NULL);
+ if (GTK_IS_CONTAINER (priv->parent))
+ {
+ if (gtk_container_get_focus_child (GTK_CONTAINER (priv->parent)) == widget)
+ gtk_container_set_focus_child (GTK_CONTAINER (priv->parent), NULL);
+ }
if (_gtk_widget_is_drawable (priv->parent))
gtk_widget_queue_draw_area (priv->parent,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]