diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-07-17 08:37:22 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-07-17 08:37:22 +0000 |
| commit | 316a1df4f4108959bdc5720e45818eb53bed6347 (patch) | |
| tree | 3574e5e329368fbc3591baf62c3a75ce8a0e6cc0 /libjava/gnu/java/awt/EmbeddedWindow.java | |
| parent | 508a1c9c6d5d84df1207ff6d1e849e104b41694b (diff) | |
| download | gcc-316a1df4f4108959bdc5720e45818eb53bed6347.zip gcc-316a1df4f4108959bdc5720e45818eb53bed6347.tar.gz gcc-316a1df4f4108959bdc5720e45818eb53bed6347.tar.bz2 | |
2004-07-17 Michael Koch <konqueror@gmx.de>
* gnu/java/awt/EmbeddedWindow.java
(static): Removed.
(addNotify): Set peer via reflection.
(setWindowPeer): Removed.
* gnu/java/awt/natEmbeddedWindow.cc: Removed.
* Makefile.am (nat_source_files):
Removed gnu/java/awt/natEmbeddedWindow.cc.
* Makefile.in: Regenerated.
From-SVN: r84854
Diffstat (limited to 'libjava/gnu/java/awt/EmbeddedWindow.java')
| -rw-r--r-- | libjava/gnu/java/awt/EmbeddedWindow.java | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/libjava/gnu/java/awt/EmbeddedWindow.java b/libjava/gnu/java/awt/EmbeddedWindow.java index f938f55..5f1d71a 100644 --- a/libjava/gnu/java/awt/EmbeddedWindow.java +++ b/libjava/gnu/java/awt/EmbeddedWindow.java @@ -40,23 +40,20 @@ package gnu.java.awt; import gnu.classpath.Configuration; import gnu.java.awt.peer.EmbeddedWindowPeer; + +import java.awt.Component; import java.awt.Frame; import java.awt.Toolkit; +import java.lang.reflect.Field; /** * Represents an AWT window that can be embedded into another * application. * - * @author Michael Koch <konqueror@gmx.de> + * @author Michael Koch (konqueror@gmx.de) */ public class EmbeddedWindow extends Frame { - static - { - if (Configuration.INIT_LOAD_LIBRARY) - System.loadLibrary("javaawt"); - } - private long handle; /** @@ -93,14 +90,25 @@ public class EmbeddedWindow extends Frame throw new UnsupportedOperationException ("Embedded windows are not supported by the current peers: " + tk.getClass()); - setWindowPeer (((EmbeddedWindowSupport) tk).createEmbeddedWindow (this)); + // Circumvent the package-privateness of the AWT internal + // java.awt.Component.peer member variable. + try + { + Field peerField = Component.class.getDeclaredField("peer"); + peerField.set(this, ((EmbeddedWindowSupport) tk).createEmbeddedWindow (this)); + } + catch (IllegalAccessException e) + { + // This should never happen. + } + catch (NoSuchFieldException e) + { + // This should never happen. + } + super.addNotify(); } - // This method is only made native to circumvent the package-privateness of - // an AWT internal java.awt.Component.peer member variable. - native void setWindowPeer (EmbeddedWindowPeer peer); - /** * If the native peer for this embedded window has been created, * then setHandle will embed the window. If not, setHandle tells |