AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2006-03-06 17:17:50 +00:00 committed by Matthias Clasen
parent 727b00ff13
commit a319bd94de
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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> 2006-03-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (adjust_wrap_width): Apply some * gtk/gtkiconview.c (adjust_wrap_width): Apply some

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
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> 2006-03-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconview.c (adjust_wrap_width): Apply some * gtk/gtkiconview.c (adjust_wrap_width): Apply some

3
gtk/gtkpixmap.c
View File

@ -131,6 +131,7 @@ gtk_pixmap_set (GtkPixmap *pixmap,
gint oldheight; gint oldheight;
g_return_if_fail (GTK_IS_PIXMAP (pixmap)); 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) if (pixmap->pixmap != val)
{ {
@ -275,7 +276,7 @@ build_insensitive_pixmap (GtkPixmap *gtkpixmap)
pixbuf = gdk_pixbuf_get_from_drawable (NULL, pixbuf = gdk_pixbuf_get_from_drawable (NULL,
pixmap, pixmap,
gtk_widget_get_colormap (GTK_WIDGET(gtkpixmap)), gtk_widget_get_colormap (GTK_WIDGET (gtkpixmap)),
0, 0, 0, 0,
0, 0, 0, 0,
w, h); w, h);