Use gtk_box_new() instead gtk_[v|h]box_new()

[~andy/gtk] / tests / testtreecolumns.c

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 7aede8b27047ea28eeafbcd57857938b0a40f897..a0f6841b7a5d8a7cf9a353323279916549bdc7b5 100644 (file)
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -116,7 +116,7 @@ view_column_model_get_iter (GtkTreeModel *tree_model,
 
   g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
 
-  i = gtk_tree_path_get_indices (path, NULL)[0];
+  i = gtk_tree_path_get_indices (path)[0];
   list = g_list_nth (view_model->columns, i);
 
   if (list == NULL)
@@ -659,7 +659,7 @@ move_to_right (GtkTreeIter  *src_iter,
   if (dest_iter)
     {
       GtkTreePath *path = gtk_tree_model_get_path (dest, dest_iter);
-      before = (gtk_tree_path_get_indices (path, NULL))[0];
+      before = (gtk_tree_path_get_indices (path))[0];
       gtk_tree_path_free (path);
     }
   
@@ -686,7 +686,7 @@ move_up_or_down (GtkTreeModel *src,
   if (dest_iter)
     {
       GtkTreePath *path = gtk_tree_model_get_path (dest, dest_iter);
-      before = (gtk_tree_path_get_indices (path, NULL))[0];
+      before = (gtk_tree_path_get_indices (path))[0];
       gtk_tree_path_free (path);
     }
   
@@ -812,11 +812,11 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); 
   gtk_window_set_default_size (GTK_WINDOW (window), 500, 300);
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 
   /* Left Pane */
@@ -837,10 +837,10 @@ main (int argc, char *argv[])
   gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE, 0);
 
   /* Middle Pane */
-  vbox2 = gtk_vbox_new (FALSE, 8);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
   
-  bbox = gtk_vbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
   gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0);
 
@@ -858,7 +858,7 @@ main (int argc, char *argv[])
                     "changed", G_CALLBACK (selection_changed), button);
   gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
 
-  bbox = gtk_vbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
   gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0);
 
@@ -878,7 +878,7 @@ main (int argc, char *argv[])
 
   
   /* Right Pane */
-  vbox2 = gtk_vbox_new (FALSE, 8);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
@@ -943,9 +943,10 @@ main (int argc, char *argv[])
                                        GDK_ACTION_MOVE);
 
 
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
+                      FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 8);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 8);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   button = gtk_button_new_with_mnemonic ("_Add new Column");
   g_signal_connect (button, "clicked", G_CALLBACK (add_clicked), left_tree_model);