diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2003-07-27 19:04:42 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-07-27 19:04:42 +0000 |
| commit | 096380816540c78e63e64f0349af2a0416be8f56 (patch) | |
| tree | fcc5d69edb5a39dceca0ff7cc2899f14dbba82ab /libjava/gnu/java/awt/natEmbeddedWindow.cc | |
| parent | b7a78333b1d28106f1c1326fb69b97452c98fc49 (diff) | |
2003-07-27 Thomas Fitzsimmons <fitzsim@redhat.com.h>
Michael Koch <konqueror@gmx.de>
* gnu/java/awt/EmbeddedWindow.java
(EmbeddedWindow): Extends Frame instead of Window.
(window_id): New member variable to store the native window handle.
(create): Removed.
(EmbeddedWindow): New constructor.
(addNotify): New method.
(getHandler): Likewise.
(setWindowPeer): New native method.
* gnu/java/awt/EmbeddedWindowSupport.java
(EmbeddedWindowSupport): Fixed documentation.
(createEmbeddedWindow): Return EmbeddedWindowPeer instead of
WindowPeer, give it an EmbeddedWindow instance instead of the raw
window data.
* gnu/java/awt/natEmbeddedWindow.cc
(create): Removed.
(setWindowPeer): New method.
* gnu/java/awt/peer/EmbeddedWindowPeer.java,
gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c:
New files
* gnu/java/awt/peer/gtk/GtkToolkit.java
(GtkToolkit): Implements EmbeddedWindowSupport.
(createEmbeddedWindow): New method.
* java/awt/Window.java
(Window): Removed.
* Makefile.am
(java_source_files): Added EmbeddedWindowPeer.java.
(gtk_awt_peer_sources): Added GtkEmbeddedWindowPeer.java.
(gtk_c_source_files): Added gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c.
* Makefile.in: Regenerated.
Co-Authored-By: Michael Koch <konqueror@gmx.de>
From-SVN: r69859
Diffstat (limited to 'libjava/gnu/java/awt/natEmbeddedWindow.cc')
| -rw-r--r-- | libjava/gnu/java/awt/natEmbeddedWindow.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libjava/gnu/java/awt/natEmbeddedWindow.cc b/libjava/gnu/java/awt/natEmbeddedWindow.cc index 0811d415482..14aa30f9295 100644 --- a/libjava/gnu/java/awt/natEmbeddedWindow.cc +++ b/libjava/gnu/java/awt/natEmbeddedWindow.cc @@ -7,10 +7,11 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for details. */ #include <gnu/java/awt/EmbeddedWindow.h> -#include <java/awt/Window.h> +#include <gnu/java/awt/peer/EmbeddedWindowPeer.h> -::java::awt::Window* -gnu::java::awt::EmbeddedWindow::create (jint window_id, jint width, jint height) +void +gnu::java::awt::EmbeddedWindow::setWindowPeer (gnu::java::awt::peer::EmbeddedWindowPeer* w) { - return new ::java::awt::Window (window_id, width, height); + if (!peer) + (::java::lang::Object*) peer = (::java::lang::Object*) w; } |