From b78ee57ea41c5ff0cb98381301a9264c2404eb7d Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 30 Sep 2003 19:11:55 +0000 Subject: [PATCH] actually show the child. Tue Sep 30 21:08:43 2003 Kristian Rietveld * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child. * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_init): ditto. (#123543, Marco Pesenti Gritti). --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkcombobox.c | 1 + gtk/gtkcomboboxentry.c | 1 + 7 files changed, 37 insertions(+) diff --git a/ChangeLog b/ChangeLog index 21476132a7..65ed428491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 30 21:08:43 2003 Kristian Rietveld + + * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child. + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_init): ditto. (#123543, + Marco Pesenti Gritti). + 2003-09-30 Murray Cumming * gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable* diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 21476132a7..65ed428491 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Sep 30 21:08:43 2003 Kristian Rietveld + + * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child. + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_init): ditto. (#123543, + Marco Pesenti Gritti). + 2003-09-30 Murray Cumming * gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable* diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 21476132a7..65ed428491 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Sep 30 21:08:43 2003 Kristian Rietveld + + * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child. + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_init): ditto. (#123543, + Marco Pesenti Gritti). + 2003-09-30 Murray Cumming * gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable* diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 21476132a7..65ed428491 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Sep 30 21:08:43 2003 Kristian Rietveld + + * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child. + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_init): ditto. (#123543, + Marco Pesenti Gritti). + 2003-09-30 Murray Cumming * gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable* diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 21476132a7..65ed428491 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Sep 30 21:08:43 2003 Kristian Rietveld + + * gtk/gtkcombobox.c (gtk_combo_box_init): actually show the child. + + * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_init): ditto. (#123543, + Marco Pesenti Gritti). + 2003-09-30 Murray Cumming * gtk/gtkcellrenderer.h: The render vfunc takes a GdkDrawable* diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 9bbf551155..5c4a01d380 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -358,6 +358,7 @@ gtk_combo_box_init (GtkComboBox *combo_box) combo_box->priv->cell_view = gtk_cell_view_new (); gtk_container_add (GTK_CONTAINER (combo_box), combo_box->priv->cell_view); + gtk_widget_show (combo_box->priv->cell_view); combo_box->priv->measurer = gtk_cell_view_new (); diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index 7d29916a37..7bba0e11b3 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -152,6 +152,7 @@ gtk_combo_box_entry_new (GtkTreeModel *model, GTK_COMBO_BOX_ENTRY (ret)->priv->entry = gtk_entry_new (); gtk_container_add (GTK_CONTAINER (ret), GTK_COMBO_BOX_ENTRY (ret)->priv->entry); + gtk_widget_show (GTK_COMBO_BOX_ENTRY (ret)->priv->entry); GTK_COMBO_BOX_ENTRY (ret)->priv->text_column = text_column; renderer = gtk_cell_renderer_text_new ();