[gtk+/rendering-cleanup: 90/95] testgtk: Use Pixbufs in the shapes example

[Benjamin Otte <otte src gnome org>]

commit 149590882e5a66994425566fb8d4194688cd3e1f
Author: Benjamin Otte <otte redhat com>
Date:   Fri Aug 6 22:28:09 2010 +0200

    testgtk: Use Pixbufs in the shapes example

 tests/testgtk.c |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 68fb7b7..ff80b19 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -7256,14 +7256,11 @@ shape_create_icon (GdkScreen *screen,
 		   gint       window_type)
 {
   GtkWidget *window;
-  GtkWidget *pixmap;
+  GtkWidget *image;
   GtkWidget *fixed;
   CursorOffset* icon_pos;
-  GdkBitmap *gdk_pixmap_mask;
-  GdkPixmap *gdk_pixmap;
-  GtkStyle *style;
-
-  style = gtk_widget_get_default_style ();
+  GdkBitmap *mask;
+  GdkPixbuf *pixbuf;
 
   /*
    * GDK_WINDOW_TOPLEVEL works also, giving you a title border
@@ -7283,18 +7280,24 @@ shape_create_icon (GdkScreen *screen,
 			 GDK_BUTTON_PRESS_MASK);
 
   gtk_widget_realize (window);
-  gdk_pixmap = gdk_pixmap_create_from_xpm (window->window, &gdk_pixmap_mask, 
-					   &style->bg[GTK_STATE_NORMAL],
-					   xpm_file);
 
-  pixmap = gtk_image_new_from_pixmap (gdk_pixmap, gdk_pixmap_mask);
-  gtk_fixed_put (GTK_FIXED (fixed), pixmap, px,py);
-  gtk_widget_show (pixmap);
+  pixbuf = gdk_pixbuf_new_from_file (xpm_file, NULL);
+  g_assert (pixbuf); /* FIXME: error handling */
+
+  gdk_pixbuf_render_pixmap_and_mask_for_colormap (pixbuf,
+                                                  gtk_widget_get_colormap (window),
+                                                  NULL,
+                                                  &mask,
+                                                  128);
+                                                  
+  image = gtk_image_new_from_pixbuf (pixbuf);
+  gtk_fixed_put (GTK_FIXED (fixed), image, px,py);
+  gtk_widget_show (image);
   
-  gtk_widget_shape_combine_mask (window, gdk_pixmap_mask, px, py);
+  gtk_widget_shape_combine_mask (window, mask, px, py);
   
-  g_object_unref (gdk_pixmap_mask);
-  g_object_unref (gdk_pixmap);
+  g_object_unref (mask);
+  g_object_unref (pixbuf);
 
   g_signal_connect (window, "button_press_event",
 		    G_CALLBACK (shape_pressed), NULL);