Commit ec6454bf authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

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.
parent a9dc6dec
2004-11-29 Matthias Clasen <mclasen@redhat.com> 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, Determine the direction of XKB groups from their content,
not by looking for hardcoded keymap names. (#116626, patch by not by looking for hardcoded keymap names. (#116626, patch by
Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov) Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov)
......
2004-11-29 Matthias Clasen <mclasen@redhat.com> 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, Determine the direction of XKB groups from their content,
not by looking for hardcoded keymap names. (#116626, patch by not by looking for hardcoded keymap names. (#116626, patch by
Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov) Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov)
......
2004-11-29 Matthias Clasen <mclasen@redhat.com> 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, Determine the direction of XKB groups from their content,
not by looking for hardcoded keymap names. (#116626, patch by not by looking for hardcoded keymap names. (#116626, patch by
Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov) Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov)
......
2004-11-29 Matthias Clasen <mclasen@redhat.com> 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, Determine the direction of XKB groups from their content,
not by looking for hardcoded keymap names. (#116626, patch by not by looking for hardcoded keymap names. (#116626, patch by
Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov) Behdad Esfahbod, based on an earlier patch by Ilya Konstantinov)
......
2004-11-29 Matthias Clasen <mclasen@redhat.com> 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 * gtk/tmpl/gtkfilefilter.sgml: Mention subclassing, aliasing
and supertypes. and supertypes.
......
...@@ -4089,7 +4089,6 @@ gtk_cell_view_set_displayed_row ...@@ -4089,7 +4089,6 @@ gtk_cell_view_set_displayed_row
gtk_cell_view_get_displayed_row gtk_cell_view_get_displayed_row
gtk_cell_view_get_size_of_row gtk_cell_view_get_size_of_row
gtk_cell_view_set_background_color gtk_cell_view_set_background_color
gtk_cell_view_set_cell_data
gtk_cell_view_get_cell_renderers gtk_cell_view_get_cell_renderers
<SUBSECTION Standard> <SUBSECTION Standard>
GtkCellViewClass GtkCellViewClass
......
...@@ -279,7 +279,6 @@ gtk_cell_view_new_with_markup ...@@ -279,7 +279,6 @@ gtk_cell_view_new_with_markup
gtk_cell_view_new_with_pixbuf gtk_cell_view_new_with_pixbuf
gtk_cell_view_new_with_text gtk_cell_view_new_with_text
gtk_cell_view_set_background_color gtk_cell_view_set_background_color
gtk_cell_view_set_cell_data
gtk_cell_view_set_displayed_row gtk_cell_view_set_displayed_row
gtk_cell_view_set_model gtk_cell_view_set_model
gtk_cell_view_set_value gtk_cell_view_set_value
......
...@@ -81,6 +81,7 @@ static void gtk_cell_view_set_valuesv (GtkCellView *cel ...@@ -81,6 +81,7 @@ static void gtk_cell_view_set_valuesv (GtkCellView *cel
va_list args); va_list args);
static GtkCellViewCellInfo *gtk_cell_view_get_cell_info (GtkCellView *cellview, static GtkCellViewCellInfo *gtk_cell_view_get_cell_info (GtkCellView *cellview,
GtkCellRenderer *renderer); GtkCellRenderer *renderer);
static void gtk_cell_view_set_cell_data (GtkCellView *cell_view);
static void gtk_cell_view_cell_layout_pack_start (GtkCellLayout *layout, static void gtk_cell_view_cell_layout_pack_start (GtkCellLayout *layout,
...@@ -534,7 +535,7 @@ gtk_cell_view_get_cell_info (GtkCellView *cellview, ...@@ -534,7 +535,7 @@ gtk_cell_view_get_cell_info (GtkCellView *cellview,
return NULL; return NULL;
} }
void static void
gtk_cell_view_set_cell_data (GtkCellView *cell_view) gtk_cell_view_set_cell_data (GtkCellView *cell_view)
{ {
GList *i; GList *i;
...@@ -1116,6 +1117,8 @@ gtk_cell_view_get_cell_renderers (GtkCellView *cell_view) ...@@ -1116,6 +1117,8 @@ gtk_cell_view_get_cell_renderers (GtkCellView *cell_view)
g_return_val_if_fail (cell_view != NULL, NULL); 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) for (list = cell_view->priv->cell_list; list; list = list->next)
{ {
GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)list->data; GtkCellViewCellInfo *info = (GtkCellViewCellInfo *)list->data;
......
...@@ -1389,7 +1389,6 @@ cell_view_is_sensitive (GtkCellView *cell_view) ...@@ -1389,7 +1389,6 @@ cell_view_is_sensitive (GtkCellView *cell_view)
GList *cells, *list; GList *cells, *list;
gboolean sensitive; gboolean sensitive;
gtk_cell_view_set_cell_data (cell_view);
cells = gtk_cell_view_get_cell_renderers (cell_view); cells = gtk_cell_view_get_cell_renderers (cell_view);
sensitive = FALSE; sensitive = FALSE;
...@@ -1525,6 +1524,7 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box, ...@@ -1525,6 +1524,7 @@ gtk_combo_box_menu_popup (GtkComboBox *combo_box,
if (combo_box->priv->wrap_width == 0) if (combo_box->priv->wrap_width == 0)
{ {
width = GTK_WIDGET (combo_box)->allocation.width; 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_size_request (combo_box->priv->popup_widget, &requisition);
gtk_widget_set_size_request (combo_box->priv->popup_widget, gtk_widget_set_size_request (combo_box->priv->popup_widget,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment