updated the (quite outdated) examples to use canonical signal names as

2008-08-11  Sven Neumann  <sven@gimp.org>

	* examples/*: updated the (quite outdated) examples to use
	canonical signal names as well. Removed some unneeded casts and
	trailing whitespace while I was on it...


svn path=/trunk/; revision=21071

1 files changed, 59 insertions, 59 deletions

diff --git a/examples/packbox/packbox.c b/examples/packbox/packbox.c
index 2961102a64..9189825626 100644
--- a/examples/packbox/packbox.c
+++ b/examples/packbox/packbox.c
@@ -11,63 +11,63 @@ static gboolean delete_event( GtkWidget *widget,
     return FALSE;
 }
 
-/* Make a new hbox filled with button-labels. Arguments for the 
- * variables we're interested are passed in to this function. 
+/* Make a new hbox filled with button-labels. Arguments for the
+ * variables we're interested are passed in to this function.
  * We do not show the box, but do show everything inside. */
 static GtkWidget *make_box( gboolean homogeneous,
                             gint     spacing,
                             gboolean expand,
                             gboolean fill,
-                            guint    padding ) 
+                            guint    padding )
 {
     GtkWidget *box;
     GtkWidget *button;
     char padstr[80];
-    
+
     /* Create a new hbox with the appropriate homogeneous
      * and spacing settings */
     box = gtk_hbox_new (homogeneous, spacing);
-    
+
     /* Create a series of buttons with the appropriate settings */
     button = gtk_button_new_with_label ("gtk_box_pack");
     gtk_box_pack_start (GTK_BOX (box), button, expand, fill, padding);
     gtk_widget_show (button);
-    
+
     button = gtk_button_new_with_label ("(box,");
     gtk_box_pack_start (GTK_BOX (box), button, expand, fill, padding);
     gtk_widget_show (button);
-    
+
     button = gtk_button_new_with_label ("button,");
     gtk_box_pack_start (GTK_BOX (box), button, expand, fill, padding);
     gtk_widget_show (button);
-    
+
     /* Create a button with the label depending on the value of
      * expand. */
     if (expand == TRUE)
 	    button = gtk_button_new_with_label ("TRUE,");
     else
 	    button = gtk_button_new_with_label ("FALSE,");
-    
+
     gtk_box_pack_start (GTK_BOX (box), button, expand, fill, padding);
     gtk_widget_show (button);
-    
+
     /* This is the same as the button creation for "expand"
      * above, but uses the shorthand form. */
     button = gtk_button_new_with_label (fill ? "TRUE," : "FALSE,");
     gtk_box_pack_start (GTK_BOX (box), button, expand, fill, padding);
     gtk_widget_show (button);
-    
+
     sprintf (padstr, "%d);", padding);
-    
+
     button = gtk_button_new_with_label (padstr);
     gtk_box_pack_start (GTK_BOX (box), button, expand, fill, padding);
     gtk_widget_show (button);
-    
+
     return box;
 }
 
 int main( int   argc,
-          char *argv[]) 
+          char *argv[])
 {
     GtkWidget *window;
     GtkWidget *button;
@@ -77,51 +77,51 @@ int main( int   argc,
     GtkWidget *label;
     GtkWidget *quitbox;
     int which;
-    
+
     /* Our init, don't forget this! :) */
     gtk_init (&argc, &argv);
-    
+
     if (argc != 2) {
 	fprintf (stderr, "usage: packbox num, where num is 1, 2, or 3.\n");
 	/* This just does cleanup in GTK and exits with an exit status of 1. */
 	exit (1);
     }
-    
+
     which = atoi (argv[1]);
 
     /* Create our window */
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-    /* You should always remember to connect the delete_event signal
+    /* You should always remember to connect the "delete-event" signal
      * to the main window. This is very important for proper intuitive
      * behavior */
-    g_signal_connect (G_OBJECT (window), "delete_event",
+    g_signal_connect (window, "delete-event",
 		      G_CALLBACK (delete_event), NULL);
     gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-    
+
     /* We create a vertical box (vbox) to pack the horizontal boxes into.
      * This allows us to stack the horizontal boxes filled with buttons one
      * on top of the other in this vbox. */
     box1 = gtk_vbox_new (FALSE, 0);
-    
+
     /* which example to show. These correspond to the pictures above. */
     switch (which) {
     case 1:
 	/* create a new label. */
 	label = gtk_label_new ("gtk_hbox_new (FALSE, 0);");
-	
-	/* Align the label to the left side.  We'll discuss this function and 
+
+	/* Align the label to the left side.  We'll discuss this function and
 	 * others in the section on Widget Attributes. */
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 
-	/* Pack the label into the vertical box (vbox box1).  Remember that 
+	/* Pack the label into the vertical box (vbox box1).  Remember that
 	 * widgets added to a vbox will be packed one on top of the other in
 	 * order. */
 	gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
-	
+
 	/* Show the label */
 	gtk_widget_show (label);
-	
+
 	/* Call our make box function - homogeneous = FALSE, spacing = 0,
 	 * expand = FALSE, fill = FALSE, padding = 0 */
 	box2 = make_box (FALSE, 0, FALSE, FALSE, 0);
@@ -133,93 +133,93 @@ int main( int   argc,
 	box2 = make_box (FALSE, 0, TRUE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
+
 	/* Args are: homogeneous, spacing, expand, fill, padding */
 	box2 = make_box (FALSE, 0, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
-	/* Creates a separator, we'll learn more about these later, 
+
+	/* Creates a separator, we'll learn more about these later,
 	 * but they are quite simple. */
 	separator = gtk_hseparator_new ();
-	
+
         /* Pack the separator into the vbox. Remember each of these
          * widgets is being packed into a vbox, so they'll be stacked
 	 * vertically. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
-	
+
 	/* Create another new label, and show it. */
 	label = gtk_label_new ("gtk_hbox_new (TRUE, 0);");
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
-	
+
 	/* Args are: homogeneous, spacing, expand, fill, padding */
 	box2 = make_box (TRUE, 0, TRUE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
+
 	/* Args are: homogeneous, spacing, expand, fill, padding */
 	box2 = make_box (TRUE, 0, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
+
 	/* Another new separator. */
 	separator = gtk_hseparator_new ();
 	/* The last 3 arguments to gtk_box_pack_start are:
 	 * expand, fill, padding. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
-	
+
 	break;
 
     case 2:
 
-	/* Create a new label, remember box1 is a vbox as created 
+	/* Create a new label, remember box1 is a vbox as created
 	 * near the beginning of main() */
 	label = gtk_label_new ("gtk_hbox_new (FALSE, 10);");
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
-	
+
 	/* Args are: homogeneous, spacing, expand, fill, padding */
 	box2 = make_box (FALSE, 10, TRUE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
+
 	/* Args are: homogeneous, spacing, expand, fill, padding */
 	box2 = make_box (FALSE, 10, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
+
 	separator = gtk_hseparator_new ();
 	/* The last 3 arguments to gtk_box_pack_start are:
 	 * expand, fill, padding. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
-	
+
 	label = gtk_label_new ("gtk_hbox_new (FALSE, 0);");
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
 	gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
-	
+
 	/* Args are: homogeneous, spacing, expand, fill, padding */
 	box2 = make_box (FALSE, 0, TRUE, FALSE, 10);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
+
 	/* Args are: homogeneous, spacing, expand, fill, padding */
 	box2 = make_box (FALSE, 0, TRUE, TRUE, 10);
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
+
 	separator = gtk_hseparator_new ();
 	/* The last 3 arguments to gtk_box_pack_start are: expand, fill, padding. */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
 	gtk_widget_show (separator);
 	break;
-    
+
     case 3:
 
         /* This demonstrates the ability to use gtk_box_pack_end() to
@@ -233,11 +233,11 @@ int main( int   argc,
 	gtk_box_pack_end (GTK_BOX (box2), label, FALSE, FALSE, 0);
 	/* Show the label. */
 	gtk_widget_show (label);
-	
+
 	/* Pack box2 into box1 (the vbox remember ? :) */
 	gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 	gtk_widget_show (box2);
-	
+
 	/* A separator for the bottom. */
 	separator = gtk_hseparator_new ();
 	/* This explicitly sets the separator to 400 pixels wide by 5 pixels
@@ -246,46 +246,46 @@ int main( int   argc,
 	 * hbox. Otherwise, all the widgets in the hbox would be packed as
 	 * close together as possible. */
 	gtk_widget_set_size_request (separator, 400, 5);
-	/* pack the separator into the vbox (box1) created near the start 
+	/* pack the separator into the vbox (box1) created near the start
 	 * of main() */
 	gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
-	gtk_widget_show (separator);    
+	gtk_widget_show (separator);
     }
-    
+
     /* Create another new hbox.. remember we can use as many as we need! */
     quitbox = gtk_hbox_new (FALSE, 0);
-    
+
     /* Our quit button. */
     button = gtk_button_new_with_label ("Quit");
-    
+
     /* Setup the signal to terminate the program when the button is clicked */
-    g_signal_connect_swapped (G_OBJECT (button), "clicked",
+    g_signal_connect_swapped (button, "clicked",
 			      G_CALLBACK (gtk_main_quit),
-			      G_OBJECT (window));
+			      window);
     /* Pack the button into the quitbox.
      * The last 3 arguments to gtk_box_pack_start are:
      * expand, fill, padding. */
     gtk_box_pack_start (GTK_BOX (quitbox), button, TRUE, FALSE, 0);
     /* pack the quitbox into the vbox (box1) */
     gtk_box_pack_start (GTK_BOX (box1), quitbox, FALSE, FALSE, 0);
-    
+
     /* Pack the vbox (box1) which now contains all our widgets, into the
      * main window. */
     gtk_container_add (GTK_CONTAINER (window), box1);
-    
+
     /* And show everything left */
     gtk_widget_show (button);
     gtk_widget_show (quitbox);
-    
+
     gtk_widget_show (box1);
     /* Showing the window last so everything pops up at once. */
     gtk_widget_show (window);
-    
+
     /* And of course, our main function. */
     gtk_main ();
 
-    /* Control returns here when gtk_main_quit() is called, but not when 
+    /* Control returns here when gtk_main_quit() is called, but not when
      * exit() is used. */
-    
+
     return 0;
 }