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

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

diff --git a/examples/statusbar/statusbar.c b/examples/statusbar/statusbar.c
index 7956ffdecf5b4fb32bff5f67f516b715000266d9..bd8d8e2a0b8d63b4bdadec6e9f9b7a1062224490 100644 (file)
--- a/examples/statusbar/statusbar.c
+++ b/examples/statusbar/statusbar.c
@@ -1,73 +1,74 @@
-/* example-start statusbar statusbar.c */
 
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib.h>
 
 GtkWidget *status_bar;
 
-void push_item (GtkWidget *widget, gpointer data)
+static void push_item( GtkWidget *widget,
+                       gpointer   data )
 {
   static int count = 1;
-  char buff[20];
+  gchar *buff;
 
-  g_snprintf(buff, 20, "Item %d", count++);
-  gtk_statusbar_push( GTK_STATUSBAR(status_bar), (guint) &data, buff);
-
-  return;
+  buff = g_strdup_printf ("Item %d", count++);
+  gtk_statusbar_push (GTK_STATUSBAR (status_bar), GPOINTER_TO_INT (data), buff);
+  g_free (buff);
 }
 
-void pop_item (GtkWidget *widget, gpointer data)
+static void pop_item( GtkWidget *widget,
+                      gpointer   data )
 {
-  gtk_statusbar_pop( GTK_STATUSBAR(status_bar), (guint) &data );
-  return;
+  gtk_statusbar_pop (GTK_STATUSBAR (status_bar), GPOINTER_TO_INT (data));
 }
 
-int main (int argc, char *argv[])
+int main( int   argc,
+          char *argv[] )
 {
 
     GtkWidget *window;
     GtkWidget *vbox;
     GtkWidget *button;
 
-    int context_id;
+    gint context_id;
 
     gtk_init (&argc, &argv);
 
     /* create a new window */
-    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_widget_set_usize( GTK_WIDGET (window), 200, 100);
-    gtk_window_set_title(GTK_WINDOW (window), "GTK Statusbar Example");
-    gtk_signal_connect(GTK_OBJECT (window), "delete_event",
-                       (GtkSignalFunc) gtk_exit, NULL);
- 
-    vbox = gtk_vbox_new(FALSE, 1);
-    gtk_container_add(GTK_CONTAINER(window), vbox);
-    gtk_widget_show(vbox);
-          
-    status_bar = gtk_statusbar_new();      
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_widget_set_size_request (GTK_WIDGET (window), 200, 100);
+    gtk_window_set_title (GTK_WINDOW (window), "GTK Statusbar Example");
+    g_signal_connect (window, "delete-event",
+                      G_CALLBACK (exit), NULL);
+
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 1);
+    gtk_container_add (GTK_CONTAINER (window), vbox);
+    gtk_widget_show (vbox);
+
+    status_bar = gtk_statusbar_new ();
     gtk_box_pack_start (GTK_BOX (vbox), status_bar, TRUE, TRUE, 0);
     gtk_widget_show (status_bar);
 
-    context_id = gtk_statusbar_get_context_id( GTK_STATUSBAR(status_bar), "Statusbar example");
+    context_id = gtk_statusbar_get_context_id(
+                          GTK_STATUSBAR (status_bar), "Statusbar example");
 
-    button = gtk_button_new_with_label("push item");
-    gtk_signal_connect(GTK_OBJECT(button), "clicked",
-        GTK_SIGNAL_FUNC (push_item), &context_id);
-    gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 2);
-    gtk_widget_show(button);              
+    button = gtk_button_new_with_label ("push item");
+    g_signal_connect (button, "clicked",
+                      G_CALLBACK (push_item), GINT_TO_POINTER (context_id));
+    gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 2);
+    gtk_widget_show (button);
 
-    button = gtk_button_new_with_label("pop last item");
-    gtk_signal_connect(GTK_OBJECT(button), "clicked",
-        GTK_SIGNAL_FUNC (pop_item), &context_id);
-    gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 2);
-    gtk_widget_show(button);              
+    button = gtk_button_new_with_label ("pop last item");
+    g_signal_connect (button, "clicked",
+                      G_CALLBACK (pop_item), GINT_TO_POINTER (context_id));
+    gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 2);
+    gtk_widget_show (button);
 
     /* always display the window as the last step so it all splashes on
      * the screen at once. */
-    gtk_widget_show(window);
+    gtk_widget_show (window);
 
     gtk_main ();
 
     return 0;
 }
-/* example-end */