columnviewcell: Ignore ::activatable and ::selectable for cells

This is a row property, not a cell property.

diff --git a/gtk/gtkcolumnviewcellwidget.c b/gtk/gtkcolumnviewcellwidget.c
index fcb7b8b6b7b7019257bbedd779d533144c1785a8..7020de1c0eb31082e881fbec232e0f88efcbbb9e 100644 (file)
--- a/gtk/gtkcolumnviewcellwidget.c
+++ b/gtk/gtkcolumnviewcellwidget.c
@@ -139,8 +139,6 @@ gtk_column_view_cell_widget_setup_object (GtkListFactoryWidget *fw,
 
   list_item->cell = self;
 
-  gtk_list_factory_widget_set_activatable (fw, list_item->activatable);
-  gtk_list_factory_widget_set_selectable (fw, list_item->selectable);
   gtk_column_view_cell_widget_set_child (GTK_COLUMN_VIEW_CELL_WIDGET (self), list_item->child);
 
   gtk_widget_set_focusable (GTK_WIDGET (self), list_item->focusable);
@@ -164,8 +162,6 @@ gtk_column_view_cell_widget_teardown_object (GtkListFactoryWidget *fw,
 
   gtk_column_view_cell_widget_set_child (GTK_COLUMN_VIEW_CELL_WIDGET (self), NULL);
 
-  gtk_list_factory_widget_set_activatable (fw, FALSE);
-  gtk_list_factory_widget_set_selectable (fw, FALSE);
   gtk_widget_set_focusable (GTK_WIDGET (self), FALSE);
 
   gtk_list_item_do_notify (list_item,

diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index 8890641a4a050bd39afd6fa5c174db79b9749078..bbda5d6386a5fd569cdd7380ba3a510afd67b9f1 100644 (file)
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -457,8 +457,6 @@ gtk_list_item_set_selectable (GtkListItem *self,
 
   if (self->owner)
     gtk_list_factory_widget_set_selectable (GTK_LIST_FACTORY_WIDGET (self->owner), selectable);
-  if (self->cell)
-    gtk_list_factory_widget_set_selectable (GTK_LIST_FACTORY_WIDGET (self->cell), selectable);
 
   g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_SELECTABLE]);
 }
@@ -508,8 +506,6 @@ gtk_list_item_set_activatable (GtkListItem *self,
 
   if (self->owner)
     gtk_list_factory_widget_set_activatable (GTK_LIST_FACTORY_WIDGET (self->owner), activatable);
-  if (self->cell)
-    gtk_list_factory_widget_set_activatable (GTK_LIST_FACTORY_WIDGET (self->cell), activatable);
 
   g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ACTIVATABLE]);
 }