summaryrefslogtreecommitdiff
path: root/libjava/java/awt/MenuBar.java
diff options
context:
space:
mode:
authorfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2004-02-03 17:10:56 +0000
committerfitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>2004-02-03 17:10:56 +0000
commit3fe1c14284ce32b79d0e66441aec6a45a77ff684 (patch)
tree69b793f3808108f9a710a0f4875efb2e7eea8892 /libjava/java/awt/MenuBar.java
parent2c584053e7a50135ab299115a5d7b909bd65355f (diff)
downloadgcc-3fe1c14284ce32b79d0e66441aec6a45a77ff684.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77178 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/awt/MenuBar.java')
-rw-r--r--libjava/java/awt/MenuBar.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/awt/MenuBar.java b/libjava/java/awt/MenuBar.java
index 9c278dfde0d..fb267290008 100644
--- a/libjava/java/awt/MenuBar.java
+++ b/libjava/java/awt/MenuBar.java
@@ -219,8 +219,7 @@ remove(MenuComponent menu)
public int
getMenuCount()
{
- // FIXME: How does the help menu fit in here?
- return(menus.size());
+ return countMenus ();
}
/*************************************************************************/
@@ -235,7 +234,8 @@ getMenuCount()
public int
countMenus()
{
- return(getMenuCount());
+ // FIXME: How does the help menu fit in here?
+ return menus.size ();
}
/*************************************************************************/