Don't call gtk_cell_view_set_cell_data() from here.

2004-11-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (cell_view_is_sensitive): Don't call
	gtk_cell_view_set_cell_data() from here.

	* gtk/gtk.symbols: Remove gtk_cell_view_set_cell_data()

	* gtk/gtkcellview.c (gtk_cell_view_get_cell_renderers): Call
	gtk_cell_view_set_cell_data() from here.
	(gtk_cell_view_set_cell_data): Make static.

	* gtk/gtkcombobox.c (gtk_combo_box_menu_popup): Make menu mode
	work better when resizing the combo box.

9 files changed, 55 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 41f4a03ce..df5c73c28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (cell_view_is_sensitive): Don't call
+	gtk_cell_view_set_cell_data() from here.
+
+	* gtk/gtk.symbols: Remove gtk_cell_view_set_cell_data()
+
+	* gtk/gtkcellview.c (gtk_cell_view_get_cell_renderers): Call 
+	gtk_cell_view_set_cell_data() from here.
+	(gtk_cell_view_set_cell_data): Make static.
+
+	* gtk/gtkcombobox.c (gtk_combo_box_menu_popup): Make menu mode
+	work better when resizing the combo box.
+
 	Determine the direction of XKB groups from their content, 
 	not by looking for hardcoded keymap names.  (#116626, patch by 
 	Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 41f4a03ce..df5c73c28 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,17 @@
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (cell_view_is_sensitive): Don't call
+	gtk_cell_view_set_cell_data() from here.
+
+	* gtk/gtk.symbols: Remove gtk_cell_view_set_cell_data()
+
+	* gtk/gtkcellview.c (gtk_cell_view_get_cell_renderers): Call 
+	gtk_cell_view_set_cell_data() from here.
+	(gtk_cell_view_set_cell_data): Make static.
+
+	* gtk/gtkcombobox.c (gtk_combo_box_menu_popup): Make menu mode
+	work better when resizing the combo box.
+
 	Determine the direction of XKB groups from their content, 
 	not by looking for hardcoded keymap names.  (#116626, patch by 
 	Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov)
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 41f4a03ce..df5c73c28 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,17 @@
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (cell_view_is_sensitive): Don't call
+	gtk_cell_view_set_cell_data() from here.
+
+	* gtk/gtk.symbols: Remove gtk_cell_view_set_cell_data()
+
+	* gtk/gtkcellview.c (gtk_cell_view_get_cell_renderers): Call 
+	gtk_cell_view_set_cell_data() from here.
+	(gtk_cell_view_set_cell_data): Make static.
+
+	* gtk/gtkcombobox.c (gtk_combo_box_menu_popup): Make menu mode
+	work better when resizing the combo box.
+
 	Determine the direction of XKB groups from their content, 
 	not by looking for hardcoded keymap names.  (#116626, patch by 
 	Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 41f4a03ce..df5c73c28 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,17 @@
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (cell_view_is_sensitive): Don't call
+	gtk_cell_view_set_cell_data() from here.
+
+	* gtk/gtk.symbols: Remove gtk_cell_view_set_cell_data()
+
+	* gtk/gtkcellview.c (gtk_cell_view_get_cell_renderers): Call 
+	gtk_cell_view_set_cell_data() from here.
+	(gtk_cell_view_set_cell_data): Make static.
+
+	* gtk/gtkcombobox.c (gtk_combo_box_menu_popup): Make menu mode
+	work better when resizing the combo box.
+
 	Determine the direction of XKB groups from their content, 
 	not by looking for hardcoded keymap names.  (#116626, patch by 
 	Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov)
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 11887c25b..f364a784f 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,7 @@
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtk-sections.txt: Remove gtk_cell_view_set_cell_data().
+
 	* gtk/tmpl/gtkfilefilter.sgml: Mention subclassing, aliasing
 	and supertypes.
 
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index ba601e69a..d95751b80 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -4089,7 +4089,6 @@ gtk_cell_view_set_displayed_row
 gtk_cell_view_get_displayed_row
 gtk_cell_view_get_size_of_row
 gtk_cell_view_set_background_color
-gtk_cell_view_set_cell_data
 gtk_cell_view_get_cell_renderers
 <SUBSECTION Standard>
 GtkCellViewClass
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 5fdfe1412..9be299dc4 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -279,7 +279,6 @@ gtk_cell_view_new_with_markup
 gtk_cell_view_new_with_pixbuf
 gtk_cell_view_new_with_text
 gtk_cell_view_set_background_color
-gtk_cell_view_set_cell_data
 gtk_cell_view_set_displayed_row
 gtk_cell_view_set_model
 gtk_cell_view_set_value
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index e878fabd5..d3633f59d 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -81,6 +81,7 @@ static void        gtk_cell_view_set_valuesv              (GtkCellView      *cel
                                                            va_list           args);
 static GtkCellViewCellInfo *gtk_cell_view_get_cell_info   (GtkCellView      *cellview,
                                                            GtkCellRenderer  *renderer);
+static void        gtk_cell_view_set_cell_data            (GtkCellView      *cell_view);
 
 
 static void        gtk_cell_view_cell_layout_pack_start        (GtkCellLayout         *layout,
@@ -534,7 +535,7 @@ gtk_cell_view_get_cell_info (GtkCellView     *cellview,
   return NULL;
 }
 
-void
+static void
 gtk_cell_view_set_cell_data (GtkCellView *cell_view)
 {
   GList *i;
@@ -1116,6 +1117,8 @@ gtk_cell_view_get_cell_renderers (GtkCellView *cell_view)
 
   g_return_val_if_fail (cell_view != NULL, NULL);
 
+  gtk_cell_view_set_cell_data (cell_view);
+
   for (list = cell_view->priv->cell_list; list; list = list->next)
     {
       GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)list->data;
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 10ddff846..7ba8f81c0 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1389,7 +1389,6 @@ cell_view_is_sensitive (GtkCellView *cell_view)
   GList *cells, *list;
   gboolean sensitive;
   
-  gtk_cell_view_set_cell_data (cell_view);
   cells = gtk_cell_view_get_cell_renderers (cell_view);
 
   sensitive = FALSE;
@@ -1525,6 +1524,7 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box,
   if (combo_box->priv->wrap_width == 0)
     {
       width = GTK_WIDGET (combo_box)->allocation.width;
+      gtk_widget_set_size_request (combo_box->priv->popup_widget, -1, -1);
       gtk_widget_size_request (combo_box->priv->popup_widget, &requisition);
       
       gtk_widget_set_size_request (combo_box->priv->popup_widget,