Import GNU Classpath (classpath-0_97_2-release).

libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.

From-SVN: r137223

1 files changed, 12 insertions, 5 deletions

diff --git a/libjava/classpath/gnu/java/awt/peer/x/XEventPump.java b/libjava/classpath/gnu/java/awt/peer/x/XEventPump.java
index d376619c595..7f984353316 100644
--- a/libjava/classpath/gnu/java/awt/peer/x/XEventPump.java
+++ b/libjava/classpath/gnu/java/awt/peer/x/XEventPump.java
@@ -39,6 +39,7 @@ exception statement from your version. */
 package gnu.java.awt.peer.x;
 
 import java.awt.Graphics;
+import java.awt.Insets;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
 import java.awt.Window;
@@ -223,16 +224,21 @@ public class XEventPump
         System.err.println("resize request for window id: " + key);
 
       // Detect and report size changes.
-      if (c.width() != awtWindow.getWidth()
-          || c.height() != awtWindow.getHeight())
+      XWindowPeer xwindow = (XWindowPeer) awtWindow.getPeer();
+      Insets i = xwindow.insets();
+      if (c.width() != awtWindow.getWidth() - i.left - i.right
+          || c.height() != awtWindow.getHeight() - i.top - i.bottom)
         {
           if (XToolkit.DEBUG)
             System.err.println("Setting size on AWT window: " + c.width()
                              + ", " + c.height() + ", " + awtWindow.getWidth()
                              + ", " + awtWindow.getHeight());
-          ((XWindowPeer) awtWindow.getPeer()).callback = true;
-          awtWindow.setSize(c.width(), c.height());
-          ((XWindowPeer) awtWindow.getPeer()).callback = false;
+          xwindow.callback = true;
+          xwindow.xwindow.width = c.width();
+          xwindow.xwindow.height = c.height();
+          awtWindow.setSize(c.width() + i.left + i.right,
+                            c.height() + i.top + i.bottom);
+          xwindow.callback = false;
         }
       break;
     case Expose.CODE:
@@ -245,6 +251,7 @@ public class XEventPump
                                   exp.height());
       //System.err.println("expose paint: " + r);
       // We need to clear the background of the exposed rectangle.
+      assert awtWindow != null : "awtWindow == null for window ID: " + key;
       Graphics g = awtWindow.getGraphics();
       g.clearRect(r.x, r.y, r.width, r.height);
       g.dispose();