From: Matthias Clasen Date: Sun, 14 Mar 2004 00:01:23 +0000 (+0000) Subject: Align this function with gtk_tree_view_column_set_cell_data(); call the X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=6cfcae4993181b86a20af7e5c9b0ac5dbcd62b71;p=~andy%2Fgtk Align this function with gtk_tree_view_column_set_cell_data(); call the Sun Mar 14 01:01:18 2004 Matthias Clasen * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Align this function with gtk_tree_view_column_set_cell_data(); call the cell data func after setting the attributes. Sun Mar 14 01:00:08 2004 Matthias Clasen * gtk/gtkcellview.c (gtk_cell_view_expose): One more try; make sure not to call gtk_cell_view_set_cell_data() when displayed_row is NULL. --- diff --git a/ChangeLog b/ChangeLog index 023368447..d26818b68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sun Mar 14 01:01:18 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Align + this function with gtk_tree_view_column_set_cell_data(); + call the cell data func after setting the attributes. + +Sun Mar 14 01:00:08 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): One more try; + make sure not to call gtk_cell_view_set_cell_data() when + displayed_row is NULL. + Sat Mar 13 18:13:13 2004 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): When not diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 023368447..d26818b68 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Sun Mar 14 01:01:18 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Align + this function with gtk_tree_view_column_set_cell_data(); + call the cell data func after setting the attributes. + +Sun Mar 14 01:00:08 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): One more try; + make sure not to call gtk_cell_view_set_cell_data() when + displayed_row is NULL. + Sat Mar 13 18:13:13 2004 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): When not diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 023368447..d26818b68 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Sun Mar 14 01:01:18 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Align + this function with gtk_tree_view_column_set_cell_data(); + call the cell data func after setting the attributes. + +Sun Mar 14 01:00:08 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): One more try; + make sure not to call gtk_cell_view_set_cell_data() when + displayed_row is NULL. + Sat Mar 13 18:13:13 2004 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): When not diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 023368447..d26818b68 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Sun Mar 14 01:01:18 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Align + this function with gtk_tree_view_column_set_cell_data(); + call the cell data func after setting the attributes. + +Sun Mar 14 01:00:08 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): One more try; + make sure not to call gtk_cell_view_set_cell_data() when + displayed_row is NULL. + Sat Mar 13 18:13:13 2004 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): When not diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 023368447..d26818b68 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Sun Mar 14 01:01:18 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Align + this function with gtk_tree_view_column_set_cell_data(); + call the cell data func after setting the attributes. + +Sun Mar 14 01:00:08 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_expose): One more try; + make sure not to call gtk_cell_view_set_cell_data() when + displayed_row is NULL. + Sat Mar 13 18:13:13 2004 Owen Taylor * gtk/gtktextlayout.c (gtk_text_layout_get_line_display): When not diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index f38b53c9e..1b44316e3 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -437,11 +437,11 @@ gtk_cell_view_expose (GtkWidget *widget, g_object_unref (G_OBJECT (gc)); } - if (cellview->priv->model && !cellview->priv->displayed_row) + /* set cell data (if available) */ + if (cellview->priv->displayed_row) + gtk_cell_view_set_cell_data (cellview); + else if (cellview->priv->model) return FALSE; - - /* set cell data */ - gtk_cell_view_set_cell_data (cellview); /* render cells */ area = widget->allocation; @@ -539,15 +539,7 @@ gtk_cell_view_set_cell_data (GtkCellView *cellview) GSList *j; GtkCellViewCellInfo *info = i->data; - if (info->func) - { - (* info->func) (GTK_CELL_LAYOUT (cellview), - info->cell, - cellview->priv->model, - &iter, - info->func_data); - continue; - } + g_object_freeze_notify (G_OBJECT (info->cell)); for (j = info->attributes; j && j->next; j = j->next->next) { @@ -561,6 +553,15 @@ gtk_cell_view_set_cell_data (GtkCellView *cellview) property, &value); g_value_unset (&value); } + + if (info->func) + (* info->func) (GTK_CELL_LAYOUT (cellview), + info->cell, + cellview->priv->model, + &iter, + info->func_data); + + g_object_thaw_notify (G_OBJECT (info->cell)); } }