X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=tests%2Ftesttreefocus.c;h=5fe6f0d50d1fb58321811e2254c07138b7f58271;hb=HEAD;hp=5d3bf49d84d12c8406dc27903be168ba4e140f52;hpb=59444d85e3abd3c9f8b1c1c27fdd67c4b716e723;p=~andy%2Fgtk diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c index 5d3bf49d8..5fe6f0d50 100644 --- a/tests/testtreefocus.c +++ b/tests/testtreefocus.c @@ -1,3 +1,22 @@ +/* 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, see . + */ + +#include "config.h" #include typedef struct _TreeStruct TreeStruct; @@ -154,15 +173,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) { @@ -298,6 +317,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[]) { @@ -309,14 +345,13 @@ main (int argc, char *argv[]) GtkCellRenderer *renderer; gint col_offset; GtkTreeViewColumn *column; - GtkTreeSelection *selection; gtk_init (&argc, &argv); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet"); - gtk_signal_connect (GTK_OBJECT (window), "destroy", gtk_main_quit, NULL); - vbox = gtk_vbox_new (FALSE, 8); + g_signal_connect (window, "destroy", gtk_main_quit, NULL); + 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); @@ -330,7 +365,7 @@ main (int argc, char *argv[]) tree_view = gtk_tree_view_new_with_model (model); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view), TRUE); gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)), - GTK_TREE_SELECTION_MULTI); + GTK_SELECTION_MULTIPLE); renderer = gtk_cell_renderer_text_new (); col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Holiday", @@ -338,31 +373,29 @@ main (int argc, char *argv[]) "text", HOLIDAY_COLUMN, NULL); column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree_view), col_offset - 1); gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE); - g_object_unref (renderer); /* Alex Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (alex_toggled), model, NULL, FALSE, FALSE); + 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, "active", ALEX_COLUMN, "visible", VISIBLE_COLUMN, - "can_activate", WORLD_COLUMN, + "activatable", WORLD_COLUMN, NULL); column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree_view), col_offset - 1); gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_width (GTK_TREE_VIEW_COLUMN (column), 50); + 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); - g_object_unref (renderer); /* Havoc Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (havoc_toggled), model, NULL, FALSE, FALSE); + 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, @@ -371,32 +404,30 @@ main (int argc, char *argv[]) NULL); column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree_view), col_offset - 1); gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_width (GTK_TREE_VIEW_COLUMN (column), 50); + 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); - g_object_unref (renderer); /* Tim Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (tim_toggled), model, NULL, FALSE, FALSE); + 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, "active", TIM_COLUMN, "visible", VISIBLE_COLUMN, - "can_activate", WORLD_COLUMN, + "activatable", WORLD_COLUMN, NULL); column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree_view), col_offset - 1); gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE); - gtk_tree_view_column_set_width (GTK_TREE_VIEW_COLUMN (column), 50); - g_object_unref (renderer); + gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50); /* Owen Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (owen_toggled), model, NULL, FALSE, FALSE); - g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); + g_signal_connect (renderer, "toggled", G_CALLBACK (owen_toggled), model); + 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,13 +437,12 @@ main (int argc, char *argv[]) column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree_view), col_offset - 1); gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_clickable (GTK_TREE_VIEW_COLUMN (column), TRUE); - gtk_tree_view_column_set_width (GTK_TREE_VIEW_COLUMN (column), 50); - g_object_unref (renderer); + gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50); /* Owen Column */ renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (dave_toggled), model, NULL, FALSE, FALSE); - g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); + g_signal_connect (renderer, "toggled", G_CALLBACK (dave_toggled), model); + 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, @@ -420,24 +450,24 @@ 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_width (GTK_TREE_VIEW_COLUMN (column), 50); + 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); - g_object_unref (renderer); gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view); - gtk_signal_connect (GTK_OBJECT (tree_view), "realize", - GTK_SIGNAL_FUNC (gtk_tree_view_expand_all), - NULL); + g_signal_connect (tree_view, "realize", + G_CALLBACK (gtk_tree_view_expand_all), + NULL); gtk_window_set_default_size (GTK_WINDOW (window), 650, 400); gtk_widget_show_all (window); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Model"); - gtk_signal_connect (GTK_OBJECT (window), "destroy", gtk_main_quit, NULL); - vbox = gtk_vbox_new (FALSE, 8); + g_signal_connect (window, "destroy", gtk_main_quit, NULL); + 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); @@ -449,68 +479,52 @@ main (int argc, char *argv[]) tree_view = gtk_tree_view_new_with_model (model); - g_object_unref (G_OBJECT (model)); + g_object_unref (model); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (tree_view), TRUE); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Holiday Column", - renderer, + gtk_cell_renderer_text_new (), "text", 0, NULL); - g_object_unref (renderer); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Alex Column", - renderer, + gtk_cell_renderer_text_new (), "text", 1, NULL); - g_object_unref (renderer); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Havoc Column", - renderer, + gtk_cell_renderer_text_new (), "text", 2, NULL); - g_object_unref (renderer); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Tim Column", - renderer, + gtk_cell_renderer_text_new (), "text", 3, NULL); - g_object_unref (renderer); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Owen Column", - renderer, + gtk_cell_renderer_text_new (), "text", 4, NULL); - g_object_unref (renderer); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Dave Column", - renderer, + gtk_cell_renderer_text_new (), "text", 5, NULL); - g_object_unref (renderer); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "Visible Column", - renderer, + gtk_cell_renderer_text_new (), "text", 6, NULL); - g_object_unref (renderer); - renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view), -1, "World Holiday", - renderer, + gtk_cell_renderer_text_new (), "text", 7, NULL); - g_object_unref (renderer); - gtk_signal_connect (GTK_OBJECT (tree_view), "realize", - GTK_SIGNAL_FUNC (gtk_tree_view_expand_all), - NULL); + g_signal_connect (tree_view, "realize", + G_CALLBACK (gtk_tree_view_expand_all), + NULL); gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);