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

[~andy/gtk] / demos / testgtk / main.c

diff --git a/demos/testgtk/main.c b/demos/testgtk/main.c
index 56a094ecae48f437e23cad13bb405c5ed105ecae..f772a6f0e114498ca557b6aaee093a99188f253e 100644 (file)
--- a/demos/testgtk/main.c
+++ b/demos/testgtk/main.c
@@ -189,6 +189,7 @@ load_file (const gchar *filename)
 
   gtk_text_buffer_get_bounds (source_buffer, &start, &end);
   gtk_text_buffer_apply_tag_by_name (info_buffer, "source", &start, &end);
+  fclose (file);
 }
 
 gboolean
@@ -227,8 +228,7 @@ button_press_event_cb (GtkTreeView    *tree_view,
          gtk_tree_path_free (path);
        }
 
-      gtk_signal_emit_stop_by_name (GTK_OBJECT (tree_view),
-                                   "button_press_event");
+      g_signal_stop_emission_by_name (tree_view, "button-press-event");
       return TRUE;
     }
   
@@ -294,8 +294,8 @@ create_tree (void)
   GtkTreeSelection *selection;
   GtkCellRenderer *cell;
   GtkWidget *tree_view;
-  GtkObject *column;
-  GtkObject *model;
+  GtkTreeViewColumn *column;
+  GtkTreeStore *model;
   GtkTreeIter iter;
   gint i;
 
@@ -329,8 +329,8 @@ create_tree (void)
   gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
                               GTK_TREE_VIEW_COLUMN (column));
 
-  gtk_signal_connect (GTK_OBJECT (selection), "selection_changed", selection_cb, model);
-  gtk_signal_connect (GTK_OBJECT (tree_view), "button_press_event", GTK_SIGNAL_FUNC (button_press_event_cb), model);
+  g_signal_connect (selection, "selection-changed", selection_cb, model);
+  g_signal_connect (tree_view, "button-press-event", G_CALLBACK (button_press_event_cb), model);
 
   return tree_view;
 }
@@ -347,10 +347,10 @@ main (int argc, char **argv)
   gtk_init (&argc, &argv);
   
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_signal_connect (GTK_OBJECT (window), "destroy",
-                     GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+  g_signal_connect (window, "destroy",
+                    G_CALLBACK (gtk_main_quit), NULL);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
   tree = create_tree ();
@@ -369,16 +369,16 @@ main (int argc, char **argv)
                            gtk_label_new ("Source"));
 
   tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  gtk_object_set (GTK_OBJECT (tag),
-                "font", "Sans 18",
-                NULL);
+  g_object_set (tag,
+                "font", "Sans 18",
+                NULL);
 
   tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  gtk_object_set (GTK_OBJECT (tag),
-                 "font", "Courier 10",
-                 "pixels_above_lines", 0,
-                 "pixels_below_lines", 0,
-                NULL);
+  g_object_set (tag,
+                "font", "Courier 10",
+                "pixels_above_lines", 0,
+                "pixels_below_lines", 0,
+                NULL);
 
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);