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
This commit is contained in:
Xan Lopez 2007-02-16 16:00:19 +00:00
parent 9bbec51bf1
commit ee6b709ffd
2 changed files with 12 additions and 12 deletions

View File

@ -1,3 +1,8 @@
2007-02-16 Xan Lopez <xan@gnome.org>
* 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 <mclasen@redhat.com>
* gtk/gtkmain.c: Run pre_parse_hook only once. (#403139, Kjartan

View File

@ -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);
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);
if (combo_box->priv->tree_view &&
combo_box->priv->cell_view_frame)
{
gtk_container_propagate_expose (GTK_CONTAINER (widget),
combo_box->priv->cell_view_frame, event);
}
gtk_container_propagate_expose (GTK_CONTAINER (widget),