summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2002-02-05 23:07:07 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-02-05 23:07:07 +0000
commitd18c9de808473d325dff8f95de1e0b776f11c052 (patch)
tree7d69b917926b42e5f664c92c59c9f2b56b3eb269
parent6370cf3b8ea3858d0fbd4784e48ce0f4a2cc8a83 (diff)
downloadgtk+-d18c9de808473d325dff8f95de1e0b776f11c052.tar.gz
offset area being gotten from pixmap by the align/padding offsets, so we
2002-02-05 Havoc Pennington <hp@redhat.com> * 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)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-06
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-26
-rw-r--r--ChangeLog.pre-2-46
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtkimage.c2
8 files changed, 43 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 07036b53e9..11dd9b493b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-05 Havoc Pennington <hp@redhat.com>
+
+ * 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 <matthiasc@poet.de>
* 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 <hp@redhat.com>
+
+ * 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 <matthiasc@poet.de>
* 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 <hp@redhat.com>
+
+ * 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 <matthiasc@poet.de>
* 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 <hp@redhat.com>
+
+ * 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 <matthiasc@poet.de>
* 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 <hp@redhat.com>
+
+ * 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 <matthiasc@poet.de>
* 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 <hp@redhat.com>
+
+ * 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 <matthiasc@poet.de>
* 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 <hp@redhat.com>
+
+ * 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 <matthiasc@poet.de>
* 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);