PatchSet 6500
Date: 2005/05/15 13:09:00
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resyncd with gnu classpath: awt fix
2005-05-15 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-04-30 Mark Wielaard <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/GtkToolkit.java (prepareImage): Only prepare
GtkImages.
Members:
libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.15->1.16
ChangeLog:1.4025->1.4026
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.15
kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.16
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.15 Sat Feb
19 15:30:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java Sun May
15 13:09:00 2005
@@ -403,32 +403,41 @@
return systemClipboard;
}
+ /**
+ * Prepares a GtkImage. For every other kind of Image it just
+ * assumes the image is already prepared for rendering.
+ */
public boolean prepareImage (Image image, int width, int height,
ImageObserver observer)
{
- GtkImage i = (GtkImage) image;
-
- if (i.isLoaded ()) return true;
-
- class PrepareImage extends Thread
- {
- GtkImage image;
- ImageObserver observer;
-
- PrepareImage (GtkImage image, ImageObserver observer)
+ if (image instanceof GtkImage)
{
- this.image = image;
- image.setObserver (observer);
+ GtkImage i = (GtkImage) image;
+
+ if (i.isLoaded ()) return true;
+
+ class PrepareImage extends Thread
+ {
+ GtkImage image;
+ ImageObserver observer;
+
+ PrepareImage (GtkImage image, ImageObserver observer)
+ {
+ this.image = image;
+ image.setObserver (observer);
+ }
+
+ public void run ()
+ {
+ image.source.startProduction (image);
+ }
+ }
+
+ new PrepareImage (i, observer).start ();
+ return false;
}
-
- public void run ()
- {
- image.source.startProduction (image);
- }
- }
-
- new PrepareImage (i, observer).start ();
- return false;
+ else
+ return true;
}
public native void sync();
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4025 kaffe/ChangeLog:1.4026
--- kaffe/ChangeLog:1.4025 Sun May 15 13:06:43 2005
+++ kaffe/ChangeLog Sun May 15 13:08:55 2005
@@ -2,6 +2,15 @@
Resynced with GNU Classpath.
+ 2005-04-30 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * gnu/java/awt/peer/gtk/GtkToolkit.java (prepareImage): Only prepare
+ GtkImages.
+
+2005-05-15 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-04-30 Robert Schuster <[EMAIL PROTECTED]>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
