summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2004-07-09 23:42:19 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2004-07-09 23:42:19 +0000
commit7f828f6f5625140dbe01c364766a845b1450b82a (patch)
treed8afaf6906e0336eb61f1ad719802aad94391c50 /libjava
parent55e017dce37c6812b561cb8ea22af376980f48aa (diff)
downloadgcc-7f828f6f5625140dbe01c364766a845b1450b82a.tar.gz
2004-07-09 Bryce McKinlay <mckinlay@redhat.com>
* javax/swing/plaf/basic/BasicMenuUI.java (mousePressed): Remove illegal protected method calls. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84421 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/javax/swing/plaf/basic/BasicMenuUI.java2
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();