From a731848c71b7ab428ea5fafd56111c41cd0fe2bd Mon Sep 17 00:00:00 2001
From: "danm%netscape.com" <danm%netscape.com>
Date: Wed, 10 Apr 2002 04:31:23 +0000
Subject: [PATCH] reverting rev 3.409. this re-opens bug 120155 but fixes bug
 134317 and bug 135528. snif.

---
 widget/src/windows/nsWindow.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 75b7e814375e..6b3561e254d9 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/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) {