aboutsummaryrefslogtreecommitdiff
path: root/libjava/javax/swing/JMenuItem.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/javax/swing/JMenuItem.java')
-rw-r--r--libjava/javax/swing/JMenuItem.java37
1 files changed, 31 insertions, 6 deletions
diff --git a/libjava/javax/swing/JMenuItem.java b/libjava/javax/swing/JMenuItem.java
index b137271..6bf2abc 100644
--- a/libjava/javax/swing/JMenuItem.java
+++ b/libjava/javax/swing/JMenuItem.java
@@ -313,7 +313,8 @@ public class JMenuItem extends AbstractButton implements Accessible,
MenuSelectionManager manager)
{
// Fire MenuDragMouseEvents if mouse is being dragged.
- boolean dragged = (event.getModifiers() & InputEvent.BUTTON1_MASK) != 0;
+ boolean dragged
+ = (event.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0;
if (dragged)
processMenuDragMouseEvent(createMenuDragMouseEvent(event, path, manager));
@@ -335,11 +336,11 @@ public class JMenuItem extends AbstractButton implements Accessible,
setArmed(false);
break;
case MouseEvent.MOUSE_PRESSED:
- if ((event.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
- {
- model.setArmed(true);
- model.setPressed(true);
- }
+ if ((event.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0)
+ {
+ model.setArmed(true);
+ model.setPressed(true);
+ }
break;
case MouseEvent.MOUSE_RELEASED:
break;
@@ -589,6 +590,18 @@ public class JMenuItem extends AbstractButton implements Accessible,
}
/**
+ * Returns all added MenuDragMouseListener objects.
+ *
+ * @return an array of listeners
+ *
+ * @since 1.4
+ */
+ public MenuDragMouseListener[] getMenuDragMouseListeners()
+ {
+ return (MenuDragMouseListener[]) listenerList.getListeners(MenuDragMouseListener.class);
+ }
+
+ /**
* Adds an MenuKeyListener to this menu item. This listener will be
* invoked when MenuKeyEvents will be fired by this menu item.
*
@@ -610,6 +623,18 @@ public class JMenuItem extends AbstractButton implements Accessible,
}
/**
+ * Returns all added MenuKeyListener objects.
+ *
+ * @return an array of listeners
+ *
+ * @since 1.4
+ */
+ public MenuKeyListener[] getMenuKeyListeners()
+ {
+ return (MenuKeyListener[]) listenerList.getListeners(MenuKeyListener.class);
+ }
+
+ /**
* A string that describes this JMenuItem. Normally only used
* for debugging.
*