PatchSet 6627
Date: 2005/06/11 20:50:23
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: awt cleanups
Members:
ChangeLog:1.4153->1.4154
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.18->1.19
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4153 kaffe/ChangeLog:1.4154
--- kaffe/ChangeLog:1.4153 Sat Jun 11 20:22:59 2005
+++ kaffe/ChangeLog Sat Jun 11 20:50:23 2005
@@ -1,6 +1,17 @@
2005-06-11 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
+
+ 2005-06-02 Sven de Marothy <[EMAIL PROTECTED]>
+
+ * gnu/java/awt/peer/gtk/GdkGraphics2D.java:
+ (drawImage): Remove reference to GtkOffScreenImage.
+ * gnu/java/awt/peer/gtk/GtkImageConsumer.java:
+ Add additional comments.
+
+2005-06-11 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
2005-06-02 Sven de Marothy <[EMAIL PROTECTED]>
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.18
kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.19
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.18
Sun May 15 09:46:12 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java Sat Jun
11 20:50:26 2005
@@ -510,21 +510,22 @@
if (img == null)
return false;
- if (img instanceof GtkOffScreenImage
- && img.getGraphics() instanceof GdkGraphics2D
- && (xform == null || xform.getType() == AffineTransform.TYPE_IDENTITY
- || xform.getType() == AffineTransform.TYPE_TRANSLATION))
- {
- // we are being asked to flush a double buffer from Gdk
- GdkGraphics2D g2 = (GdkGraphics2D) img.getGraphics();
- gdkDrawDrawable(g2, (int) xform.getTranslateX(),
- (int) xform.getTranslateY());
+ // FIXME: I'll fix this, /Sven
+// if (img instanceof GtkOffScreenImage
+// && img.getGraphics() instanceof GdkGraphics2D
+// && (xform == null || xform.getType() ==
AffineTransform.TYPE_IDENTITY
+// || xform.getType() == AffineTransform.TYPE_TRANSLATION))
+// {
+// // we are being asked to flush a double buffer from Gdk
+// GdkGraphics2D g2 = (GdkGraphics2D) img.getGraphics();
+// gdkDrawDrawable(g2, (int) xform.getTranslateX(),
+// (int) xform.getTranslateY());
- updateBufferedImage();
+// updateBufferedImage();
- return true;
- }
- else
+// return true;
+// }
+// else
{
// In this case, xform is an AffineTransform that transforms bounding
// box of the specified image from image space to user space. However
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
