diff options
author | Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com> | 2012-09-25 13:51:34 -0400 |
---|---|---|
committer | Carolyn MacLeod <Carolyn_MacLeod@ca.ibm.com> | 2012-09-25 13:52:08 -0400 |
commit | 68e400860ef8feede1c82a2608170599975d3704 (patch) | |
tree | e22d59fb578e74ca83f10d43e0e1cee115638499 | |
parent | a01ce1fdb6ad3a12ed23e5bb7226b96dbb6c86c5 (diff) | |
download | eclipse.platform.swt-68e400860ef8feede1c82a2608170599975d3704.tar.gz eclipse.platform.swt-68e400860ef8feede1c82a2608170599975d3704.tar.xz eclipse.platform.swt-68e400860ef8feede1c82a2608170599975d3704.zip |
Bug 377107 - no 32bits vm for JDK7
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java | 4 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java | 2 |
2 files changed, 2 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 428e197c7d..c128986f69 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 @@ -1132,7 +1132,7 @@ public Widget findWidget (long /*int*/ handle) { * * @since 3.1 */ -public Widget findWidget (long /*int*/ handle, int id) { +public Widget findWidget (long /*int*/ handle, long /*int*/ id) { checkDevice (); return getWidget (handle); } @@ -1154,7 +1154,7 @@ public Widget findWidget (long /*int*/ handle, int id) { * * @since 3.3 */ -public Widget findWidget (Widget widget, int id) { +public Widget findWidget (Widget widget, long /*int*/ id) { checkDevice (); return null; } diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java index 3a55d52b1a..3afeaa2038 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java @@ -1346,7 +1346,6 @@ public Widget findWidget (long /*int*/ handle) { */ public Widget findWidget (long /*int*/ handle, long /*int*/ id) { checkDevice (); - //TODO - should ids be long Control control = getControl (handle); return control != null ? control.findItem (id) : null; } @@ -1372,7 +1371,6 @@ public Widget findWidget (long /*int*/ handle, long /*int*/ id) { */ public Widget findWidget (Widget widget, long /*int*/ id) { checkDevice (); - //TODO - should ids be long if (widget instanceof Control) { return findWidget (((Control) widget).handle, id); } |