diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-25 18:29:42 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-01-25 18:29:42 +0000 |
| commit | 44deb72f19279fdb3abff11def367607fa9696f7 (patch) | |
| tree | bc06576c451ff5c78f368f981bbb418554666ae0 /libjava | |
| parent | 0c12a362b57673cd3238d63c651a8ee246c35fd2 (diff) | |
| download | ppe42-gcc-44deb72f19279fdb3abff11def367607fa9696f7.tar.gz ppe42-gcc-44deb72f19279fdb3abff11def367607fa9696f7.zip | |
2004-01-25 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkToolkit.java (checkImage): Inform
image observer of image loading status.
(getImage (String)): Start image production.
(getImage (URL)): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@76574 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/gnu/java/awt/peer/gtk/GtkToolkit.java | 20 |
2 files changed, 24 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a0b607a4f72..97392545d5a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-01-25 Thomas Fitzsimmons <fitzsim@redhat.com> + + * gnu/java/awt/peer/gtk/GtkToolkit.java (checkImage): Inform + image observer of image loading status. + (getImage (String)): Start image production. + (getImage (URL)): Likewise. + 2004-01-25 Michael Koch <konqueror@gmx.de> * java/lang/Class.java: Imports reworked, reformated. diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java index f3af5e8744b..844fa6820bd 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java @@ -115,7 +115,15 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit public int checkImage (Image image, int width, int height, ImageObserver observer) { - return ((GtkImage) image).checkImage (); + int status = ((GtkImage) image).checkImage (); + + if (observer != null) + observer.imageUpdate (image, status, + -1, -1, + image.getWidth (observer), + image.getHeight (observer)); + + return status; } public Image createImage (String filename) @@ -166,12 +174,18 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit public Image getImage (String filename) { - return new GtkImage (new GdkPixbufDecoder (filename), null); + GdkPixbufDecoder d = new GdkPixbufDecoder (filename); + GtkImage image = new GtkImage (d, null); + d.startProduction (image); + return image; } public Image getImage (URL url) { - return new GtkImage (new GdkPixbufDecoder (url), null); + GdkPixbufDecoder d = new GdkPixbufDecoder (url); + GtkImage image = new GtkImage (d, null); + d.startProduction (image); + return image; } public PrintJob getPrintJob (Frame frame, String jobtitle, Properties props) |
