Bug 347743 related fix: make SetParent actually change the parent of the widget. r+sr=roc.
git-svn-id: svn://10.0.0.236/trunk@229856 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1636,9 +1636,20 @@ NS_METHOD nsWindow::Destroy()
|
||||
NS_IMETHODIMP nsWindow::SetParent(nsIWidget *aNewParent)
|
||||
{
|
||||
if (aNewParent) {
|
||||
nsCOMPtr<nsIWidget> kungFuDeathGrip(this);
|
||||
|
||||
nsIWidget* parent = GetParent();
|
||||
if (parent) {
|
||||
parent->RemoveChild(this);
|
||||
}
|
||||
|
||||
HWND newParent = (HWND)aNewParent->GetNativeData(NS_NATIVE_WINDOW);
|
||||
NS_ASSERTION(newParent, "Parent widget has a null native window handle");
|
||||
::SetParent(mWnd, newParent);
|
||||
if (newParent && mWnd) {
|
||||
::SetParent(mWnd, newParent);
|
||||
}
|
||||
|
||||
aNewParent->AddChild(this);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user