diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2004-02-03 17:10:56 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2004-02-03 17:10:56 +0000 |
| commit | b6d3cb37ef676c2439fdf9498e4dbe8042fb3c6a (patch) | |
| tree | 69b793f3808108f9a710a0f4875efb2e7eea8892 /libjava/java/awt/MenuItem.java | |
| parent | 5a98fa7bdb847dc92fdbeddf4dfcff51835aca48 (diff) | |
| download | gcc-b6d3cb37ef676c2439fdf9498e4dbe8042fb3c6a.zip gcc-b6d3cb37ef676c2439fdf9498e4dbe8042fb3c6a.tar.gz gcc-b6d3cb37ef676c2439fdf9498e4dbe8042fb3c6a.tar.bz2 | |
GtkListPeer.java, [...]: Fix handling of alias methods...
2004-02-03 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkListPeer.java,
java/awt/BorderLayout.java, java/awt/CardLayout.java,
java/awt/CheckboxGroup.java, java/awt/Choice.java,
java/awt/Component.java, java/awt/Container.java,
java/awt/FontMetrics.java, java/awt/GridBagLayout.java,
java/awt/LayoutManager2.java, java/awt/List.java,
java/awt/Menu.java, java/awt/MenuBar.java,
java/awt/MenuItem.java, java/awt/Polygon.java,
java/awt/Rectangle.java, java/awt/ScrollPane.java,
java/awt/Scrollbar.java, java/awt/TextArea.java,
java/awt/TextField.java,
java/awt/image/renderable/RenderContext.java,
javax/swing/JApplet.java: Fix handling of alias methods, where a
method has been deprecated in favour of a new one with the same
funtion but a different name. Put the method implementation in
the deprecated method and have the new method call the
deprecated one. Make all other code call the new method.
From-SVN: r77178
Diffstat (limited to 'libjava/java/awt/MenuItem.java')
| -rw-r--r-- | libjava/java/awt/MenuItem.java | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/libjava/java/awt/MenuItem.java b/libjava/java/awt/MenuItem.java index bea3b4f..cfdfafc 100644 --- a/libjava/java/awt/MenuItem.java +++ b/libjava/java/awt/MenuItem.java @@ -202,15 +202,7 @@ isEnabled() public synchronized void setEnabled(boolean enabled) { - if (enabled == this.enabled) - return; - - this.enabled = enabled; - if (peer != null) - { - MenuItemPeer mp = (MenuItemPeer) peer; - mp.setEnabled (enabled); - } + enable (enabled); } /*************************************************************************/ @@ -226,7 +218,10 @@ setEnabled(boolean enabled) public void enable(boolean enabled) { - setEnabled(enabled); + if (enabled) + enable (); + else + disable (); } /*************************************************************************/ @@ -239,7 +234,12 @@ enable(boolean enabled) public void enable() { - setEnabled(true); + if (enabled) + return; + + this.enabled = true; + if (peer != null) + ((MenuItemPeer) peer).setEnabled (true); } /*************************************************************************/ @@ -252,7 +252,12 @@ enable() public void disable() { - setEnabled(false); + if (!enabled) + return; + + this.enabled = false; + if (peer != null) + ((MenuItemPeer) peer).setEnabled (false); } /*************************************************************************/ |