From 8c4c9f977636102945c1cc11875675a2b5dbdcd5 Mon Sep 17 00:00:00 2001 From: Grant Gayed Date: Tue, 25 Jun 2013 12:28:06 -0400 Subject: Bug 409603 - SWTApplication.setHelpMenu() is not defined on OS X 10.5 --- .../Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java | 10 ++++++---- 1 file 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); -- cgit