summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java
index 7caaf9ba1e..e81d7f2b5f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Menu.java
@@ -161,7 +161,6 @@ public Menu (MenuItem parentItem) {
* @see HelpListener
* @see #removeHelpListener
*/
-
public void addHelpListener (HelpListener listener) {
checkWidget ();
if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -188,7 +187,6 @@ public void addHelpListener (HelpListener listener) {
* @see MenuListener
* @see #removeMenuListener
*/
-
public void addMenuListener (MenuListener listener) {
checkWidget ();
if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
@@ -442,7 +440,9 @@ public MenuItem [] getItems () {
System.arraycopy (newItems, 0, items, 0, index);
items = newItems;
}
- items [index++] = parent.findMenuItem (commandID [0]);
+ items [index] = parent.findMenuItem (commandID [0]);
+ if (items [index] != null)
+ index++;
}
if (index == items.length) return items;
MenuItem [] result = new MenuItem [index];