1. setFocus fixed for all widgets.

soheil_h_y · soheil_h_y · commit 00e87501c42c · 2006-11-22T10:40:49.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java
@@ -46,6 +46,7 @@ private OS() {
 	
 	public static boolean isOpera = false;
 	
+	
 	/**
 	 * @j2sNative
 	var os = $wt.internal.browser.OS;
@@ -778,4 +779,9 @@ public static Point getImageSize(Image image) {
 		}
 		return new Point(w, h); 
 	}
+	
+	public static void SetFocus(Element handle) {
+		handle.focus();
+	}
+	
 }
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Control.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Control.java
@@ -661,9 +661,13 @@ public boolean forceFocus () {
 	if (display.focusEvent == SWT.FocusOut) return false;
 	Decorations shell = menuShell ();
 	shell.setSavedFocus (this);
+	System.out.println("1" + isEnabled() + " " + isVisible() + " " + handle.style.visibility + " " + getVisible ()  +" "+ isActive());
 	if (!isEnabled () || !isVisible () || !isActive ()) return false;
+	System.out.println("2");
 	if (isFocusControl ()) return true;
+	System.out.println("3");
 	shell.setSavedFocus (null);
+	System.out.println("4");
 	/*
 	* This code is intentionally commented.
 	*
@@ -681,7 +685,12 @@ public boolean forceFocus () {
 //	if (OS.GetFocus () != OS.SetFocus (handle)) return false;
 //	OS.SetFocus (handle); // TODO
 	if (isDisposed ()) return false;
+	System.out.println("5");
+	OS.SetFocus(handle);
+//		return false;
+	System.out.println("6");
 	shell.setSavedFocus (this);
+	System.out.println("7");
 	return isFocusControl ();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ private OS() {`
`46`	`46`
`47`	`47`	`public static boolean isOpera = false;`
`48`	`48`
	`49`	`+`
`49`	`50`	`/**`
`50`	`51`	`* @j2sNative`
`51`	`52`	`var os = $wt.internal.browser.OS;`
`@@ -778,4 +779,9 @@ public static Point getImageSize(Image image) {`
`778`	`779`	`}`
`779`	`780`	`return new Point(w, h);`
`780`	`781`	`}`
	`782`	`+`
	`783`	`+ public static void SetFocus(Element handle) {`
	`784`	`+ handle.focus();`
	`785`	`+ }`
	`786`	`+`
`781`	`787`	`}`