summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed <grant_gayed@ca.ibm.com>2013-06-25 12:28:06 -0400
committerGrant Gayed <grant_gayed@ca.ibm.com>2013-06-25 12:28:06 -0400
commit8c4c9f977636102945c1cc11875675a2b5dbdcd5 (patch)
treed21631a3a48b771464341075d9a9787559e9dfc6
parent76d7d429442fe73692a90b1854cf0455cb3d83fa (diff)
downloadeclipse.platform.swt-8c4c9f977636102945c1cc11875675a2b5dbdcd5.tar.gz
eclipse.platform.swt-8c4c9f977636102945c1cc11875675a2b5dbdcd5.tar.xz
eclipse.platform.swt-8c4c9f977636102945c1cc11875675a2b5dbdcd5.zip
Bug 409603 - SWTApplication.setHelpMenu() is not defined on OS X 10.5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
index 0420a43bf7..e08f51fae0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
@@ -4482,11 +4482,13 @@ void setMenuBar (Menu menu) {
* menu for languages other than english. The fix is to detect
* it ourselves.
*/
- NSMenu submenu = nsItem.submenu();
- if (submenu != null && submenu.title().getString().equals(SWT.getMessage("SWT_Help"))) {
- application.setHelpMenu(submenu);
+ if (OS.VERSION >= 0x1060) {
+ NSMenu submenu = nsItem.submenu();
+ if (submenu != null && submenu.title().getString().equals(SWT.getMessage("SWT_Help"))) {
+ application.setHelpMenu(submenu);
+ }
}
-
+
nsItem.setMenu(null);
menubar.addItem(nsItem);