Unset the displayed row when unsetting the model. (#138560, Christian

Fri Jul  2 23:34:33 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed
	row when unsetting the model.  (#138560, Christian Persch)
This commit is contained in:
Matthias Clasen 2004-07-03 03:37:44 +00:00 committed by Matthias Clasen
parent 1b7efe47fe
commit 6a9e67331f
5 changed files with 44 additions and 1 deletions

View File

@ -1,3 +1,13 @@
Fri Jul 2 23:34:33 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed
row when unsetting the model. (#138560, Christian Persch)
Fri Jul 2 23:01:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (update_menu_sensitivity): Don't crash if there
are no items.
Fri Jul 2 22:41:27 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkimage.c (gtk_image_expose): Properly align mask and

View File

@ -1,3 +1,13 @@
Fri Jul 2 23:34:33 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed
row when unsetting the model. (#138560, Christian Persch)
Fri Jul 2 23:01:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (update_menu_sensitivity): Don't crash if there
are no items.
Fri Jul 2 22:41:27 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkimage.c (gtk_image_expose): Properly align mask and

View File

@ -1,3 +1,13 @@
Fri Jul 2 23:34:33 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed
row when unsetting the model. (#138560, Christian Persch)
Fri Jul 2 23:01:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (update_menu_sensitivity): Don't crash if there
are no items.
Fri Jul 2 22:41:27 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkimage.c (gtk_image_expose): Properly align mask and

View File

@ -1,3 +1,13 @@
Fri Jul 2 23:34:33 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed
row when unsetting the model. (#138560, Christian Persch)
Fri Jul 2 23:01:07 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (update_menu_sensitivity): Don't crash if there
are no items.
Fri Jul 2 22:41:27 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkimage.c (gtk_image_expose): Properly align mask and

View File

@ -1266,7 +1266,7 @@ update_menu_sensitivity (GtkComboBox *combo_box)
children = gtk_container_get_children (GTK_CONTAINER (menu));
child = children;
if (GTK_IS_TEAROFF_MENU_ITEM (child->data))
if (child && GTK_IS_TEAROFF_MENU_ITEM (child->data))
child = child->next;
for (i = 0; i < items; i++, child = child->next)
@ -1692,6 +1692,9 @@ gtk_combo_box_unset_model (GtkComboBox *combo_box)
g_object_unref (G_OBJECT (combo_box->priv->model));
combo_box->priv->model = NULL;
}
if (combo_box->priv->cell_view)
gtk_cell_view_set_displayed_row (GTK_CELL_VIEW (combo_box->priv->cell_view), NULL);
}
static void