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

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

diff --git a/examples/radiobuttons/radiobuttons.c b/examples/radiobuttons/radiobuttons.c
index 6d1c27096bf34423502837ad778864ed58986491..2869df9c4439195c2a9961a78e7a93e1afaf288a 100644 (file)
--- a/examples/radiobuttons/radiobuttons.c
+++ b/examples/radiobuttons/radiobuttons.c
@@ -2,9 +2,9 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-gint close_application( GtkWidget *widget,
-                        GdkEvent  *event,
-                        gpointer   data )
+static gboolean close_application( GtkWidget *widget,
+                                   GdkEvent  *event,
+                                   gpointer   data )
 {
   gtk_main_quit ();
   return FALSE;
@@ -19,23 +19,23 @@ int main( int   argc,
     GtkWidget *button;
     GtkWidget *separator;
     GSList *group;
-  
-    gtk_init (&argc, &argv);    
-      
+
+    gtk_init (&argc, &argv);
+
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  
-    g_signal_connect (G_OBJECT (window), "delete_event",
+
+    g_signal_connect (window, "delete-event",
                      G_CALLBACK (close_application),
                       NULL);
 
     gtk_window_set_title (GTK_WINDOW (window), "radio buttons");
     gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
-    box1 = gtk_vbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
     gtk_container_add (GTK_CONTAINER (window), box1);
     gtk_widget_show (box1);
 
-    box2 = gtk_vbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
     gtk_widget_show (box2);
@@ -55,25 +55,25 @@ int main( int   argc,
     gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
     gtk_widget_show (button);
 
-    separator = gtk_hseparator_new ();
+    separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
     gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
     gtk_widget_show (separator);
 
-    box2 = gtk_vbox_new (FALSE, 10);
+    box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 10);
     gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
     gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0);
     gtk_widget_show (box2);
 
     button = gtk_button_new_with_label ("close");
-    g_signal_connect_swapped (G_OBJECT (button), "clicked",
+    g_signal_connect_swapped (button, "clicked",
                               G_CALLBACK (close_application),
                               window);
     gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-    GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+    gtk_widget_set_can_default (button, TRUE);
     gtk_widget_grab_default (button);
     gtk_widget_show (button);
     gtk_widget_show (window);
-     
+
     gtk_main ();
 
     return 0;