* gnu/java/awt/peer/gtk/GtkToolkit.java (prepareImage): Only prepare

       GtkImages.

2 files changed, 35 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index b55abca20..18ac8a9a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-30  Mark Wielaard  <mark@klomp.org>
+
+	* gnu/java/awt/peer/gtk/GtkToolkit.java (prepareImage): Only prepare
+	GtkImages.
+
 2005-04-30  Robert Schuster  <thebohemian@gmx.net>
 
 	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Fixed
diff --git a/gnu/java/awt/peer/gtk/GtkToolkit.java b/gnu/java/awt/peer/gtk/GtkToolkit.java
index 58987ee2a..3bbbe27ac 100644
--- a/gnu/java/awt/peer/gtk/GtkToolkit.java
+++ b/gnu/java/awt/peer/gtk/GtkToolkit.java
@@ -403,32 +403,41 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
     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)
-      {
-	this.image = image;
-	image.setObserver (observer);
-      }
-      
-      public void run ()
+    if (image instanceof GtkImage)
       {
-	image.source.startProduction (image);
+	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;
       }
-    }
-
-    new PrepareImage (i, observer).start ();
-    return false;
+    else
+      return true;
   }
 
   public native void sync();