callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sizerequest: Improve warning message

Browse Source 
Actually print out the function we're warning about
This commit is contained in:
Benjamin Otte
2012-05-07 17:37:36 +02:00
parent 86cebc9b43
commit 5722f9ab0f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtksizerequest.c
View File

@ -316,6 +316,16 @@ commit_cached_size (GtkWidget *widget,
} }
} }
static const char *
get_vfunc_name (GtkSizeGroupMode orientation,
gint for_size)
{
if (orientation == GTK_SIZE_GROUP_HORIZONTAL)
return for_size < 0 ? "get_preferred_width" : "get_preferred_width_for_height";
else
return for_size < 0 ? "get_preferred_height" : "get_preferred_height_for_width";
}
/* This is the main function that checks for a cached size and /* This is the main function that checks for a cached size and
* possibly queries the widget class to compute the size if it's * possibly queries the widget class to compute the size if it's
* not cached. If the for_size here is -1, then get_preferred_width() * not cached. If the for_size here is -1, then get_preferred_width()
@ -410,8 +420,8 @@ compute_size_for_orientation (GtkWidget *widget,
if (min_size > nat_size) if (min_size > nat_size)
{ {
g_warning ("%s %p reported min size %d and natural size %d; natural size must be >= min size", g_warning ("%s %p reported min size %d and natural size %d in %s(); natural size must be >= min size",
G_OBJECT_TYPE_NAME (widget), widget, min_size, nat_size); G_OBJECT_TYPE_NAME (widget), widget, min_size, nat_size, get_vfunc_name (orientation, for_size));
} }
if (orientation == GTK_SIZE_GROUP_HORIZONTAL) if (orientation == GTK_SIZE_GROUP_HORIZONTAL)