From a702a89b229dc56ff2bced1cd3d74ba4b1e2e06d Mon Sep 17 00:00:00 2001 From: fitzsim Date: Mon, 5 Jan 2004 21:41:21 +0000 Subject: 2004-01-05 Thomas Fitzsimmons * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Set all insets to 0 when a Configure event is received for a GtkPlug. * gnu/java/awt/EmbeddedWindow.java (window_id): Rename handle. Make handle long, not int. (EmbeddedWindow()): New constructor. (EmbeddedWindow(int)): Rename window_id to handle. Make handle long, not int. (setHandle): New method. (getHandle): Return long, not int. * gnu/java/awt/peer/EmbeddedWindowPeer.java (embed): New method declaration. * gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c: (create(long)): Take long parameter, not int. Cast gtk_plug_new argument to GdkNativeWindow. (construct): New method. (embed): New method. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75447 138bc75d-0d04-0410-961f-82ee72b054a4 --- .../gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java') diff --git a/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java index b9cdb66f9f2..9ee41c98591 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java @@ -45,11 +45,25 @@ import gnu.java.awt.peer.EmbeddedWindowPeer; public class GtkEmbeddedWindowPeer extends GtkFramePeer implements EmbeddedWindowPeer { - native void create(int window_id); + native void create (long socket_id); void create () { - create (((EmbeddedWindow) awtComponent).getHandle()); + create (((EmbeddedWindow) awtComponent).getHandle ()); + } + + native void construct (long socket_id); + + // FIXME: embed doesn't work right now, though I believe it should. + // This means that you can't call setVisible (true) on an + // EmbeddedWindow before calling setHandle with a valid handle. The + // problem is that somewhere after the call to + // GtkEmbeddedWindow.create and before the call to + // GtkEmbeddedWindow.construct, the GtkPlug peer is being realized. + // GtkSocket silently fails to embed an already-realized GtkPlug. + public void embed (long handle) + { + construct (handle); } public GtkEmbeddedWindowPeer (EmbeddedWindow w) -- cgit v1.2.3