diff --git a/ChangeLog b/ChangeLog index 5c8d8956e2..394148ccbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Aug 20 23:48:18 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Fix bug + reported by Kristian Rietveld to handle row + == NULL. + (gtk_tree_view_destroy): Fix bug reported by Kristian Rietveld + to change destroy order. + Mon Aug 20 11:39:44 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_class_init): Use diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5c8d8956e2..394148ccbb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Mon Aug 20 23:48:18 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Fix bug + reported by Kristian Rietveld to handle row + == NULL. + (gtk_tree_view_destroy): Fix bug reported by Kristian Rietveld + to change destroy order. + Mon Aug 20 11:39:44 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_class_init): Use diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5c8d8956e2..394148ccbb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Mon Aug 20 23:48:18 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Fix bug + reported by Kristian Rietveld to handle row + == NULL. + (gtk_tree_view_destroy): Fix bug reported by Kristian Rietveld + to change destroy order. + Mon Aug 20 11:39:44 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_class_init): Use diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5c8d8956e2..394148ccbb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Mon Aug 20 23:48:18 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Fix bug + reported by Kristian Rietveld to handle row + == NULL. + (gtk_tree_view_destroy): Fix bug reported by Kristian Rietveld + to change destroy order. + Mon Aug 20 11:39:44 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_class_init): Use diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5c8d8956e2..394148ccbb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Mon Aug 20 23:48:18 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Fix bug + reported by Kristian Rietveld to handle row + == NULL. + (gtk_tree_view_destroy): Fix bug reported by Kristian Rietveld + to change destroy order. + Mon Aug 20 11:39:44 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_class_init): Use diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5c8d8956e2..394148ccbb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Mon Aug 20 23:48:18 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Fix bug + reported by Kristian Rietveld to handle row + == NULL. + (gtk_tree_view_destroy): Fix bug reported by Kristian Rietveld + to change destroy order. + Mon Aug 20 11:39:44 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_class_init): Use diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5c8d8956e2..394148ccbb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Mon Aug 20 23:48:18 2001 Jonathan Blandford + + * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): Fix bug + reported by Kristian Rietveld to handle row + == NULL. + (gtk_tree_view_destroy): Fix bug reported by Kristian Rietveld + to change destroy order. + Mon Aug 20 11:39:44 2001 Jonathan Blandford * gtk/gtktreeselection.c (gtk_tree_selection_class_init): Use diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 6e64e388c2..78efc2509e 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1012,6 +1012,14 @@ gtk_tree_view_destroy (GtkObject *object) GtkWidget *search_dialog; GList *list; + if (tree_view->priv->columns != NULL) + { + for (list = tree_view->priv->columns; list; list = list->next) + g_object_unref (G_OBJECT (list->data)); + g_list_free (tree_view->priv->columns); + tree_view->priv->columns = NULL; + } + gtk_tree_view_set_model (tree_view, NULL); if (tree_view->priv->tree != NULL) @@ -1027,14 +1035,6 @@ gtk_tree_view_destroy (GtkObject *object) tree_view->priv->model = NULL; } - if (tree_view->priv->columns != NULL) - { - for (list = tree_view->priv->columns; list; list = list->next) - g_object_unref (G_OBJECT (list->data)); - g_list_free (tree_view->priv->columns); - tree_view->priv->columns = NULL; - } - if (tree_view->priv->selection != NULL) { _gtk_tree_selection_set_tree_view (tree_view->priv->selection, NULL); @@ -7954,6 +7954,8 @@ gtk_tree_view_get_cell_area (GtkTreeView *tree_view, g_return_if_fail (GTK_IS_TREE_VIEW (tree_view)); g_return_if_fail (column == NULL || GTK_IS_TREE_VIEW_COLUMN (column)); g_return_if_fail (rect != NULL); + g_return_if_fail (column->tree_view == tree_view); + g_return_if_fail (GTK_WIDGET_REALIZED (tree_view)); gtk_widget_style_get (GTK_WIDGET (tree_view), "vertical_separator", &vertical_separator, NULL); @@ -7984,10 +7986,8 @@ gtk_tree_view_get_cell_area (GtkTreeView *tree_view, if (column) { - gint x2 = 0; - - gtk_tree_view_get_cell_xrange (tree_view, tree, column, &rect->x, &x2); - rect->width = x2 - rect->x; + rect->x = column->button->allocation.x; + rect->width = column->button->allocation.width; } } diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 964e678c3b..158cae5c66 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1858,9 +1858,8 @@ gtk_tree_view_column_get_reorderable (GtkTreeViewColumn *tree_column) * @tree_column: a #GtkTreeViewColumn * @sort_column_id: The sort_column_id of the model to sort on. * - * Sets the logical sort_column_id that this column sorts on when this - * column is selected for sorting. Doing so makes - * the column header clickable. + * Sets the logical sort_column_id that this column sorts on when this column is + * selected for sorting. Doing so makes the column header clickable. **/ void gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column,