3 files changed, 54 insertions, 10 deletions
diff --git a/libjava/gnu/java/awt/EmbeddedWindow.java b/libjava/gnu/java/awt/EmbeddedWindow.java
index fc64e21..24bd107 100644
--- a/libjava/gnu/java/awt/EmbeddedWindow.java
+++ b/libjava/gnu/java/awt/EmbeddedWindow.java
@@ -50,18 +50,29 @@ import java.awt.Toolkit;
  */
 public class EmbeddedWindow extends Frame
 {
-  private int window_id;
+  private long handle;
   
   /**
-   * Creates an window to be embedded into another application.
+   * Creates a window to be embedded into another application.  The
+   * window will only be embedded after its setHandle method has been
+   * called.
+   */
+  public EmbeddedWindow ()
+  {
+    super();
+    this.handle = 0;
+  }
+  
+  /**
+   * Creates a window to be embedded into another application.
    *
-   * @param window_id The native handle to the screen area where the AWT window
-   * should be embedded.
+   * @param handle the native handle to the screen area where the AWT
+   * window should be embedded
    */
-  public EmbeddedWindow (int window_id)
+  public EmbeddedWindow (long handle)
   {
     super();
-    this.window_id = window_id;
+    this.handle = handle;
   }
   
   /**
@@ -84,13 +95,31 @@ public class EmbeddedWindow extends Frame
   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
+   * us where to embed ourselves when our peer is created.
+   *
+   * @param handle the native handle to the screen area where the AWT
+   * window should be embedded
+   */
+  public void setHandle(long handle)
+  {
+    if (this.handle != 0)
+      throw new RuntimeException ("EmbeddedWindow is already embedded");
+
+    this.handle = handle;
+    if (peer != null)
+      ((EmbeddedWindowPeer) peer).embed (this.handle);
+  }
+
+  /**
    * Gets the native handle of the screen area where the window will
    * be embedded.
    *
    * @return The native handle that was passed to the constructor.
    */
-  public int getHandle()
+  public long getHandle()
   {
-    return window_id;
+    return handle;
   }
 }
diff --git a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.java b/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.java
index a178768..95a56d1 100644
--- a/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.java
+++ b/libjava/gnu/java/awt/peer/EmbeddedWindowPeer.java
@@ -43,4 +43,5 @@ import java.awt.peer.FramePeer;
 
 public interface EmbeddedWindowPeer extends FramePeer
 {
+  void embed (long handle);
 }
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java
index b9cdb66..9ee41c9 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)