AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-22 23:04:07 +00:00
Code Issues Projects Releases Wiki Activity

widget: Improve warning messages

Browse Source 
When we print warnings about a widget, using
gtk_widget_get_name() is slightly better than
G_OBJECT_TYPE_NAME(), since it will give us
the widgets unique name when available.
This commit is contained in:
Matthias Clasen 2019-05-04 18:15:03 +00:00
parent 18e396ef6c
commit 27596c328a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkwidget.c
View File

@ -6737,17 +6737,17 @@ gtk_widget_verify_invariants (GtkWidget *widget)
if (!priv->realized) if (!priv->realized)
g_warning ("%s %p is mapped but not realized", g_warning ("%s %p is mapped but not realized",
G_OBJECT_TYPE_NAME (widget), widget); gtk_widget_get_name (widget), widget);
if (!priv->visible) if (!priv->visible)
g_warning ("%s %p is mapped but not visible", g_warning ("%s %p is mapped but not visible",
G_OBJECT_TYPE_NAME (widget), widget); gtk_widget_get_name (widget), widget);
if (!GTK_IS_ROOT (widget)) if (!GTK_IS_ROOT (widget))
{ {
if (!priv->child_visible) if (!priv->child_visible)
g_warning ("%s %p is mapped but not child_visible", g_warning ("%s %p is mapped but not child_visible",
G_OBJECT_TYPE_NAME (widget), widget); gtk_widget_get_name (widget), widget);
} }
} }
else else
@ -6797,8 +6797,8 @@ gtk_widget_verify_invariants (GtkWidget *widget)
if (priv->realized) if (priv->realized)
g_warning ("%s %p is not realized but child %s %p is realized", g_warning ("%s %p is not realized but child %s %p is realized",
parent ? G_OBJECT_TYPE_NAME (parent) : "no parent", parent, parent ? gtk_widget_get_name (parent) : "no parent", parent,
G_OBJECT_TYPE_NAME (widget), widget); gtk_widget_get_name (widget), widget);
} }
if (parent && if (parent &&
@ -6810,8 +6810,8 @@ gtk_widget_verify_invariants (GtkWidget *widget)
if (!priv->mapped) if (!priv->mapped)
g_warning ("%s %p is mapped but visible child %s %p is not mapped", g_warning ("%s %p is mapped but visible child %s %p is not mapped",
G_OBJECT_TYPE_NAME (parent), parent, gtk_widget_get_name (parent), parent,
G_OBJECT_TYPE_NAME (widget), widget); gtk_widget_get_name (widget), widget);
} }
else if (!GTK_IS_ROOT (widget)) else if (!GTK_IS_ROOT (widget))
{ {
@ -6819,10 +6819,10 @@ gtk_widget_verify_invariants (GtkWidget *widget)
if (priv->mapped) if (priv->mapped)
g_warning ("%s %p is mapped but visible=%d child_visible=%d parent %s %p mapped=%d", g_warning ("%s %p is mapped but visible=%d child_visible=%d parent %s %p mapped=%d",
G_OBJECT_TYPE_NAME (widget), widget, gtk_widget_get_name (widget), widget,
priv->visible, priv->visible,
priv->child_visible, priv->child_visible,
parent ? G_OBJECT_TYPE_NAME (parent) : "no parent", parent, parent ? gtk_widget_get_name (parent) : "no parent", parent,
parent ? parent->priv->mapped : FALSE); parent ? parent->priv->mapped : FALSE);
} }
} }
@ -12915,7 +12915,7 @@ gtk_widget_snapshot (GtkWidget *widget,
if (_gtk_widget_get_alloc_needed (widget)) if (_gtk_widget_get_alloc_needed (widget))
{ {
g_warning ("Trying to snapshot %s %p without a current allocation", G_OBJECT_TYPE_NAME (widget), widget); g_warning ("Trying to snapshot %s %p without a current allocation", gtk_widget_get_name (widget), widget);
return; return;
} }