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

[~andy/gtk] / examples / label / label.c

diff --git a/examples/label/label.c b/examples/label/label.c
index 5711a4c98f03fa598aed1c86762d679cf531b3f9..48ca40caad88f09c3b8f00411334a85d33fb5438 100644 (file)
--- a/examples/label/label.c
+++ b/examples/label/label.c
@@ -1,4 +1,3 @@
-/* example-start label label.c */
 
 #include <gtk/gtk.h>
 
@@ -12,16 +11,16 @@ int main( int   argc,
   GtkWidget *label;
 
   /* Initialise GTK */
-  gtk_init(&argc, &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 (G_OBJECT (window), "destroy",
+                   G_CALLBACK (gtk_main_quit),
+                   NULL);
 
   gtk_window_set_title (GTK_WINDOW (window), "Label");
-  vbox = gtk_vbox_new (FALSE, 5);
-  hbox = gtk_hbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 5);
   gtk_container_add (GTK_CONTAINER (window), hbox);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
@@ -51,7 +50,7 @@ int main( int   argc,
   gtk_container_add (GTK_CONTAINER (frame), label);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 5);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 5);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   frame = gtk_frame_new ("Line wrapped label");
   label = gtk_label_new ("This is an example of a line-wrapped label.  It " \
@@ -97,6 +96,5 @@ int main( int   argc,
 
   gtk_main ();
   
-  return(0);
+  return 0;
 }
-/* example-end */