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

container: Turn assert into return_if_fail()

Browse Source 
There's no reason to insta-crash when something goes wrong. Just don't
do anything stupid.

Also, remove the SPCIAL_CONTAINER() exception. Every case where special
containers needed this, it is wrong and made containers draw children
multiple times.
This commit is contained in:
Benjamin Otte 2016-01-21 02:19:04 +01:00
parent 6bb8da5564
commit d4f853dc64
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkcontainer.c
View File

@ -3756,9 +3756,7 @@ gtk_container_propagate_draw (GtkContainer *container,
g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_CONTAINER (container));
g_return_if_fail (GTK_IS_WIDGET (child)); g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (cr != NULL); g_return_if_fail (cr != NULL);
g_return_if_fail (_gtk_widget_get_parent (child) == GTK_WIDGET (container));
g_assert (_gtk_widget_get_parent (child) == GTK_WIDGET (container) ||
SPECIAL_CONTAINER (container));
if (!gtk_container_should_propagate_draw (container, child, cr)) if (!gtk_container_should_propagate_draw (container, child, cr))
return; return;