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

[~andy/gtk] / demos / testanimation.c

diff --git a/demos/testanimation.c b/demos/testanimation.c
index 82b932c2d0707868bf7759168ae897e5062558c4..3cdc0112673d737018633d722c6d0af0cd8bd305 100644 (file)
--- a/demos/testanimation.c
+++ b/demos/testanimation.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -53,7 +53,7 @@ destroy_context (gpointer data)
   if (lc->pixbuf_loader)
     {
       gdk_pixbuf_loader_close (lc->pixbuf_loader, NULL);
-      g_object_unref (G_OBJECT (lc->pixbuf_loader));
+      g_object_unref (lc->pixbuf_loader);
     }
   
   g_free (lc);
@@ -160,10 +160,8 @@ progressive_timeout (gpointer data)
                                            "Failure reading image file 'alphatest.png': %s",
                                            g_strerror (errno));
 
-          gtk_signal_connect (GTK_OBJECT (dialog),
-                              "response",
-                              GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                              NULL);
+          g_signal_connect (dialog, "response",
+                           G_CALLBACK (gtk_widget_destroy), NULL);
 
           fclose (lc->image_stream);
           lc->image_stream = NULL;
@@ -190,10 +188,8 @@ progressive_timeout (gpointer data)
 
           g_error_free (error);
           
-          gtk_signal_connect (GTK_OBJECT (dialog),
-                              "response",
-                              GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                              NULL);
+          g_signal_connect (dialog, "response",
+                           G_CALLBACK (gtk_widget_destroy), NULL);
 
           fclose (lc->image_stream);
           lc->image_stream = NULL;
@@ -229,14 +225,12 @@ progressive_timeout (gpointer data)
               
               g_error_free (error);
               
-              gtk_signal_connect (GTK_OBJECT (dialog),
-                                  "response",
-                                  GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                                  NULL);
+              g_signal_connect (dialog, "response",
+                               G_CALLBACK (gtk_widget_destroy), NULL);
               
               gtk_widget_show (dialog);
 
-              g_object_unref (G_OBJECT (lc->pixbuf_loader));
+              g_object_unref (lc->pixbuf_loader);
               lc->pixbuf_loader = NULL;
               
               lc->load_timeout = 0;
@@ -244,7 +238,7 @@ progressive_timeout (gpointer data)
               return FALSE; /* uninstall the timeout */
             }
           
-          g_object_unref (G_OBJECT (lc->pixbuf_loader));
+          g_object_unref (lc->pixbuf_loader);
           lc->pixbuf_loader = NULL;
         }
     }
@@ -264,10 +258,8 @@ progressive_timeout (gpointer data)
                                            lc->filename,
                                            g_strerror (errno));
 
-          gtk_signal_connect (GTK_OBJECT (dialog),
-                              "response",
-                              GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                              NULL);
+          g_signal_connect (dialog, "response",
+                           G_CALLBACK (gtk_widget_destroy), NULL);
           
           gtk_widget_show (dialog);
 
@@ -279,23 +271,16 @@ progressive_timeout (gpointer data)
       if (lc->pixbuf_loader)
         {
           gdk_pixbuf_loader_close (lc->pixbuf_loader, NULL);
-          g_object_unref (G_OBJECT (lc->pixbuf_loader));
+          g_object_unref (lc->pixbuf_loader);
           lc->pixbuf_loader = NULL;
         }
       
       lc->pixbuf_loader = gdk_pixbuf_loader_new ();
       
-      g_signal_connect_data (G_OBJECT (lc->pixbuf_loader),
-                             "area_prepared",
-                             G_CALLBACK (progressive_prepared_callback),
-                             image,
-                             NULL, FALSE, FALSE);
-      
-      g_signal_connect_data (G_OBJECT (lc->pixbuf_loader),
-                             "area_updated",
-                             G_CALLBACK (progressive_updated_callback),
-                             image,
-                             NULL, FALSE, FALSE);
+      g_signal_connect (lc->pixbuf_loader, "area_prepared",
+                       G_CALLBACK (progressive_prepared_callback), image);
+      g_signal_connect (lc->pixbuf_loader, "area_updated",
+                       G_CALLBACK (progressive_updated_callback), image);
     }
 
   /* leave timeout installed */
@@ -316,7 +301,7 @@ start_progressive_loading (GtkWidget *image)
    * The timeout simply simulates a slow data source by inserting
    * pauses in the reading process.
    */
-  lc->load_timeout = g_timeout_add (100,
+  lc->load_timeout = gdk_threads_add_timeout (100,
                                     progressive_timeout,
                                     image);
 }
@@ -338,7 +323,7 @@ do_image (const char *filename)
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -372,6 +357,12 @@ do_image (const char *filename)
   
   start_progressive_loading (image);
 
+  g_signal_connect (window, "destroy",
+                   G_CALLBACK (gtk_main_quit), NULL);
+  
+  g_signal_connect (window, "delete_event",
+                   G_CALLBACK (gtk_main_quit), NULL);
+
   gtk_widget_show_all (window);
 
   return window;
@@ -393,7 +384,7 @@ do_nonprogressive (const gchar *filename)
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
-  vbox = gtk_vbox_new (FALSE, 8);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -420,6 +411,12 @@ do_nonprogressive (const gchar *filename)
   image = gtk_image_new_from_file (filename);
   gtk_container_add (GTK_CONTAINER (frame), image);
 
+  g_signal_connect (window, "destroy",
+                   G_CALLBACK (gtk_main_quit), NULL);
+  
+  g_signal_connect (window, "delete_event",
+                   G_CALLBACK (gtk_main_quit), NULL);
+
   gtk_widget_show_all (window);
 }
 
@@ -445,4 +442,3 @@ main (int    argc,
   return 0;
 }
 
-