From 4478fcca0b39a11efb1b7a87b5091fc40d7ff8c4 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Tue, 3 Apr 2001 19:13:08 +0000 Subject: [PATCH] removed set_sort_column, as it was moved to the GtkTreeSortable interface. Tue Apr 3 15:04:45 2001 Jonathan Blandford * gtk/gtktreemodelsort.h: removed set_sort_column, as it was moved to the GtkTreeSortable interface. * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): Make more efficient (fixes #50262). --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtktreemodelsort.h | 4 ---- gtk/gtktreeselection.c | 7 +++++++ 9 files changed, 63 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 440b90df18..2e52047f4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Apr 3 15:04:45 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.h: removed set_sort_column, as it was + moved to the GtkTreeSortable interface. + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): + Make more efficient (fixes #50262). + Tue Apr 3 13:55:37 2001 Owen Taylor * NEWS: Updated. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 440b90df18..2e52047f4c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Tue Apr 3 15:04:45 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.h: removed set_sort_column, as it was + moved to the GtkTreeSortable interface. + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): + Make more efficient (fixes #50262). + Tue Apr 3 13:55:37 2001 Owen Taylor * NEWS: Updated. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 440b90df18..2e52047f4c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Apr 3 15:04:45 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.h: removed set_sort_column, as it was + moved to the GtkTreeSortable interface. + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): + Make more efficient (fixes #50262). + Tue Apr 3 13:55:37 2001 Owen Taylor * NEWS: Updated. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 440b90df18..2e52047f4c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Tue Apr 3 15:04:45 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.h: removed set_sort_column, as it was + moved to the GtkTreeSortable interface. + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): + Make more efficient (fixes #50262). + Tue Apr 3 13:55:37 2001 Owen Taylor * NEWS: Updated. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 440b90df18..2e52047f4c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Tue Apr 3 15:04:45 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.h: removed set_sort_column, as it was + moved to the GtkTreeSortable interface. + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): + Make more efficient (fixes #50262). + Tue Apr 3 13:55:37 2001 Owen Taylor * NEWS: Updated. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 440b90df18..2e52047f4c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Apr 3 15:04:45 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.h: removed set_sort_column, as it was + moved to the GtkTreeSortable interface. + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): + Make more efficient (fixes #50262). + Tue Apr 3 13:55:37 2001 Owen Taylor * NEWS: Updated. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 440b90df18..2e52047f4c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Apr 3 15:04:45 2001 Jonathan Blandford + + * gtk/gtktreemodelsort.h: removed set_sort_column, as it was + moved to the GtkTreeSortable interface. + + * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): + Make more efficient (fixes #50262). + Tue Apr 3 13:55:37 2001 Owen Taylor * NEWS: Updated. diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h index 04e27b845a..ef0518305c 100644 --- a/gtk/gtktreemodelsort.h +++ b/gtk/gtktreemodelsort.h @@ -74,10 +74,6 @@ GtkTreePath *gtk_tree_model_sort_convert_path (GtkTreeModelSort *tree_model_ GtkTreePath *child_path); /* not implemented */ -void gtk_tree_model_sort_set_sort_column (GtkTreeModelSort *tree_model_sort, - gint sort_col); -void gtk_tree_model_sort_set_compare (GtkTreeModelSort *tree_model_sort, - GValueCompareFunc func); void gtk_tree_model_sort_convert_iter (GtkTreeModelSort *tree_model_sort, GtkTreeIter *sort_iter, GtkTreeIter *child_iter); diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c index 02629ebff3..4c511bb58b 100644 --- a/gtk/gtktreeselection.c +++ b/gtk/gtktreeselection.c @@ -368,6 +368,13 @@ gtk_tree_selection_selected_foreach (GtkTreeSelection *selection, selection->tree_view->priv->tree->root == NULL) return; + if (selection->type == GTK_TREE_SELECTION_SINGLE) + { + if (gtk_tree_selection_get_selected (selection, NULL, &iter)) + (* func) (selection->tree_view->priv->model, &iter, data); + return; + } + tree = selection->tree_view->priv->tree; node = selection->tree_view->priv->tree->root;