diff options
author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2013-02-27 13:51:08 -0500 |
---|---|---|
committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2013-02-27 13:51:08 -0500 |
commit | a6ea095a16f72ca5deb1a7074e00ce6f47794bfb (patch) | |
tree | 066d7b9118db091ec4eb7376c0d3f014b15f1949 /bundles/org.eclipse.swt/Eclipse SWT PI | |
parent | 55bec4cf2651738824fee3f0adede6b94a473ed3 (diff) | |
download | eclipse.platform.swt-a6ea095a16f72ca5deb1a7074e00ce6f47794bfb.tar.gz eclipse.platform.swt-a6ea095a16f72ca5deb1a7074e00ce6f47794bfb.tar.xz eclipse.platform.swt-a6ea095a16f72ca5deb1a7074e00ce6f47794bfb.zip |
Bug 328010 - In cocoa, Help menu can not display Search menu item in chinese language.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI')
4 files changed, 19 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras index ec555be824..7500c9fb46 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras @@ -158,6 +158,10 @@ <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </method> + <method selector="setHelpMenu:" swt_gen="true"> + <arg swt_gen="true"></arg> + <retval swt_gen="true"></retval> + </method> <method selector="setMainMenu:" swt_gen="true"> <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> @@ -1842,6 +1846,9 @@ <arg swt_gen="true"></arg> <retval swt_gen="true"></retval> </method> + <method selector="title" swt_gen="true"> + <retval swt_gen="true"></retval> + </method> </class> <class name="NSMenuItem" swt_gen="mixed"> <method selector="action" swt_gen="true"> diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java index d273488c24..c52a6c20db 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -136,6 +136,10 @@ public void setDelegate(id anObject) { OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0); } +public void setHelpMenu(NSMenu helpMenu) { + OS.objc_msgSend(this.id, OS.sel_setHelpMenu_, helpMenu != null ? helpMenu.id : 0); +} + public void setMainMenu(NSMenu aMenu) { OS.objc_msgSend(this.id, OS.sel_setMainMenu_, aMenu != null ? aMenu.id : 0); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java index aa1301f814..56ecf4e62b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2012 IBM Corporation and others. + * Copyright (c) 2000, 2013 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -101,4 +101,9 @@ public void setTitle(NSString aString) { OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0); } +public NSString title() { + long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title); + return result != 0 ? new NSString(result) : null; +} + } diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java index 05ae8350a4..dc3560ee25 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java @@ -1911,6 +1911,7 @@ public static final long /*int*/ sel_setHasVerticalScroller_ = sel_registerName( public static final long /*int*/ sel_setHeadIndent_ = sel_registerName("setHeadIndent:"); public static final long /*int*/ sel_setHeaderCell_ = sel_registerName("setHeaderCell:"); public static final long /*int*/ sel_setHeaderView_ = sel_registerName("setHeaderView:"); +public static final long /*int*/ sel_setHelpMenu_ = sel_registerName("setHelpMenu:"); public static final long /*int*/ sel_setHidden_ = sel_registerName("setHidden:"); public static final long /*int*/ sel_setHiddenUntilMouseMoves_ = sel_registerName("setHiddenUntilMouseMoves:"); public static final long /*int*/ sel_setHidesOnDeactivate_ = sel_registerName("setHidesOnDeactivate:"); |