From 2ae55e5761b78b3d7aab63a29d9572f048e8fa5b Mon Sep 17 00:00:00 2001 From: "rpotts%netscape.com" Date: Thu, 1 Jul 1999 22:03:29 +0000 Subject: [PATCH] Fixed bustage due to the change in arguments to CreatePopup(...) git-svn-id: svn://10.0.0.236/trunk@37886 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webshell/embed/ActiveX/WebShellContainer.cpp | 3 ++- mozilla/webshell/embed/ActiveX/WebShellContainer.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp index 6e6ba8d6282..4530f493278 100644 --- a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp +++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp @@ -431,10 +431,11 @@ CWebShellContainer::CreatePopup(nsIDOMElement* aElement, nsIDOMElement* aPopupCo PRInt32 aXPos, PRInt32 aYPos, const nsString& aPopupType, const nsString& anAnchorAlignment, const nsString& aPopupAlignment, - nsIDOMWindow* aWindow) + nsIDOMWindow* aWindow, nsIDOMWindow** outPopup) { NG_TRACE_METHOD(CWebShellContainer::CreatePopup); HMENU hMenu = ::CreatePopupMenu(); + *outPopup = NULL; InsertMenu(hMenu, 0, MF_BYPOSITION, 1, _T("TODO")); TrackPopupMenu(hMenu, TPM_LEFTALIGN, aXPos, aYPos, NULL, NULL, NULL); return NS_OK; diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.h b/mozilla/webshell/embed/ActiveX/WebShellContainer.h index a86c74facaf..47ac8859924 100644 --- a/mozilla/webshell/embed/ActiveX/WebShellContainer.h +++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.h @@ -81,7 +81,7 @@ public: PRInt32 aXPos, PRInt32 aYPos, const nsString& aPopupType, const nsString& anAnchorAlignment, const nsString& aPopupAlignment, - nsIDOMWindow* aWindow); + nsIDOMWindow* aWindow, nsIDOMWindow** outPopup); // nsIStreamObserver NS_IMETHOD OnStartRequest(nsIURI* aURL, const char *aContentType);