2005-02-22 Thomas Fitzsimmons <fitzsim@redhat.com>

	PR libgcj/17952:
	* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
	(getWidth): New method.
	(getHeight): Likewise.
	(create): Remove width, height and insets parameters.  Move size
	setup ...
	(realize_cb): ... here.  New function.
	(connectSignals): Connect realize_cb.
	(request_frame_extents): Remove FIXME.  Move
	postInsetsChangedEvent lookup ...
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c (gtkInit):
	... here.  Look up GtkWindowPeer getWidth and getHeight methods.
	* jni/gtk-peer/gtkpeer.h (postInsetsChangedEventID): Declare
	jmethodID.
	(windowGetWidthID): Likewise.
	(windowGetHeightID): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95383 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 12 insertions, 15 deletions

diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java
index 353bc94aee6..eabe59140a6 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.java
@@ -63,30 +63,27 @@ public class GtkWindowPeer extends GtkContainerPeer
   native void gtkWindowSetResizable (boolean resizable);
   native void gtkWindowSetModal (boolean modal);
 
-  native void create (int type, boolean decorated,
-		      int width, int height,
-		      GtkWindowPeer parent,
-		      int[] insets);
+  int getWidth ()
+  {
+    return awtComponent.getWidth();
+  }
+
+  int getHeight ()
+  {
+    return awtComponent.getHeight();
+  }
+
+  native void create (int type, boolean decorated, GtkWindowPeer parent);
 
   void create (int type, boolean decorated)
   {
     GtkWindowPeer parent_peer = null;
     Component parent = awtComponent.getParent();
-    int[] insets = new int [] { 0, 0, 0, 0 };
 
     if (parent != null)
       parent_peer = (GtkWindowPeer) awtComponent.getParent().getPeer();
 
-    create (type, decorated,
-	    awtComponent.getWidth(),
-	    awtComponent.getHeight(),
-	    parent_peer,
-	    insets);
-
-    this.insets.top = insets [0];
-    this.insets.left = insets [1];
-    this.insets.bottom = insets [2];
-    this.insets.right = insets [3];
+    create (type, decorated, parent_peer);
   }
 
   void create ()