From 1f4d9e7342d5ea8fce7ad3b2ba485d81219b5746 Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Wed, 10 Apr 2002 04:36:20 +0000 Subject: [PATCH] reverting rev 3.409. this re-opens bug 120155 but fixes bug 134317 and bug 135528. snif. git-svn-id: svn://10.0.0.236/trunk@118587 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/windows/nsWindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp index 75b7e814375..6b3561e254d 100644 --- a/mozilla/widget/src/windows/nsWindow.cpp +++ b/mozilla/widget/src/windows/nsWindow.cpp @@ -1179,8 +1179,7 @@ nsresult nsWindow::StandardWindowCreate(nsIWidget *aParent, { nsIWidget *baseParent = aInitData && (aInitData->mWindowType == eWindowType_dialog || - aInitData->mWindowType == eWindowType_toplevel || - aInitData->mWindowType == eWindowType_popup) ? + aInitData->mWindowType == eWindowType_toplevel) ? nsnull : aParent; mIsTopWidgetWindow = (nsnull == baseParent); @@ -1235,6 +1234,8 @@ nsresult nsWindow::StandardWindowCreate(nsIWidget *aParent, if (mWindowType == eWindowType_popup) { mBorderlessParent = parent; + // Don't set the parent of a popup window. + parent = NULL; } else if (nsnull != aInitData) { // See if the caller wants to explictly set clip children and clip siblings if (aInitData->clipChildren) {