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 a525aa3ebcf7c855a4d2d318079b0b226c3841ae..93fde5bcefffade51cdd6980107eb9deab44f1d9 100644 (file)
--- a/examples/helloworld2/helloworld2.c
+++ b/examples/helloworld2/helloworld2.c
@@ -1,25 +1,25 @@
-/* example-start helloworld2 helloworld2.c */
 
 #include <gtk/gtk.h>
 
 /* 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", (char *) data);
+    g_print ("Hello again - %s was pressed\n", (gchar *) data);
 }
 
 /* another callback */
-void 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;
@@ -33,14 +33,14 @@ int main( int   argc,
     /* Create a new window */
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-    /* This is a new call, this just sets the title of our
+    /* This is a new call, which just sets the title of our
      * new window to "Hello Buttons!" */
     gtk_window_set_title (GTK_WINDOW (window), "Hello Buttons!");
 
     /* Here we just set a handler for delete_event that immediately
      * exits GTK. */
-    gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-                       GTK_SIGNAL_FUNC (delete_event), NULL);
+    g_signal_connect (window, "delete-event",
+                     G_CALLBACK (delete_event), NULL);
 
     /* Sets the border width of the window. */
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
@@ -48,7 +48,7 @@ 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);
@@ -58,38 +58,37 @@ int main( int   argc,
 
     /* Now when the button is clicked, we call the "callback" function
      * with a pointer to "button 1" as its argument */
-    gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                       GTK_SIGNAL_FUNC (callback), (gpointer) "button 1");
+    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. */
-    gtk_widget_show(button);
+    gtk_widget_show (button);
 
     /* Do these same steps again to create a second button */
     button = gtk_button_new_with_label ("Button 2");
 
     /* Call the same callback function with a different argument,
      * passing a pointer to "button 2" instead. */
-    gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                       GTK_SIGNAL_FUNC (callback), (gpointer) "button 2");
+    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. */
-    gtk_widget_show(button);
+    gtk_widget_show (button);
 
-    gtk_widget_show(box1);
+    gtk_widget_show (box1);
 
     gtk_widget_show (window);
 
     /* Rest in gtk_main and wait for the fun to begin! */
     gtk_main ();
 
-    return(0);
+    return 0;
 }
-/* example-end */