From e753dc2e5a82346d934f6a84523ad404cecf5ff8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 3 Jul 2004 03:37:57 +0000 Subject: [PATCH] Unset the displayed row when unsetting the model. (#138560, Christian Fri Jul 2 23:34:33 2004 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed row when unsetting the model. (#138560, Christian Persch) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcombobox.c | 3 +++ 5 files changed, 23 insertions(+) diff --git a/ChangeLog b/ChangeLog index f4c971bad4..fb2b730edf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 2 23:34:33 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed + row when unsetting the model. (#138560, Christian Persch) + Fri Jul 2 22:41:27 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Properly align mask and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f4c971bad4..fb2b730edf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jul 2 23:34:33 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed + row when unsetting the model. (#138560, Christian Persch) + Fri Jul 2 22:41:27 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Properly align mask and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f4c971bad4..fb2b730edf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jul 2 23:34:33 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed + row when unsetting the model. (#138560, Christian Persch) + Fri Jul 2 22:41:27 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Properly align mask and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f4c971bad4..fb2b730edf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jul 2 23:34:33 2004 Matthias Clasen + + * gtk/gtkcombobox.c (gtk_combo_box_unset_model): Unset the displayed + row when unsetting the model. (#138560, Christian Persch) + Fri Jul 2 22:41:27 2004 Matthias Clasen * gtk/gtkimage.c (gtk_image_expose): Properly align mask and diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index e3675dc7db..9d6b5424b3 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1524,6 +1524,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