Whoops. Forgot this a couple months ago. Now GtkTreeStore sort of sorts.

Thu Jun 14 19:21:27 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreestore.c (gtk_tree_store_sort_helper): Whoops.  Forgot
	this a couple months ago.  Now GtkTreeStore sort of sorts.  I'll
	finish it off tonight, though it basically works now when it's a
	list.  Also, I have a sinking feeling neither GtkTreeStore or
	GtkListStore actually resort when adding a new item.  I'll look
	into it.

3 files changed, 19 insertions, 11 deletions

diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index f8d8be52aa..54ff205dfb 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -65,15 +65,15 @@ main (int argc, char *argv[])
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
 
-  model = gtk_list_store_new_with_types (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+  model = gtk_tree_store_new_with_types (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
   //  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), 0, GTK_TREE_SORT_ASCENDING);
   g_print ("start model\n");
   tree_view = gtk_tree_view_new_with_model (model);
   for (j = 0; j < 2; j++)
     for (i = 0; data[i].word_1 != NULL; i++)
       {
-	gtk_list_store_prepend (GTK_LIST_STORE (model), &iter);
-	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+	gtk_tree_store_prepend (GTK_TREE_STORE (model), &iter, NULL);
+	gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
 			    WORD_COLUMN_1, data[i].word_1,
 			    WORD_COLUMN_2, data[i].word_2,
 			    WORD_COLUMN_3, data[i].word_3,
diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 7bf2c0636c..a8bfed3dd1 100644
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -673,11 +673,11 @@ main (int    argc,
   models[MODEL_TREE] = create_tree_model ();
 
   model = create_list_model ();
-  models[MODEL_SORTED_LIST] = gtk_tree_model_sort_new_with_model (model, NULL, 0);
+  models[MODEL_SORTED_LIST] = gtk_tree_model_sort_new_with_model (model);
   g_object_unref (G_OBJECT (model));
 
   model = create_tree_model ();
-  models[MODEL_SORTED_TREE] = gtk_tree_model_sort_new_with_model (model, NULL, 0);
+  models[MODEL_SORTED_TREE] = gtk_tree_model_sort_new_with_model (model);
   g_object_unref (G_OBJECT (model));
 
   models[MODEL_EMPTY_LIST] = GTK_TREE_MODEL (gtk_list_store_new ());
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 9ede2222b5..c32e8842a9 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -224,7 +224,7 @@ make_window (gint view_type)
   GtkWidget *tree_view;
   GtkTreeViewColumn *column;
   GtkCellRenderer *cell;
-  GtkObject *selection;
+  GObject *selection;
 
   /* Make the Widgets/Objects */
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -251,14 +251,16 @@ make_window (gint view_type)
       {
 	GtkTreeModel *sort_model;
 	
-	sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (base_model),
-							 NULL, 1);
+	sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (base_model));
 	tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (sort_model));
       }
       break;
+    default:
+      g_assert_not_reached ();
+      break;
     }
 
-  selection = GTK_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)));
+  selection = G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)));
   gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection), GTK_TREE_SELECTION_SINGLE);
 
   /* Put them together */
@@ -319,11 +321,17 @@ make_window (gint view_type)
   /* The selected column */
   cell = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Node ID", cell, "markup", 0, NULL);
+  gtk_tree_view_column_set_sort_column_id (column, 0);
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+  g_object_unref (G_OBJECT (cell));
+  g_object_unref (G_OBJECT (column));
 
   cell = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Random Number", cell, "text", 1, NULL);
+  gtk_tree_view_column_set_sort_column_id (column, 1);
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+  g_object_unref (G_OBJECT (cell));
+  g_object_unref (G_OBJECT (column));
 
   /* A few to start */
   if (view_type == 0)
@@ -334,9 +342,9 @@ make_window (gint view_type)
       iter_append (NULL, GTK_TREE_VIEW (tree_view));
       iter_append (NULL, GTK_TREE_VIEW (tree_view));
       iter_append (NULL, GTK_TREE_VIEW (tree_view));
+      gtk_widget_show_all (window);
     }
   /* Show it all */
-  gtk_widget_show_all (window);
 }
 
 int
@@ -348,7 +356,7 @@ main (int argc, char *argv[])
 
   /* FIXME: reverse this */
   make_window (0);
-  make_window (1);
+  //  make_window (1);
 
   gtk_main ();