Imported Classpath 0.18.

	* sources.am, Makefile.in: Updated.
	* Makefile.am (nat_source_files): Removed natProxy.cc.
	* java/lang/reflect/natProxy.cc: Removed.
	* gnu/classpath/jdwp/VMFrame.java,
	gnu/classpath/jdwp/VMIdManager.java,
	gnu/classpath/jdwp/VMVirtualMachine.java,
	java/lang/reflect/VMProxy.java: New files.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC
	list.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/net/DefaultContentHandlerFactory.java (getContent):
	Remove ClasspathToolkit references.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/awt/xlib/XCanvasPeer.java: Add new peer methods.
	* gnu/awt/xlib/XFramePeer.java: Likewise.
	* gnu/awt/xlib/XGraphicsConfiguration.java: Likewise.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c.  Add
	classpath/native/jawt/jawt.c.
	* Makefile.in: Regenerate.
	* jawt.c: Remove file.
	* include/Makefile.am (tool_include__HEADERS): Remove jawt.h and
	jawt_md.h.  Add ../classpath/include/jawt.h and
	../classpath/include/jawt_md.h.
	* include/Makefile.in: Regenerate.
	* include/jawt.h: Regenerate.
	* include/jawt_md.h: Regenerate.


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

1 files changed, 2 insertions, 22 deletions

diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
index 16379668278..8f76ea0cc19 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java
@@ -74,7 +74,6 @@ import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
 import javax.swing.event.MouseInputAdapter;
 import javax.swing.event.MouseInputListener;
-import javax.swing.plaf.BorderUIResource;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.InternalFrameUI;
 import javax.swing.plaf.UIResource;
@@ -1150,7 +1149,6 @@ public class BasicInternalFrameUI extends InternalFrameUI
 	installKeyboardActions();
 
 	frame.setOpaque(true);
-	titlePane.setOpaque(true);
 	frame.invalidate();
       }
   }
@@ -1179,28 +1177,10 @@ public class BasicInternalFrameUI extends InternalFrameUI
    */
   protected void installDefaults()
     {
-      // This is the border of InternalFrames in the BasicLookAndFeel.
-      // Note that there exist entries for various border colors in
-      // BasicLookAndFeel's defaults, but obviously they differ
-      // from the colors that are actually used by the JDK.
       UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-      Color borderColor = defaults.getColor("InternalFrame.borderColor");
-      Border inner = BorderFactory.createLineBorder(borderColor, 1);
-      Color borderDarkShadow = defaults.getColor
-	  ("InternalFrame.borderDarkShadow");
-      Color borderHighlight = defaults.getColor
-	  ("InternalFrame.borderHighlight");
-      Color borderShadow = defaults.getColor("InternalFrame.borderShadow");
-      Color borderLight = defaults.getColor("InternalFrame.borderLight");
-      Border outer = BorderFactory.createBevelBorder(BevelBorder.RAISED,
-						     borderShadow,
-						     borderHighlight,
-						     borderDarkShadow,
-						     borderShadow);
-      Border border = new BorderUIResource.CompoundBorderUIResource(outer,
-								    inner);
+      Border border = defaults.getBorder("InternalFrame.border");
       frame.setBorder(border);
-
+      frame.setFrameIcon(defaults.getIcon("InternalFrame.icon"));
       // InternalFrames are invisible by default.
       frame.setVisible(false);
   }