Attachment 21955 Details for Bug 77174 – patch for Control.java

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch for Control.java

reparent_77174.patch.txt (text/plain), 1.64 KB, created by Andre Weinand

on 2005-05-30 06:47:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Weinand

Created: 2005-05-30 06:47:32 EDT

Size: 1.64 KB

patch

obsolete

>Index: Control.java
>===================================================================
>RCS file: /cvsroot/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Control.java,v
>retrieving revision 1.4
>diff -u -r1.4 Control.java
>--- Control.java	16 May 2005 17:36:43 -0000	1.4
>+++ Control.java	30 May 2005 10:42:44 -0000
>@@ -1312,7 +1312,7 @@
>  */
> public boolean isReparentable () {
> 	checkWidget();
>-	return false;
>+	return true;
> }
> 
> boolean isShowing () {
>@@ -2495,10 +2495,27 @@
>  *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
>  *	</ul>
>  */
>-public boolean setParent (Composite parent) {
>-	checkWidget();
>+public boolean setParent (Composite parent) {	
>+	checkWidget ();
>+	if (parent == null) error (SWT.ERROR_NULL_ARGUMENT);
> 	if (parent.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
>-	return false;
>+	if (this.parent == parent) return true;
>+	if (!isReparentable ()) return false;
>+	releaseChild ();
>+	Shell newShell = parent.getShell (), oldShell = getShell ();
>+	Decorations newDecorations = parent.menuShell (), oldDecorations = menuShell ();
>+	if (oldShell != newShell || oldDecorations != newDecorations) {
>+//		Menu [] menus = oldShell.findMenus (this);
>+//		fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus);
>+	}
>+	int topHandle = topHandle ();
>+//	if (OS.SetParent (topHandle, parent.handle) == 0) return false;
>+	OS.EmbedControl(topHandle, parent.topHandle ());
>+	this.parent = parent;
>+	setVisible (topHandle, true);
>+//	int flags = OS.SWP_NOSIZE | OS.SWP_NOMOVE | OS.SWP_NOACTIVATE; 
>+//	SetWindowPos (topHandle, OS.HWND_BOTTOM, 0, 0, 0, 0, flags);
>+	return true;
> }
> 
> /**

Actions: View | Diff

Attachments on bug 77174: 21955 | 57800 | 57888