2006-11-13 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD-->generics from 2006/11/04-2006/11/12.

1 files changed, 4 insertions, 0 deletions

diff --git a/gnu/java/awt/peer/gtk/VolatileImageGraphics.java b/gnu/java/awt/peer/gtk/VolatileImageGraphics.java
index 3a9f9d693..62dbb45d8 100644
--- a/gnu/java/awt/peer/gtk/VolatileImageGraphics.java
+++ b/gnu/java/awt/peer/gtk/VolatileImageGraphics.java
@@ -40,6 +40,7 @@ package gnu.java.awt.peer.gtk;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;
+import java.awt.Composite;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.GraphicsConfiguration;
@@ -269,10 +270,13 @@ public class VolatileImageGraphics extends ComponentGraphics
     // This MUST call directly into the "action" method in CairoGraphics2D,
     // not one of the wrappers, to ensure that the composite isn't processed
     // more than once!
+    Composite oldComp = comp;           // so that ComponentGraphics doesn't
+    comp = null;                        // process the composite again
     boolean rv = super.drawImage(buffer2,
                            AffineTransform.getTranslateInstance(bounds.getX(),
                                                                 bounds.getY()),
                            null, null);
+    comp = oldComp;
 
     return rv;
   }