diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/gtkcombobox.c | 7 |
5 files changed, 27 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2004-07-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c: Don't forget to destroy the row separator + function user data when the combo box is destroyed. + +2004-07-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.h: * gtk/gtkcombobox.c: Change the api for separators to use a separator function instead of a boolean column. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e260f91445..d118a770e1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-07-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c: Don't forget to destroy the row separator + function user data when the combo box is destroyed. + +2004-07-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.h: * gtk/gtkcombobox.c: Change the api for separators to use a separator function instead of a boolean column. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e260f91445..d118a770e1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-07-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c: Don't forget to destroy the row separator + function user data when the combo box is destroyed. + +2004-07-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.h: * gtk/gtkcombobox.c: Change the api for separators to use a separator function instead of a boolean column. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e260f91445..d118a770e1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-07-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c: Don't forget to destroy the row separator + function user data when the combo box is destroyed. + +2004-07-30 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.h: * gtk/gtkcombobox.c: Change the api for separators to use a separator function instead of a boolean column. diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index bfae4b0e73..1b0dc441db 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -4120,6 +4120,13 @@ gtk_combo_box_destroy (GtkObject *object) gtk_combo_box_popdown (combo_box); + if (combo_box->priv->row_separator_destroy) + (* combo_box->priv->row_separator_destroy) (combo_box->priv->row_separator_data); + + combo_box->priv->row_separator_func = NULL; + combo_box->priv->row_separator_data = NULL; + combo_box->priv->row_separator_destroy = NULL; + combo_box->priv->destroying = 1; GTK_OBJECT_CLASS (parent_class)->destroy (object); |