[gtk] widget: Avoid some more ->priv accesses
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] widget: Avoid some more ->priv accesses
- Date: Thu, 8 Nov 2018 04:50:40 +0000 (UTC)
commit 481a78eee7c9922e252f0a6dd352f9a5fe165fe4
Author: Timm Bäder <mail baedert org>
Date: Thu Oct 18 12:00:47 2018 +0200
widget: Avoid some more ->priv accesses
gtk/gtkwidget.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index c8aba33e8c..0ca54c1b3f 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -7974,7 +7974,11 @@ gtk_widget_get_ancestor (GtkWidget *widget,
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
while (widget && !g_type_is_a (G_OBJECT_TYPE (widget), widget_type))
- widget = widget->priv->parent;
+ {
+ GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
+
+ widget = priv->parent;
+ }
return widget;
}
@@ -8019,9 +8023,12 @@ gtk_widget_is_ancestor (GtkWidget *widget,
while (widget)
{
- if (widget->priv->parent == ancestor)
- return TRUE;
- widget = widget->priv->parent;
+ GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
+
+ if (priv->parent == ancestor)
+ return TRUE;
+
+ widget = priv->parent;
}
return FALSE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]