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

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

diff --git a/examples/buttons/buttons.c b/examples/buttons/buttons.c
index fae4085fca1a8f4e7ee86068b3714a12ffa520e9..df68fcb42f8342b3f57c68613dbc6aaebb1712ba 100644 (file)
--- a/examples/buttons/buttons.c
+++ b/examples/buttons/buttons.c
@@ -1,105 +1,91 @@
-/* This file extracted from the GTK tutorial. */
-
-/* buttons.c */
 
+#include <stdlib.h>
 #include <gtk/gtk.h>
 
-/* create a new hbox with an image and a label packed into it
- * and return the box.. */
+/* Create a new hbox with an image and a label packed into it
+ * and return the box. */
 
-GtkWidget *xpm_label_box (GtkWidget *parent, gchar *xpm_filename, gchar *label_text)
+static GtkWidget *xpm_label_box( gchar     *xpm_filename,
+                                 gchar     *label_text )
 {
-    GtkWidget *box1;
+    GtkWidget *box;
     GtkWidget *label;
-    GtkWidget *pixmapwid;
-    GdkPixmap *pixmap;
-    GdkBitmap *mask;
-    GtkStyle *style;
-
-    /* create box for xpm and label */
-    box1 = gtk_hbox_new (FALSE, 0);
-    gtk_container_border_width (GTK_CONTAINER (box1), 2);
-
-    /* get style of button.. I assume it's to get the background color.
-     * if someone knows the real reason, please enlighten me. */
-    style = gtk_widget_get_style(parent);
-
-    /* now on to the xpm stuff.. load xpm */
-    pixmap = gdk_pixmap_create_from_xpm (parent->window, &mask,
-                                        &style->bg[GTK_STATE_NORMAL],
-                                        xpm_filename);
-    pixmapwid = gtk_pixmap_new (pixmap, mask);
-
-    /* create label for button */
-    label = gtk_label_new (label_text);
+    GtkWidget *image;
 
-    /* pack the pixmap and label into the box */
-    gtk_box_pack_start (GTK_BOX (box1),
-                       pixmapwid, FALSE, FALSE, 3);
+    /* Create box for image and label */
+    box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (box), 2);
 
-    gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 3);
+    /* Now on to the image stuff */
+    image = gtk_image_new_from_file (xpm_filename);
+
+    /* Create a label for the button */
+    label = gtk_label_new (label_text);
 
-    gtk_widget_show(pixmapwid);
-    gtk_widget_show(label);
+    /* Pack the image and label into the box */
+    gtk_box_pack_start (GTK_BOX (box), image, FALSE, FALSE, 3);
+    gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 3);
 
-    return (box1);
+    gtk_widget_show (image);
+    gtk_widget_show (label);
+
+    return box;
 }
 
-/* our usual callback function */
-void callback (GtkWidget *widget, gpointer *data)
+/* Our usual callback function */
+static void callback( GtkWidget *widget,
+                      gpointer   data )
 {
     g_print ("Hello again - %s was pressed\n", (char *) data);
 }
 
-
-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
     /* GtkWidget is the storage type for widgets */
     GtkWidget *window;
     GtkWidget *button;
-    GtkWidget *box1;
+    GtkWidget *box;
 
     gtk_init (&argc, &argv);
 
-    /* create a new window */
+    /* Create a new window */
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
     gtk_window_set_title (GTK_WINDOW (window), "Pixmap'd Buttons!");
 
     /* It's a good idea to do this for all windows. */
-    gtk_signal_connect (GTK_OBJECT (window), "destroy",
-                       GTK_SIGNAL_FUNC (gtk_exit), NULL);
-
-    gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-                       GTK_SIGNAL_FUNC (gtk_exit), NULL);
+    g_signal_connect (G_OBJECT (window), "destroy",
+                     G_CALLBACK (gtk_main_quit), NULL);
 
+    g_signal_connect (G_OBJECT (window), "delete-event",
+                     G_CALLBACK (gtk_main_quit), NULL);
 
-    /* sets the border width of the window. */
-    gtk_container_border_width (GTK_CONTAINER (window), 10);
-    gtk_widget_realize(window);
+    /* Sets the border width of the window. */
+    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
-    /* create a new button */
+    /* Create a new button */
     button = gtk_button_new ();
 
-    /* You should be getting used to seeing most of these functions by now */
-    gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                       GTK_SIGNAL_FUNC (callback), (gpointer) "cool button");
+    /* Connect the "clicked" signal of the button to our callback */
+    g_signal_connect (G_OBJECT (button), "clicked",
+                     G_CALLBACK (callback), (gpointer) "cool button");
 
-    /* this calls our box creating function */
-    box1 = xpm_label_box(window, "info.xpm", "cool button");
+    /* This calls our box creating function */
+    box = xpm_label_box ("info.xpm", "cool button");
 
-    /* pack and show all our widgets */
-    gtk_widget_show(box1);
+    /* Pack and show all our widgets */
+    gtk_widget_show (box);
 
-    gtk_container_add (GTK_CONTAINER (button), box1);
+    gtk_container_add (GTK_CONTAINER (button), box);
 
-    gtk_widget_show(button);
+    gtk_widget_show (button);
 
     gtk_container_add (GTK_CONTAINER (window), button);
 
     gtk_widget_show (window);
 
-    /* rest in gtk_main and wait for the fun to begin! */
+    /* Rest in gtk_main and wait for the fun to begin! */
     gtk_main ();
 
     return 0;