much changes in an attempt to make it working. It mostly works now,

Sun Sep  2 23:27:16 2001  Kristian Rietveld  <kristian@planet.nl>

        * gtk/gtktreemodelsort.[ch]: much changes in an attempt to make
        it working. It mostly works now, although there're still a few issues
        to be worked out.

        * tests/testtreesort.c (main): changes to have a better test
        application for the GtkTreeModelSort.

1 files changed, 212 insertions, 11 deletions

diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index e74da15ff..b9f285efa 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -26,6 +26,16 @@ static ListSort data[] =
   { "Fern", "Glasnost and Perestroika", "Latitude", "Bomberman!!!" },
   {NULL, }
 };
+
+static ListSort childdata[] =
+{
+  { "Heineken", "Nederland", "Wanda de vis", "Electronische post"},
+  { "Hottentottententententoonstelling", "Rotterdam", "Ionentransport", "Palm"},
+  { "Fruitvlieg", "Eigenfrequentie", "Supernoodles", "Ramen"},
+  { "Gereedschapskist", "Stelsel van lineaire vergelijkingen", "Tulpen", "Badlaken"},
+  { "Stereoinstallatie", "Rood tapijt", "Het periodieke systeem der elementen", "Laaste woord"},
+  {NULL, }
+};
   
 
 enum
@@ -44,20 +54,29 @@ main (int argc, char *argv[])
   GtkWidget *vbox;
   GtkWidget *scrolled_window;
   GtkWidget *tree_view;
-  GtkTreeModel *model;
+  GtkTreeStore *model;
+  GtkTreeModel *smodel;
+  GtkTreeModel *ssmodel = NULL;
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   GtkTreeIter iter;
   gint i, j;
 
+  GtkWidget *window2, *vbox2, *scrolled_window2, *tree_view2;
+  GtkWidget *window3, *vbox3, *scrolled_window3, *tree_view3;
+
   gtk_init (&argc, &argv);
 
+  /**
+   * First window - Just a GtkTreeStore
+   */
+
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title (GTK_WINDOW (window), "Words, words, words");
+  gtk_window_set_title (GTK_WINDOW (window), "Words, words, words - Window 1");
   gtk_signal_connect (GTK_OBJECT (window), "destroy", gtk_main_quit, NULL);
   vbox = gtk_vbox_new (FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("My list of cool words"), FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words.\n\nThis is just a GtkTreeStore"), FALSE, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -65,15 +84,17 @@ 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_TREE_MODEL (gtk_tree_store_new (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);
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)),
-			       GTK_SELECTION_MULTIPLE);
+  model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+
+  smodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (model));
+  ssmodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (smodel));
+
+  tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
   for (j = 0; j < 2; j++)
     for (i = 0; data[i].word_1 != NULL; i++)
       {
+	gint k;
+
 	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,
@@ -81,9 +102,24 @@ main (int argc, char *argv[])
 			    WORD_COLUMN_3, data[i].word_3,
 			    WORD_COLUMN_4, data[i].word_4,
 			    -1);
-      }
-  g_print ("done with model\n");
 
+	for (k = 0; childdata[k].word_1 != NULL; k++)
+	  {
+	    GtkTreeIter child_iter;
+
+	    gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
+	    gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
+				WORD_COLUMN_1, childdata[k].word_1,
+				WORD_COLUMN_2, childdata[k].word_2,
+				WORD_COLUMN_3, childdata[k].word_3,
+				WORD_COLUMN_4, childdata[k].word_4,
+				-1);
+	  }
+      }
+/*
+  smodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (model));
+  ssmodel = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (smodel));
+*/
   g_object_unref (G_OBJECT (model));
   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view), TRUE);
 
@@ -116,9 +152,174 @@ main (int argc, char *argv[])
 
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
 
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (smodel),
+					WORD_COLUMN_1,
+					GTK_SORT_ASCENDING);
+  
   gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
   gtk_widget_show_all (window);
+
+
+  /**
+   * Second window - GtkTreeModelSort wrapping the GtkTreeStore
+   */
+
+  window2 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window2), 
+			"Words, words, words - window 2");
+  gtk_signal_connect (GTK_OBJECT (window2), "destroy", gtk_main_quit, NULL);
+  vbox2 = gtk_vbox_new (FALSE, 8);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+  gtk_box_pack_start (GTK_BOX (vbox2), 
+		      gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1"),
+                      FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (window2), vbox2);
+
+  scrolled_window2 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window2),
+                                       GTK_SHADOW_ETCHED_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE, TRUE, 0);
+
+
+  tree_view2 = gtk_tree_view_new_with_model (smodel);
+  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view2), TRUE);
+
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes ("First Word", renderer,
+                                                     "text", WORD_COLUMN_1,
+                                                     NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column);
+  gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_1);
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes ("Second Word", renderer,
+                                                     "text", WORD_COLUMN_2,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_2);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column);
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes ("Third Word", renderer,
+                                                     "text", WORD_COLUMN_3,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_3);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column);
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes ("Fourth Word", renderer,
+                                                     "text", WORD_COLUMN_4,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_4);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view2), column);
+
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (smodel),
+                                        WORD_COLUMN_1,
+                                        GTK_SORT_DESCENDING);
+
+  gtk_container_add (GTK_CONTAINER (scrolled_window2), tree_view2);
+  gtk_window_set_default_size (GTK_WINDOW (window2), 400, 400);
+  gtk_widget_show_all (window2);
+
+  /**
+   * Third window - GtkTreeModelSort wrapping the GtkTreeModelSort which
+   * is wrapping the GtkTreeStore.
+   */
+
+  if (ssmodel) {
+  window3 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_window_set_title (GTK_WINDOW (window3), 
+			"Words, words, words - Window 3");
+  gtk_signal_connect (GTK_OBJECT (window3), "destroy", gtk_main_quit, NULL);
+  vbox3 = gtk_vbox_new (FALSE, 8);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
+  gtk_box_pack_start (GTK_BOX (vbox3), 
+		      gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2"),
+                      FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (window3), vbox3);
+
+  scrolled_window3 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window3),
+                                       GTK_SHADOW_ETCHED_IN);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3),
+                                  GTK_POLICY_AUTOMATIC,
+                                  GTK_POLICY_AUTOMATIC);
+  gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE, TRUE, 0);
+
+
+  tree_view3 = gtk_tree_view_new_with_model (ssmodel);
+  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view3), TRUE);
+
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes ("First Word", renderer,
+                                                     "text", WORD_COLUMN_1,
+                                                     NULL);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column);
+  gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_1);
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes ("Second Word", renderer,
+                                                     "text", WORD_COLUMN_2,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_2);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column);
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes ("Third Word", renderer,
+                                                     "text", WORD_COLUMN_3,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_3);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column);
+
+  renderer = gtk_cell_renderer_text_new ();
+  column = gtk_tree_view_column_new_with_attributes ("Fourth Word", renderer,
+                                                     "text", WORD_COLUMN_4,
+                                                     NULL);
+  gtk_tree_view_column_set_sort_column_id (column, WORD_COLUMN_4);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view3), column);
+
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (ssmodel),
+                                        WORD_COLUMN_1,
+                                        GTK_SORT_DESCENDING);
+
+  gtk_container_add (GTK_CONTAINER (scrolled_window3), tree_view3);
+  gtk_window_set_default_size (GTK_WINDOW (window3), 400, 400);
+  gtk_widget_show_all (window3);
+  }
+
+/*
+  for (j = 0; j < 2; j++)
+    for (i = 0; data[i].word_1 != NULL; i++)
+      {
+	gint k;
+
+        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,
+                            WORD_COLUMN_4, data[i].word_4,
+                            -1);
+
+	for (k = 0; childdata[k].word_1 != NULL; k++)
+	  {
+	    GtkTreeIter child_iter;
+
+	    gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);
+	    gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
+				WORD_COLUMN_1, childdata[k].word_1,
+				WORD_COLUMN_2, childdata[k].word_2,
+				WORD_COLUMN_3, childdata[k].word_3,
+				WORD_COLUMN_4, childdata[k].word_4,
+				-1);
+	  }
+      }
+*/
   gtk_main ();
 
   return 0;