diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-09-02 06:36:55 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-09-02 06:36:55 +0000 |
| commit | df841d865686120bda5c056f45f63784de7d80c8 (patch) | |
| tree | a6558f847fad2cb48be9acd8185ec5219a5abfcb /gnu/java | |
| parent | baafdaf122195eac390cc6ab4b0478b28a24f4cb (diff) | |
| download | classpath-df841d865686120bda5c056f45f63784de7d80c8.tar.gz | |
2005-09-02 Thomas Fitzsimmons <fitzsim@redhat.com>
PR awt/22979
* gnu/java/awt/peer/gtk/GtkImage.java,
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c (GtkImage()):
New constructor.
(drawPixelsScaled): Return immediately if width or height is <= 0.
(drawPixelsScaledFlipped): Likewise for srcwidth, srcheight,
dstwidth, dstheight.
* gnu/java/awt/peer/gtk/GtkToolkit.java (createImage(String)):
Create a blank image when filename is "".
* javax/swing/ImageIcon.java (ImageIcon(String)): Mention blank
icons in documentation.
(ImageIcon(String,String)): Likewise.
Diffstat (limited to 'gnu/java')
| -rw-r--r-- | gnu/java/awt/peer/gtk/GtkImage.java | 15 | ||||
| -rw-r--r-- | gnu/java/awt/peer/gtk/GtkToolkit.java | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/gnu/java/awt/peer/gtk/GtkImage.java b/gnu/java/awt/peer/gtk/GtkImage.java index a3ed97b3b..82a346304 100644 --- a/gnu/java/awt/peer/gtk/GtkImage.java +++ b/gnu/java/awt/peer/gtk/GtkImage.java @@ -195,6 +195,21 @@ public class GtkImage extends Image } /** + * Constructs a blank GtkImage. This is called when + * GtkToolkit.createImage (String) is called with an empty string + * argument (""). A blank image is loaded immediately upon + * construction and has width -1 and height -1. + */ + public GtkImage () + { + isLoaded = true; + observers = null; + offScreen = false; + props = new Hashtable(); + errorLoading = false; + } + + /** * Constructs a GtkImage by loading a given file. * * @throws IllegalArgumentException if the image could not be loaded. diff --git a/gnu/java/awt/peer/gtk/GtkToolkit.java b/gnu/java/awt/peer/gtk/GtkToolkit.java index f0df54cdb..b7eac86a7 100644 --- a/gnu/java/awt/peer/gtk/GtkToolkit.java +++ b/gnu/java/awt/peer/gtk/GtkToolkit.java @@ -255,6 +255,9 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit public Image createImage (String filename) { + if (filename.length() == 0) + return new GtkImage (); + if (useGraphics2D()) return bufferedImageOrError(GdkPixbufDecoder.createBufferedImage (filename)); else |