From 27c76db9569372cfb8f8797b67e1ac0d2f4cdfc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Wed, 17 Jan 2018 13:11:32 +0100 Subject: [PATCH] box: Simplify some code All out varibles in measure implementations must be non-null and -1 is the default value for the baseline parameters. --- gtk/gtkbox.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index f59284f294..55681262bf 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -1303,13 +1303,7 @@ gtk_box_measure (GtkWidget *widget, if (private->orientation != orientation) gtk_box_compute_size_for_opposing_orientation (box, for_size, minimum, natural, minimum_baseline, natural_baseline); else - { - if (minimum_baseline) - *minimum_baseline = -1; - if (natural_baseline) - *natural_baseline = -1; - gtk_box_compute_size_for_orientation (box, for_size, minimum, natural); - } + gtk_box_compute_size_for_orientation (box, for_size, minimum, natural); } }