[gui] [merge] java-gui-merge for may 26

[Michael Koch]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am Donnerstag, 27. Mai 2004 11:50 schrieb Andreas Schwab:
> graydon hoare <graydon@pobox.com> writes:
> > hi,
> >
> > I've just completed the "monthly merge" from the java-gui-branch
> > to the gcc libjava trunk. the following patch contains the
> > changes:
> >
> >   
> > http://people.redhat.com/graydon/java-gui-merge-may-26-2004.patch
>
> libjava does not build any more.
>
> /tmp/cvs/gcc-20040527/Build/gcc/gcj
> -B/tmp/cvs/gcc-20040527/Build/ia64-suse-linux/libjava/
> -B/tmp/cvs/gcc-20040527/Build/gcc/ --encoding=UTF-8 -Wno-deprecated
> -C -g -classpath '' -bootclasspath
> /tmp/cvs/gcc-20040527/Build/ia64-suse-linux/libjava:../../../libjav
>a -d /tmp/cvs/gcc-20040527/Build/ia64-suse-linux/libjava
> ../../../libjava/javax/swing/JWindow.java
> ../../../libjava/javax/swing/JWindow.java: In class
> `javax.swing.JWindow': ../../../libjava/javax/swing/JWindow.java:
> In constructor `()': ../../../libjava/javax/swing/JWindow.java:83:
> error: Can't access package-private constructor
> `java.awt.Window.<init>' from `javax.swing.JWindow'. super();
>                 ^
> 1 error
> make[2]: *** [javax/swing/JWindow.class] Error 1

I have just commited the attached patch with lets libjava bootstrap 
again. Its not really tested and only to make libjava compile again.

Graydon: you should really consider to update gcj in java-gui-branch.


Michael


2004-05-27  Michael Koch  <konqueror@gmx.de>

	* javax/swing/JPopupMenu.java
	(isVisible): Do not use visible directly.
	(setVisible): Likewise.
	* javax/swing/JWindow.java
	(JWindow): call accessible constructor.
	* javax/swing/RepaintManager.java
	(paintDirtyRegions): Use public methods to obtain iterator.
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAtd70WSOgCCdjSDsRAhK3AKCRymFeUH11bsWdpPsafF/DifyHWQCfbwTj
WX4pzyDVowIzqxSsjPeUi5Y=
=A4q3
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: swing.diff
Type: text/x-diff
Size: 1807 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/java-patches/attachments/20040527/b9ef8ce5/attachment.bin>