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

[~andy/gtk] / demos / testpixbuf-save.c

diff --git a/demos/testpixbuf-save.c b/demos/testpixbuf-save.c
index 1c2cfa41f28261c07ac4c3f31e3a4718e0544ca7..cf1e4f4ac2b9a70d18ca476a4c86378a859bc305 100644 (file)
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -72,7 +72,7 @@ save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
 {
         GdkPixbufLoader *loader = data;
 
-        return gdk_pixbuf_loader_write (loader, buf, count, err);
+        return gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err);
 }
 
 static GdkPixbuf *
@@ -82,10 +82,10 @@ buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
         GdkPixbuf *pixbuf;
 
         loader = gdk_pixbuf_loader_new ();
-        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
+        if (gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err) &&
             gdk_pixbuf_loader_close (loader, err)) {
                 pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
-                g_object_unref (G_OBJECT (loader));
+                g_object_unref (loader);
                 return pixbuf;
         } else {
                 return NULL;
@@ -138,7 +138,7 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                         do_compare (pixbuf,
                                     g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
                                     err);
-                        g_object_unref (G_OBJECT (loader));
+                        g_object_unref (loader);
                 }
         }
         else if (evt->keyval == 'S') {
@@ -194,7 +194,7 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                         do_compare (pixbuf,
                                     g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
                                     err);
-                        g_object_unref (G_OBJECT (loader));
+                        g_object_unref (loader);
                 }
         }
         else if (evt->keyval == 'P') {
@@ -248,7 +248,7 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
                         do_compare (pixbuf,
                                     g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
                                     err);
-                        g_object_unref (G_OBJECT (loader));
+                        g_object_unref (loader);
                 }
         }
         else if (evt->keyval == 'I') {
@@ -307,36 +307,17 @@ close_app (GtkWidget *widget, gpointer data)
         return TRUE;
 }
 
-static int
-expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
+static gboolean
+draw_cb (GtkWidget *drawing_area, cairo_t *cr, gpointer data)
 {
         GdkPixbuf *pixbuf;
          
         pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area),
                                                  "pixbuf");
-        if (gdk_pixbuf_get_has_alpha (pixbuf)) {
-                gdk_draw_rgb_32_image (drawing_area->window,
-                                       drawing_area->style->black_gc,
-                                       evt->area.x, evt->area.y,
-                                       evt->area.width,
-                                       evt->area.height,
-                                       GDK_RGB_DITHER_MAX,
-                                       gdk_pixbuf_get_pixels (pixbuf) +
-                                       (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                                       (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                                       gdk_pixbuf_get_rowstride (pixbuf));
-        } else {
-                gdk_draw_rgb_image (drawing_area->window, 
-                                    drawing_area->style->black_gc, 
-                                    evt->area.x, evt->area.y,
-                                    evt->area.width,
-                                    evt->area.height,  
-                                    GDK_RGB_DITHER_NORMAL,
-                                    gdk_pixbuf_get_pixels (pixbuf) +
-                                    (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
-                                    (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
-                                    gdk_pixbuf_get_rowstride (pixbuf));
-        }
+
+        gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+        cairo_paint (cr);
+
         return FALSE;
 }
 
@@ -354,8 +335,8 @@ configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
                 GdkPixbuf *new_pixbuf;
 
                 root = gdk_get_default_root_window ();
-                new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-                                                           0, 0, 0, 0, evt->width, evt->height);
+                new_pixbuf = gdk_pixbuf_get_from_window (root,
+                                                         0, 0, evt->width, evt->height);
                 g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", new_pixbuf,
                                         (GDestroyNotify) g_object_unref);
         }
@@ -374,11 +355,9 @@ main (int argc, char **argv)
    
         gtk_init (&argc, &argv);   
 
-        gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
         root = gdk_get_default_root_window ();
-        pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-                                               0, 0, 0, 0, 150, 160);
+        pixbuf = gdk_pixbuf_get_from_window (root,
+                                             0, 0, 150, 160);
    
         window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         g_signal_connect (window, "delete_event",
@@ -386,15 +365,15 @@ main (int argc, char **argv)
         g_signal_connect (window, "destroy",   
                          G_CALLBACK (close_app), NULL);
    
-        vbox = gtk_vbox_new (FALSE, 0);
+        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
         gtk_container_add (GTK_CONTAINER (window), vbox);  
    
         drawing_area = gtk_drawing_area_new ();
         gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
                                      gdk_pixbuf_get_width (pixbuf),
                                      gdk_pixbuf_get_height (pixbuf));
-        g_signal_connect (drawing_area, "expose_event",
-                         G_CALLBACK (expose_cb), NULL);
+        g_signal_connect (drawing_area, "draw",
+                         G_CALLBACK (draw_cb), NULL);
 
         g_signal_connect (drawing_area, "configure_event",
                          G_CALLBACK (configure_cb), NULL);