diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/javax/swing/plaf/basic/BasicMenuUI.java | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 76cccd281d7..cadcd31d2c9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-07-09 Bryce McKinlay <mckinlay@redhat.com> + * javax/swing/plaf/basic/BasicMenuUI.java (mousePressed): Remove + illegal protected method calls. + +2004-07-09 Bryce McKinlay <mckinlay@redhat.com> + Fix or remove some bogus test cases. * testsuite/libjava.compile/pr10459_2.java: Removed. * testsuite/libjava.compile/pr10459.java: Test using its own method, diff --git a/libjava/javax/swing/plaf/basic/BasicMenuUI.java b/libjava/javax/swing/plaf/basic/BasicMenuUI.java index 1953f480a8e..60559a4a01e 100644 --- a/libjava/javax/swing/plaf/basic/BasicMenuUI.java +++ b/libjava/javax/swing/plaf/basic/BasicMenuUI.java @@ -342,7 +342,6 @@ public class BasicMenuUI extends BasicMenuItemUI { // If menu is visible and menu button was pressed.. // then need to cancel the menu - menu.fireMenuCanceled(); manager.clearSelectedPath(); } else @@ -351,7 +350,6 @@ public class BasicMenuUI extends BasicMenuItemUI int x = 0; int y = menu.getHeight(); - menu.fireMenuSelected(); manager.setSelectedPath(getPath()); JMenuBar mb = (JMenuBar) menu.getParent(); |