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

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

diff --git a/examples/helloworld2/helloworld2.c b/examples/helloworld2/helloworld2.c
index 37c17d0a8ee295504b0677562c1beffd5ee8f386..93fde5bcefffade51cdd6980107eb9deab44f1d9 100644 (file)
--- a/examples/helloworld2/helloworld2.c
+++ b/examples/helloworld2/helloworld2.c
@@ -3,23 +3,23 @@
 
 /* Our new improved callback.  The data passed to this function
  * is printed to stdout. */
-void callback( GtkWidget *widget,
-               gpointer   data )
+static void callback (GtkWidget *widget,
+                      gpointer   data)
 {
     g_print ("Hello again - %s was pressed\n", (gchar *) data);
 }
 
 /* another callback */
-gint delete_event( GtkWidget *widget,
-                   GdkEvent  *event,
-                   gpointer   data )
+static gboolean delete_event (GtkWidget *widget,
+                              GdkEvent  *event,
+                              gpointer   data)
 {
     gtk_main_quit ();
     return FALSE;
 }
 
-int main( int   argc,
-          char *argv[] )
+int main (int   argc,
+          char *argv[])
 {
     /* GtkWidget is the storage type for widgets */
     GtkWidget *window;
@@ -39,7 +39,7 @@ int main( int   argc,
 
     /* Here we just set a handler for delete_event that immediately
      * exits GTK. */
-    g_signal_connect (G_OBJECT (window), "delete_event",
+    g_signal_connect (window, "delete-event",
                      G_CALLBACK (delete_event), NULL);
 
     /* Sets the border width of the window. */
@@ -48,22 +48,22 @@ int main( int   argc,
     /* We create a box to pack widgets into.  This is described in detail
      * in the "packing" section. The box is not really visible, it
      * is just used as a tool to arrange widgets. */
-    box1 = gtk_hbox_new (FALSE, 0);
+    box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
 
     /* Put the box into the main window. */
     gtk_container_add (GTK_CONTAINER (window), box1);
 
     /* Creates a new button with the label "Button 1". */
     button = gtk_button_new_with_label ("Button 1");
-    
+
     /* Now when the button is clicked, we call the "callback" function
      * with a pointer to "button 1" as its argument */
-    g_signal_connect (G_OBJECT (button), "clicked",
+    g_signal_connect (button, "clicked",
                      G_CALLBACK (callback), "button 1");
 
     /* Instead of gtk_container_add, we pack this button into the invisible
      * box, which has been packed into the window. */
-    gtk_box_pack_start (GTK_BOX(box1), button, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (box1), button, TRUE, TRUE, 0);
 
     /* Always remember this step, this tells GTK that our preparation for
      * this button is complete, and it can now be displayed. */
@@ -74,10 +74,10 @@ int main( int   argc,
 
     /* Call the same callback function with a different argument,
      * passing a pointer to "button 2" instead. */
-    g_signal_connect (G_OBJECT (button), "clicked",
+    g_signal_connect (button, "clicked",
                      G_CALLBACK (callback), "button 2");
 
-    gtk_box_pack_start(GTK_BOX (box1), button, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (box1), button, TRUE, TRUE, 0);
 
     /* The order in which we show the buttons is not really important, but I
      * recommend showing the window last, so it all pops up at once. */
@@ -86,7 +86,7 @@ int main( int   argc,
     gtk_widget_show (box1);
 
     gtk_widget_show (window);
-    
+
     /* Rest in gtk_main and wait for the fun to begin! */
     gtk_main ();