gtk: remove "gboolean homogeneous" from gtk_box_new()

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

diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index e56aaac2e71398328aa9112aef2c4b37a6c1cf78..4a244ea583a8bf6de3bb3eb00f0a61f17ad8d056 100644 (file)
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -1,3 +1,24 @@
+/* testtreefocus.c
+ * Copyright (C) 2001 Red Hat, Inc
+ * Author: Jonathan Blandford
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
 #include <gtk/gtk.h>
 
 typedef struct _TreeStruct TreeStruct;
@@ -298,6 +319,23 @@ dave_toggled (GtkCellRendererToggle *cell,
   gtk_tree_path_free (path);
 }
 
+static void
+set_indicator_size (GtkTreeViewColumn *column,
+                   GtkCellRenderer *cell,
+                   GtkTreeModel *model,
+                   GtkTreeIter *iter,
+                   gpointer data)
+{
+  gint size;
+  GtkTreePath *path;
+
+  path = gtk_tree_model_get_path (model, iter);
+  size = gtk_tree_path_get_indices (path)[0]  * 2 + 10;
+  gtk_tree_path_free (path);
+
+  g_object_set (cell, "indicator_size", size, NULL);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -315,7 +353,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), FALSE, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -342,7 +380,7 @@ main (int argc, char *argv[])
   renderer = gtk_cell_renderer_toggle_new ();
   g_signal_connect (renderer, "toggled", G_CALLBACK (alex_toggled), model);
 
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
                                                            -1, "Alex",
                                                            renderer,
@@ -359,7 +397,7 @@ main (int argc, char *argv[])
   renderer = gtk_cell_renderer_toggle_new ();
   g_signal_connect (renderer, "toggled", G_CALLBACK (havoc_toggled), model);
 
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
                                                            -1, "Havoc",
                                                            renderer,
@@ -375,7 +413,7 @@ main (int argc, char *argv[])
   renderer = gtk_cell_renderer_toggle_new ();
   g_signal_connect (renderer, "toggled", G_CALLBACK (tim_toggled), model);
 
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
                                               -1, "Tim",
                                               renderer,
@@ -391,7 +429,7 @@ main (int argc, char *argv[])
   /* Owen Column */
   renderer = gtk_cell_renderer_toggle_new ();
   g_signal_connect (renderer, "toggled", G_CALLBACK (owen_toggled), model);
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
                                               -1, "Owen",
                                               renderer,
@@ -406,7 +444,7 @@ main (int argc, char *argv[])
   /* Owen Column */
   renderer = gtk_cell_renderer_toggle_new ();
   g_signal_connect (renderer, "toggled", G_CALLBACK (dave_toggled), model);
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
                                               -1, "Dave",
                                               renderer,
@@ -414,6 +452,7 @@ main (int argc, char *argv[])
                                               "visible", VISIBLE_COLUMN,
                                               NULL);
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree_view), col_offset - 1);
+  gtk_tree_view_column_set_cell_data_func (column, renderer, set_indicator_size, NULL, NULL);
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE);
@@ -430,7 +469,7 @@ main (int argc, char *argv[])
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window), "Model");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);