AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "gtk_entry_completion_get_cells: revert returning NULL"

Browse Source 
This reverts commit a9a6fb045a.
This commit is contained in:
Matthias Clasen 2014-03-03 05:50:34 -05:00
parent ab69814b5d
commit c243ad8f49
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkentrycompletion.c
View File

@ -843,21 +843,20 @@ gtk_entry_completion_clear_text_column_renderer (GtkEntryCompletion *completion)
static GList *
gtk_entry_completion_get_cells (GtkCellLayout *cell_layout)
{
static gboolean warned = FALSE;
GtkEntryCompletion *completion = GTK_ENTRY_COMPLETION (cell_layout);
GtkCellArea *area;
if (!warned && completion->priv->text_column != -1)
if (completion->priv->text_column == -1)
{
g_warning ("GtkEntryCompletion: don't call gtk_cell_layout_get_cells() to get "
"the cell renderer that was created by setting 'text-column'.");
warned = TRUE;
GtkCellArea *area;
area = gtk_entry_completion_get_area (cell_layout);
return gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (area));
}
else
{
/* Don't expose the internally created cell renderer */
return NULL;
}
area = gtk_entry_completion_get_area (cell_layout);
return gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (area));
}
static void
@ -1475,9 +1474,6 @@ gtk_entry_completion_delete_action (GtkEntryCompletion *completion,
* to have a list displaying all (and just) strings in the completion list,
* and to get those strings from @column in the model of @completion.
*
* The cell renderer added by this function is managed internally. Do
* not access or modify it.
*
* Any cell renderers that were added to @completion before calling this
* function will be removed.
*