callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implement missing get_cells method. (Spotted by Paolo Borelli).

Browse Source 
2007-09-07  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_init),
	(gtk_combo_box_cell_layout_get_cells): implement missing get_cells
	method.  (Spotted by Paolo Borelli).


svn path=/trunk/; revision=18747
This commit is contained in:
Kristian Rietveld
2007-09-07 11:02:04 +00:00
committed by Kristian Rietveld
parent 6cbb692835
commit d719605dac
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-09-07 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcombobox.c (gtk_combo_box_cell_layout_init),
(gtk_combo_box_cell_layout_get_cells): implement missing get_cells
method. (Spotted by Paolo Borelli).
2007-09-06 Matthias Clasen <mclasen@redhat.com> 2007-09-06 Matthias Clasen <mclasen@redhat.com>
* configure.in: Check for cups.h. (#459732, Guillaume Cottenceau) * configure.in: Check for cups.h. (#459732, Guillaume Cottenceau)

23
gtk/gtkcombobox.c
View File

@ -408,6 +408,7 @@ static void gtk_combo_box_cell_layout_pack_start (GtkCellLayout
static void gtk_combo_box_cell_layout_pack_end (GtkCellLayout *layout, static void gtk_combo_box_cell_layout_pack_end (GtkCellLayout *layout,
GtkCellRenderer *cell, GtkCellRenderer *cell,
gboolean expand); gboolean expand);
static GList *gtk_combo_box_cell_layout_get_cells (GtkCellLayout *layout);
static void gtk_combo_box_cell_layout_clear (GtkCellLayout *layout); static void gtk_combo_box_cell_layout_clear (GtkCellLayout *layout);
static void gtk_combo_box_cell_layout_add_attribute (GtkCellLayout *layout, static void gtk_combo_box_cell_layout_add_attribute (GtkCellLayout *layout,
GtkCellRenderer *cell, GtkCellRenderer *cell,
@ -878,6 +879,7 @@ gtk_combo_box_cell_layout_init (GtkCellLayoutIface *iface)
{ {
iface->pack_start = gtk_combo_box_cell_layout_pack_start; iface->pack_start = gtk_combo_box_cell_layout_pack_start;
iface->pack_end = gtk_combo_box_cell_layout_pack_end; iface->pack_end = gtk_combo_box_cell_layout_pack_end;
iface->get_cells = gtk_combo_box_cell_layout_get_cells;
iface->clear = gtk_combo_box_cell_layout_clear; iface->clear = gtk_combo_box_cell_layout_clear;
iface->add_attribute = gtk_combo_box_cell_layout_add_attribute; iface->add_attribute = gtk_combo_box_cell_layout_add_attribute;
iface->set_cell_data_func = gtk_combo_box_cell_layout_set_cell_data_func; iface->set_cell_data_func = gtk_combo_box_cell_layout_set_cell_data_func;
@ -4129,6 +4131,27 @@ gtk_combo_box_cell_layout_pack_end (GtkCellLayout *layout,
pack_end_recurse (combo_box->priv->popup_widget, cell, expand); pack_end_recurse (combo_box->priv->popup_widget, cell, expand);
} }
static GList *
gtk_combo_box_cell_layout_get_cells (GtkCellLayout *layout)
{
GSList *list;
GList *retval = NULL;
GtkComboBox *combo_box;
g_return_val_if_fail (GTK_IS_COMBO_BOX (layout), NULL);
combo_box = GTK_COMBO_BOX (layout);
for (list = combo_box->priv->cells; list; list = list->next)
{
ComboCellInfo *info = (ComboCellInfo *)list->data;
retval = g_list_prepend (retval, info->cell);
}
return g_list_reverse (retval);
}
static void static void
clear_recurse (GtkWidget *menu) clear_recurse (GtkWidget *menu)
{ {