From: Xan Lopez Date: Fri, 16 Feb 2007 16:00:19 +0000 (+0000) Subject: Cleanup the logic in expose event handler. Reviewed by Matthias Clasen, X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~34348 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ee6b709ffd0e6809e9b04eeced99dc475fb7ed94;p=gtk4.git Cleanup the logic in expose event handler. Reviewed by Matthias Clasen, * gtk/gtkcombobox.c (gtk_combo_box_expose_event): Cleanup the logic in expose event handler. Reviewed by Matthias Clasen, #406112 svn path=/trunk/; revision=17312 --- diff --git a/ChangeLog b/ChangeLog index 52906a53e3..a62cd1d84e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-02-16 Xan Lopez + + * gtk/gtkcombobox.c (gtk_combo_box_expose_event): Cleanup the logic + in expose event handler. Reviewed by Matthias Clasen, #406112 + 2007-02-16 Matthias Clasen * gtk/gtkmain.c: Run pre_parse_hook only once. (#403139, Kjartan diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 9fa730efd2..f6fdb965d3 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2276,19 +2276,14 @@ gtk_combo_box_expose_event (GtkWidget *widget, { GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - if (!combo_box->priv->tree_view) - { - gtk_container_propagate_expose (GTK_CONTAINER (widget), - combo_box->priv->button, event); - } - else + gtk_container_propagate_expose (GTK_CONTAINER (widget), + combo_box->priv->button, event); + + if (combo_box->priv->tree_view && + combo_box->priv->cell_view_frame) { gtk_container_propagate_expose (GTK_CONTAINER (widget), - combo_box->priv->button, event); - - if (combo_box->priv->cell_view_frame) - gtk_container_propagate_expose (GTK_CONTAINER (widget), - combo_box->priv->cell_view_frame, event); + combo_box->priv->cell_view_frame, event); } gtk_container_propagate_expose (GTK_CONTAINER (widget),