2009-06-16 15:30:56 +00:00
|
|
|
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
|
2009-06-16 16:26:11 +00:00
|
|
|
index 555418a..2a84a48 100644
|
2009-06-16 15:30:56 +00:00
|
|
|
--- a/gtk/gtkcombobox.c
|
|
|
|
+++ b/gtk/gtkcombobox.c
|
|
|
|
@@ -1695,7 +1695,7 @@ cell_view_is_sensitive (GtkCellView *cell_view)
|
|
|
|
GList *cells, *list;
|
|
|
|
gboolean sensitive;
|
|
|
|
|
|
|
|
- cells = gtk_cell_view_get_cell_renderers (cell_view);
|
|
|
|
+ cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (cell_view));
|
|
|
|
|
|
|
|
sensitive = FALSE;
|
|
|
|
for (list = cells; list; list = list->next)
|
2009-06-16 16:26:11 +00:00
|
|
|
@@ -1732,7 +1732,7 @@ tree_column_row_is_sensitive (GtkComboBox *combo_box,
|
|
|
|
priv->model,
|
|
|
|
iter, FALSE, FALSE);
|
|
|
|
|
|
|
|
- cells = gtk_tree_view_column_get_cell_renderers (priv->column);
|
|
|
|
+ cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (priv->column));
|
|
|
|
|
|
|
|
sensitive = FALSE;
|
|
|
|
for (list = cells; list; list = list->next)
|
|
|
|
@@ -4097,7 +4097,7 @@ gtk_combo_box_list_select_func (GtkTreeSelection *selection,
|
|
|
|
gtk_tree_view_column_cell_set_cell_data (column, model, &iter,
|
|
|
|
FALSE, FALSE);
|
|
|
|
|
|
|
|
- cell = cells = gtk_tree_view_column_get_cell_renderers (column);
|
|
|
|
+ cell = cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
|
|
|
|
while (cell)
|
|
|
|
{
|
|
|
|
g_object_get (cell->data,
|
2009-06-16 15:30:56 +00:00
|
|
|
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
|
2009-06-16 16:26:11 +00:00
|
|
|
index e2e0142..a3a01be 100644
|
2009-06-16 15:30:56 +00:00
|
|
|
--- a/gtk/gtkentrycompletion.c
|
|
|
|
+++ b/gtk/gtkentrycompletion.c
|
|
|
|
@@ -758,7 +758,7 @@ gtk_entry_completion_get_cells (GtkCellLayout *cell_layout)
|
|
|
|
|
|
|
|
priv = GTK_ENTRY_COMPLETION_GET_PRIVATE (cell_layout);
|
|
|
|
|
|
|
|
- return gtk_tree_view_column_get_cell_renderers (priv->column);
|
|
|
|
+ return gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (priv->column));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* all those callbacks */
|
2009-06-16 16:26:11 +00:00
|
|
|
@@ -1486,7 +1486,7 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion)
|
|
|
|
completion->priv->ignore_enter = TRUE;
|
|
|
|
|
|
|
|
column = gtk_tree_view_get_column (GTK_TREE_VIEW (completion->priv->action_view), 0);
|
|
|
|
- renderers = gtk_tree_view_column_get_cell_renderers (column);
|
|
|
|
+ renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
|
|
|
|
gtk_widget_ensure_style (completion->priv->tree_view);
|
|
|
|
g_object_set (GTK_CELL_RENDERER (renderers->data), "cell-background-gdk",
|
|
|
|
&completion->priv->tree_view->style->bg[GTK_STATE_NORMAL],
|
2009-06-16 15:30:56 +00:00
|
|
|
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
|
|
|
|
index 22836c1..7dc9867 100644
|
|
|
|
--- a/gtk/gtkfilechooserdefault.c
|
|
|
|
+++ b/gtk/gtkfilechooserdefault.c
|
|
|
|
@@ -3707,7 +3707,7 @@ rename_selected_bookmark (GtkFileChooserDefault *impl)
|
|
|
|
{
|
|
|
|
path = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->shortcuts_model), &iter);
|
|
|
|
column = gtk_tree_view_get_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), 0);
|
|
|
|
- renderers = gtk_tree_view_column_get_cell_renderers (column);
|
|
|
|
+ renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
|
|
|
|
cell = g_list_nth_data (renderers, 1);
|
|
|
|
g_list_free (renderers);
|
|
|
|
g_object_set (cell, "editable", TRUE, NULL);
|
2009-06-16 15:51:09 +00:00
|
|
|
diff --git a/modules/other/gail/gailtreeview.c b/modules/other/gail/gailtreeview.c
|
|
|
|
index d615a45..3cdde65 100644
|
|
|
|
--- a/modules/other/gail/gailtreeview.c
|
|
|
|
+++ b/modules/other/gail/gailtreeview.c
|
|
|
|
@@ -867,7 +867,7 @@ gail_tree_view_ref_child (AtkObject *obj,
|
|
|
|
gtk_tree_view_column_cell_set_cell_data (tv_col, tree_model, &iter,
|
|
|
|
is_expander, is_expanded);
|
|
|
|
|
|
|
|
- renderer_list = gtk_tree_view_column_get_cell_renderers (tv_col);
|
|
|
|
+ renderer_list = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (tv_col));
|
|
|
|
|
|
|
|
/* If there are more than one renderer in the list, make a container */
|
|
|
|
|