Commit a319bd94 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Check that the pixmap has the right depth. (#333363, Ed Catmur)

2006-03-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap
	has the right depth.  (#333363, Ed Catmur)
parent 727b00ff
2006-03-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap
has the right depth. (#333363, Ed Catmur)
2006-03-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (adjust_wrap_width): Apply some
......
2006-03-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpixmap.c (gtk_pixmap_set): Check that the pixmap
has the right depth. (#333363, Ed Catmur)
2006-03-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (adjust_wrap_width): Apply some
......
......@@ -131,6 +131,7 @@ gtk_pixmap_set (GtkPixmap *pixmap,
gint oldheight;
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
g_return_if_fail (gdk_colormap_get_visual (gtk_widget_get_colormap (GTK_WIDGET (pixmap)))->depth == gdk_drawable_get_depth (GDK_DRAWABLE (val)));
if (pixmap->pixmap != val)
{
......@@ -275,7 +276,7 @@ build_insensitive_pixmap (GtkPixmap *gtkpixmap)
pixbuf = gdk_pixbuf_get_from_drawable (NULL,
pixmap,
gtk_widget_get_colormap (GTK_WIDGET(gtkpixmap)),
gtk_widget_get_colormap (GTK_WIDGET (gtkpixmap)),
0, 0,
0, 0,
w, h);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment