diff options
| author | Mark Wielaard <mark@gcc.gnu.org> | 2003-07-25 12:50:44 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2003-07-25 12:50:44 +0000 |
| commit | ec8a1dd5a8fca1b4c134522a337e2f66e1de686b (patch) | |
| tree | 8d66ae82e4f61f694871339ba9479724ddce0bea /libjava/java/awt/MediaTracker.java | |
| parent | 0fe37f686827a4d6c12d766ecb6d2b99fb0a286b (diff) | |
| download | gcc-ec8a1dd5a8fca1b4c134522a337e2f66e1de686b.zip gcc-ec8a1dd5a8fca1b4c134522a337e2f66e1de686b.tar.gz gcc-ec8a1dd5a8fca1b4c134522a337e2f66e1de686b.tar.bz2 | |
[multiple changes]
2003-07-25 Mark Wielaard <mark@klomp.org>
* Makefile.am (awt_java_source_files): java/awt/GridBagLayoutInfo.java
added.
* Makefile.in: Likewise.
2003-07-25 Jeroen Frijters <jeroen@frijters.net>
* java/awt/Component.java
(getPreferredSize): Call preferredSize.
(preferredSize): Moved body of getPreferredSize here.
(getMinimumSize): Call minimumSize.
(minimumSize): Moved body of getMinimumSize here.
(prepareImage): Fall back on Toolkit.prepareImage if there is no peer
(checkImage(Image,ImageObserver)): Don't call getWidth/getHeight, but
pass -1
* java/awt/Container.java
(validate): Don't validate if there is no peer.
(update): Clear background before calling paint.
* java/awt/GridBagLayout.java
Completed the implementation and fixed several bugs.
* java/awt/MediaTracker.java
(MediaEntry.imageUpdate): Fixed typo. & instead of | was used to
combine flags.
* java/awt/Window.java
(Window): Don't call setVisible(false). Windows are invisible by
default and calling virtual methods from constructor causes
compatibility problems (e.g. subclasses may assume that the peer
already exists).
2003-07-25 Michael Koch <konqueror@gmx.de>
* java/awt/GridBagLayout.java:
Totally reworked and partly implemented.
* java/awt/GridBagLayoutInfo.java:
New file.
From-SVN: r69785
Diffstat (limited to 'libjava/java/awt/MediaTracker.java')
| -rw-r--r-- | libjava/java/awt/MediaTracker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/awt/MediaTracker.java b/libjava/java/awt/MediaTracker.java index a94d650..0f4e1c3 100644 --- a/libjava/java/awt/MediaTracker.java +++ b/libjava/java/awt/MediaTracker.java @@ -76,9 +76,9 @@ public class MediaTracker implements java.io.Serializable int width, int height) { if ((flags & ABORT) != 0) - status = ABORTED & COMPLETE; + status = ABORTED | COMPLETE; else if ((flags & ERROR) != 0) - status = ERRORED & COMPLETE; + status = ERRORED | COMPLETE; else if ((flags & ALLBITS) != 0) status = COMPLETE; else |