changed new_with_types to just plain new, fixing the number of columns,

Fri Jun 29 22:13:28 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreestore.c (gtk_tree_store_new): changed new_with_types
	to just plain new, fixing the number of columns, and column types
	at creation time.

	* gtk/gtkliststore.c (gtk_list_store_new): ditto.

	* gtk/gtkcellrenderertext.c
	(gtk_cell_renderer_text_set_fixed_height_from_font): FIX the
	height to a specific font.

	* gtk/gtktreeview.c (gtk_tree_view_is_expander_column): fix brokenness.

	* tests/*c: change to work with new store models.

5 files changed, 27 insertions, 27 deletions

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index b8e80653fe..ebfd6452d2 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -549,8 +549,8 @@ main (int argc, char *argv[])
   gtk_init (&argc, &argv);
 
   /* First initialize all the models for signal purposes */
-  left_tree_model = (GtkTreeModel *) gtk_list_store_new_with_types (2, G_TYPE_STRING, GTK_TYPE_POINTER);
-  sample_model = (GtkTreeModel *) gtk_list_store_new_with_types (1, G_TYPE_STRING);
+  left_tree_model = (GtkTreeModel *) gtk_list_store_new (2, G_TYPE_STRING, GTK_TYPE_POINTER);
+  sample_model = (GtkTreeModel *) gtk_list_store_new (1, G_TYPE_STRING);
   sample_tree_view_top = gtk_tree_view_new_with_model (sample_model);
   sample_tree_view_bottom = gtk_tree_view_new_with_model (sample_model);
   top_right_tree_model = (GtkTreeModel *) view_column_model_new (GTK_TREE_VIEW (sample_tree_view_top));
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index 854c3f84ad..adf43f6915 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -154,15 +154,15 @@ make_model (void)
   TreeStruct *month = toplevel;
   GtkTreeIter iter;
 
-  model = gtk_tree_store_new_with_types (NUM_COLUMNS,
-					 G_TYPE_STRING,
-					 G_TYPE_BOOLEAN,
-					 G_TYPE_BOOLEAN,
-					 G_TYPE_BOOLEAN,
-					 G_TYPE_BOOLEAN,
-					 G_TYPE_BOOLEAN,
-					 G_TYPE_BOOLEAN,
-					 G_TYPE_BOOLEAN);
+  model = gtk_tree_store_new (NUM_COLUMNS,
+			      G_TYPE_STRING,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_BOOLEAN);
 
   while (month->label)
     {
diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 54ff205dfb..dbd69cc16e 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -65,7 +65,7 @@ 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_store_new_with_types (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+  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);
diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 6a717836f7..1a46307f04 100644
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -291,6 +291,8 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type)
                                                       NULL);
 
       setup_column (col);
+      gtk_tree_view_set_expander_column (tree_view, col);
+      
       
       gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), col);
       
@@ -438,8 +440,6 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type)
 
 #endif
       
-      gtk_tree_view_set_expander_column (tree_view, 1);
-      
       /* FALL THRU */
       
     case COLUMNS_ONE:
@@ -505,10 +505,10 @@ create_list_model (void)
 
   t = get_model_types ();
   
-  store = gtk_list_store_new_with_types (N_COLUMNS,
-                                         t[0], t[1], t[2],
-                                         t[3], t[4], t[5],
-                                         t[6], t[7], t[8]);
+  store = gtk_list_store_new (N_COLUMNS,
+			      t[0], t[1], t[2],
+			      t[3], t[4], t[5],
+			      t[6], t[7], t[8]);
 
   i = 0;
   while (i < 200)
@@ -589,10 +589,10 @@ create_tree_model (void)
 
   t = get_model_types ();
   
-  store = gtk_tree_store_new_with_types (N_COLUMNS,
-                                         t[0], t[1], t[2],
-                                         t[3], t[4], t[5],
-                                         t[6], t[7], t[8]);
+  store = gtk_tree_store_new (N_COLUMNS,
+			      t[0], t[1], t[2],
+			      t[3], t[4], t[5],
+			      t[6], t[7], t[8]);
 
   i = 0;
   while (i < G_TYPE_RESERVED_LAST_FUNDAMENTAL)
@@ -675,8 +675,8 @@ main (int    argc,
   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 ());
-  models[MODEL_EMPTY_TREE] = GTK_TREE_MODEL (gtk_tree_store_new ());
+  models[MODEL_EMPTY_LIST] = GTK_TREE_MODEL (gtk_list_store_new (0));
+  models[MODEL_EMPTY_TREE] = GTK_TREE_MODEL (gtk_tree_store_new (0));
   
   models[MODEL_NULL] = NULL;
 
@@ -1374,7 +1374,7 @@ run_automated_tests (void)
     gint i;
     GtkTreeIter iter;
     
-    store = gtk_list_store_new_with_types (1, G_TYPE_INT);
+    store = gtk_list_store_new (1, G_TYPE_INT);
 
     model = GTK_TREE_MODEL (store);
     
@@ -1443,7 +1443,7 @@ run_automated_tests (void)
     GtkTreeStore *store;
     GtkTreeIter root;
 
-    store = gtk_tree_store_new_with_types (1, G_TYPE_INT);
+    store = gtk_tree_store_new (1, G_TYPE_INT);
     gtk_tree_model_get_iter_root (GTK_TREE_MODEL (store), &root);
     treestore_torture_recurse (store, &root, 0);
     
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 84b127d31e..0c966d76a3 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -353,7 +353,7 @@ main (int argc, char *argv[])
 {
   gtk_init (&argc, &argv);
 
-  base_model = gtk_tree_store_new_with_types (2, G_TYPE_STRING, G_TYPE_STRING);
+  base_model = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 
   /* FIXME: reverse this */
   make_window (0);