From f2195d5ee2b5ef45e16daa982bf59faa1eabdc4b Mon Sep 17 00:00:00 2001
From: "kmcclusk%netscape.com"
 <kmcclusk%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 13 Sep 1999 20:33:34 +0000
Subject: [PATCH] Use HWND_TOPMOST instead of HWNT_TOP when setting the window
 z-order for popups.

git-svn-id: svn://10.0.0.236/trunk@47159 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/src/windows/nsWindow.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
index 6e6916ca030..bd49a498ade 100644
--- a/mozilla/widget/src/windows/nsWindow.cpp
+++ b/mozilla/widget/src/windows/nsWindow.cpp
@@ -702,10 +702,16 @@ NS_METHOD nsWindow::Show(PRBool bState)
     if (mWnd) {
         if (bState) {
           DWORD flags = SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW;
+          if ((mIsVisible) || (mWindowType == eWindowType_popup)) {
+             flags |= SWP_NOZORDER;
+          }
+
           if (mWindowType == eWindowType_popup) {
             flags |= SWP_NOACTIVATE;
-          }
+            ::SetWindowPos(mWnd, HWND_TOPMOST, 0, 0, 0, 0, flags);
+          } else {
             ::SetWindowPos(mWnd, HWND_TOP, 0, 0, 0, 0, flags);
+          }
         }
         else
             ::ShowWindow(mWnd, SW_HIDE);