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.

From-SVN: r104586

1 files changed, 14 insertions, 8 deletions

diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java b/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
index a5bf0822ac5..8aa1193bcc4 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java
@@ -295,7 +295,7 @@ public class BasicMenuItemUI extends MenuItemUI
    * Returns preferred size for the given menu item.
    *
    * @param c menu item for which to get preferred size
-   * @param checkIcon chech icon displayed in the given menu item
+   * @param checkIcon check icon displayed in the given menu item
    * @param arrowIcon arrow icon displayed in the given menu item
    * @param defaultTextIconGap space between icon and text in the given menuItem
    *
@@ -355,12 +355,18 @@ public class BasicMenuItemUI extends MenuItemUI
    */
   public Dimension getPreferredSize(JComponent c)
   {
-    return getPreferredMenuItemSize(c, checkIcon, arrowIcon, defaultTextIconGap);
+    return getPreferredMenuItemSize(c, checkIcon, arrowIcon, 
+        defaultTextIconGap);
   }
 
+  /**
+   * Returns the prefix for entries in the {@link UIDefaults} table.
+   *
+   * @return "MenuItem"
+   */
   protected String getPropertyPrefix()
   {
-    return null;
+    return "MenuItem";
   }
 
   /**
@@ -507,7 +513,8 @@ public class BasicMenuItemUI extends MenuItemUI
     br.height += insets.top + insets.bottom;
 
     // Menu item is considered to be highlighted when it is selected.
-    if (m.isSelected() || m.getModel().isArmed() && 
+    // But we don't want to paint the background of JCheckBoxMenuItems
+    if ((m.isSelected() && checkIcon == null) || m.getModel().isArmed() && 
         (m.getParent() instanceof MenuElement)) 
       {
 	if (m.isContentAreaFilled())
@@ -531,8 +538,7 @@ public class BasicMenuItemUI extends MenuItemUI
 	SwingUtilities.layoutCompoundLabel(m, fm, null, checkIcon, vertAlign,
 	                                   horAlign, vertTextPos, horTextPos,
 	                                   vr, cr, tr, defaultTextIconGap);
-	checkIcon.paintIcon(m, g, cr.x, cr.y);
-
+        checkIcon.paintIcon(m, g, cr.x, cr.y);
 	// We need to calculate position of the menu text and position of
 	// user menu icon if there exists one relative to the check icon.
 	// So we need to adjust view rectangle s.t. its starting point is at
@@ -561,7 +567,6 @@ public class BasicMenuItemUI extends MenuItemUI
                                        defaultTextIconGap);
     if (i != null)
       i.paintIcon(c, g, ir.x, ir.y);
-
     paintText(g, m, tr, m.getText());
 
     // paint accelerator    
@@ -605,7 +610,8 @@ public class BasicMenuItemUI extends MenuItemUI
 	if (menuItem.isEnabled())
           {
             // Menu item is considered to be highlighted when it is selected.
-            if (menuItem.isSelected() || menuItem.getModel().isArmed() && 
+            // But not if it's a JCheckBoxMenuItem
+            if ((menuItem.isSelected() && checkIcon == null) || menuItem.getModel().isArmed() && 
                 (menuItem.getParent() instanceof MenuElement)) 
               g.setColor(selectionForeground);
             else