gtk: remove "gboolean homogeneous" from gtk_box_new()

[~andy/gtk] / demos / gtk-demo / tree_store.c

diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 3f17d5252cdb587d98839624cf64dfaad006f406..8c03e39767063e8d3f670f03366046fc876c3330 100644 (file)
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -261,7 +261,7 @@ add_columns (GtkTreeView *treeview)
 
   /* column for holiday names */
   renderer = gtk_cell_renderer_text_new ();
-  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 (treeview),
                                                            -1, "Holiday",
@@ -273,11 +273,11 @@ add_columns (GtkTreeView *treeview)
 
   /* alex column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN);
 
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-                   model);
+  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
+
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
                                                            -1, "Alex",
                                                            renderer,
@@ -296,11 +296,11 @@ add_columns (GtkTreeView *treeview)
 
   /* havoc column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN);
 
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-                   model);
+  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
+
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
                                                            -1, "Havoc",
                                                            renderer,
@@ -318,11 +318,11 @@ add_columns (GtkTreeView *treeview)
 
   /* tim column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN);
 
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-                   model);
+  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
+
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
                                                            -1, "Tim",
                                                            renderer,
@@ -341,11 +341,11 @@ add_columns (GtkTreeView *treeview)
 
   /* owen column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN);
 
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-                   model);
+  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
+
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
                                                            -1, "Owen",
                                                            renderer,
@@ -363,11 +363,11 @@ add_columns (GtkTreeView *treeview)
 
   /* dave column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
+  g_object_set (renderer, "xalign", 0.0, NULL);
   g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN);
 
-  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled),
-                   model);
+  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
+
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
                                                            -1, "Dave",
                                                            renderer,
@@ -385,7 +385,7 @@ add_columns (GtkTreeView *treeview)
 }
 
 GtkWidget *
-do_tree_store (void)
+do_tree_store (GtkWidget *do_widget)
 {
   if (!window)
     {
@@ -396,11 +396,13 @@ do_tree_store (void)
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                            gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
-      g_signal_connect (G_OBJECT (window), "destroy",
+      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);
 
-      vbox = gtk_vbox_new (FALSE, 8);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -421,7 +423,7 @@ do_tree_store (void)
 
       /* create tree view */
       treeview = 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 (treeview), TRUE);
       gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
                                   GTK_SELECTION_MULTIPLE);
@@ -431,12 +433,12 @@ do_tree_store (void)
       gtk_container_add (GTK_CONTAINER (sw), treeview);
 
       /* expand all rows after the treeview widget has been realized */
-      g_signal_connect (G_OBJECT (treeview), "realize",
+      g_signal_connect (treeview, "realize",
                        G_CALLBACK (gtk_tree_view_expand_all), NULL);
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
     }
 
-  if (!GTK_WIDGET_VISIBLE (window))
+  if (!gtk_widget_get_visible (window))
     gtk_widget_show_all (window);
   else
     {