diff --git a/ChangeLog b/ChangeLog index 07036b53e9..11dd9b493b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-02-05 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_expose): offset area being gotten from + pixmap by the align/padding offsets, so we don't get warnings + in gdk_pixbuf_get_from_drawable (and so it works, of course) + 2002-02-05 Matthias Clasen * gtk/gtkrc.c (gtk_rc_parse_file): Remove a (now) misleading comment. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 07036b53e9..11dd9b493b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2002-02-05 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_expose): offset area being gotten from + pixmap by the align/padding offsets, so we don't get warnings + in gdk_pixbuf_get_from_drawable (and so it works, of course) + 2002-02-05 Matthias Clasen * gtk/gtkrc.c (gtk_rc_parse_file): Remove a (now) misleading comment. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 07036b53e9..11dd9b493b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-02-05 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_expose): offset area being gotten from + pixmap by the align/padding offsets, so we don't get warnings + in gdk_pixbuf_get_from_drawable (and so it works, of course) + 2002-02-05 Matthias Clasen * gtk/gtkrc.c (gtk_rc_parse_file): Remove a (now) misleading comment. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 07036b53e9..11dd9b493b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-02-05 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_expose): offset area being gotten from + pixmap by the align/padding offsets, so we don't get warnings + in gdk_pixbuf_get_from_drawable (and so it works, of course) + 2002-02-05 Matthias Clasen * gtk/gtkrc.c (gtk_rc_parse_file): Remove a (now) misleading comment. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 07036b53e9..11dd9b493b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-02-05 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_expose): offset area being gotten from + pixmap by the align/padding offsets, so we don't get warnings + in gdk_pixbuf_get_from_drawable (and so it works, of course) + 2002-02-05 Matthias Clasen * gtk/gtkrc.c (gtk_rc_parse_file): Remove a (now) misleading comment. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 07036b53e9..11dd9b493b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-02-05 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_expose): offset area being gotten from + pixmap by the align/padding offsets, so we don't get warnings + in gdk_pixbuf_get_from_drawable (and so it works, of course) + 2002-02-05 Matthias Clasen * gtk/gtkrc.c (gtk_rc_parse_file): Remove a (now) misleading comment. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 07036b53e9..11dd9b493b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-02-05 Havoc Pennington + + * gtk/gtkimage.c (gtk_image_expose): offset area being gotten from + pixmap by the align/padding offsets, so we don't get warnings + in gdk_pixbuf_get_from_drawable (and so it works, of course) + 2002-02-05 Matthias Clasen * gtk/gtkrc.c (gtk_rc_parse_file): Remove a (now) misleading comment. diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 20391f0a01..4b2517e4b1 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -1252,7 +1252,7 @@ gtk_image_expose (GtkWidget *widget, pixbuf = gdk_pixbuf_get_from_drawable (NULL, image->data.pixmap.pixmap, gtk_widget_get_colormap (widget), - image_bound.x, image_bound.y, + image_bound.x - x, image_bound.y - y, 0, 0, image_bound.width, image_bound.height);