2005-07-12 Anthony Balkissoon <abalkiss@redhat.com>

	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	(paintMenuItem): Replaced incorrect hilighting criteria.
	(paintText): Likewise.

2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ffbde06df..5a448a307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+2005-07-12  Anthony Balkissoon  <abalkiss@redhat.com>
+
+	* javax/swing/plaf/basic/BasicMenuItemUI.java:
+	(paintMenuItem): Replaced incorrect hilighting criteria.
+	(paintText): Likewise.
+
 2005-07-12 Lillian Angel <langel@redhat.com>
+
 	* examples/gnu/classpath/examples/swing/Demo.java
 	(mkTree): no need to make root visible, it is by default
 	(mkTreeWorld): no need to make root visible, it is by default	 
 
 2005-07-12 Lillian Angel <langel@redhat.com>
+
 	* javax/swing/plaf/basic/BasicTreeUI.java
 	(paintLeaf): fixed size of selection background to depend on 
 	if icon exists
diff --git a/javax/swing/plaf/basic/BasicMenuItemUI.java b/javax/swing/plaf/basic/BasicMenuItemUI.java
index d5d70779a..a5bf0822a 100644
--- a/javax/swing/plaf/basic/BasicMenuItemUI.java
+++ b/javax/swing/plaf/basic/BasicMenuItemUI.java
@@ -507,7 +507,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())
+    if (m.isSelected() || m.getModel().isArmed() && 
+        (m.getParent() instanceof MenuElement)) 
       {
 	if (m.isContentAreaFilled())
 	  {
@@ -604,7 +605,8 @@ public class BasicMenuItemUI extends MenuItemUI
 	if (menuItem.isEnabled())
           {
             // Menu item is considered to be highlighted when it is selected.
-            if (menuItem.isSelected())
+            if (menuItem.isSelected() || menuItem.getModel().isArmed() && 
+                (menuItem.getParent() instanceof MenuElement)) 
               g.setColor(selectionForeground);
             else
               g.setColor(menuItem.getForeground());