From 68e400860ef8feede1c82a2608170599975d3704 Mon Sep 17 00:00:00 2001 From: Carolyn MacLeod Date: Tue, 25 Sep 2012 13:51:34 -0400 Subject: Bug 377107 - no 32bits vm for JDK7 --- .../Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java | 4 ++-- .../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); } -- cgit