From 85f451a5cc8bd55e0fa93e22f532e5a2db3ccbdf Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Thu, 19 Aug 1999 20:56:00 +0000 Subject: [PATCH] Fixed more interface changes git-svn-id: svn://10.0.0.236/trunk@43678 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webshell/embed/ActiveX/WebShellContainer.cpp | 7 ++++--- mozilla/webshell/embed/ActiveX/WebShellContainer.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp index a71cbc84965..6e30387f2bb 100644 --- a/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp +++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.cpp @@ -198,7 +198,8 @@ CWebShellContainer::Close() } -NS_IMETHODIMP ShowModally(PRBool aPrepare) +NS_IMETHODIMP +CWebShellContainer::ShowModally(PRBool aPrepare) { NG_TRACE_METHOD(CWebShellContainer::ShowModally); return NS_OK; @@ -397,7 +398,7 @@ CWebShellContainer::ProgressLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, NS_IMETHODIMP -CWebShellContainer::EndLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt32 aStatus) +CWebShellContainer::EndLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, nsresult aStatus) { USES_CONVERSION; NG_TRACE(_T("CWebShellContainer::EndLoadURL(..., \"%s\", %d)\n"), W2T(aURL), (int) aStatus); @@ -580,7 +581,7 @@ CWebShellContainer::OnStatusURLLoad(nsIDocumentLoader* loader, nsIChannel* aChan NS_IMETHODIMP -CWebShellContainer::OnEndURLLoad(nsIDocumentLoader* loader, nsIChannel* aChannel, PRInt32 aStatus) +CWebShellContainer::OnEndURLLoad(nsIDocumentLoader* loader, nsIChannel* channel, nsresult aStatus) { return NS_OK; } diff --git a/mozilla/webshell/embed/ActiveX/WebShellContainer.h b/mozilla/webshell/embed/ActiveX/WebShellContainer.h index 6bd13ad1235..90c83cd15ef 100644 --- a/mozilla/webshell/embed/ActiveX/WebShellContainer.h +++ b/mozilla/webshell/embed/ActiveX/WebShellContainer.h @@ -77,7 +77,7 @@ public: NS_IMETHOD WillLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, nsLoadType aReason); NS_IMETHOD BeginLoadURL(nsIWebShell* aShell, const PRUnichar* aURL); NS_IMETHOD ProgressLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt32 aProgress, PRInt32 aProgressMax); - NS_IMETHOD EndLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt32 aStatus); + NS_IMETHOD EndLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, nsresult aStatus); NS_IMETHOD NewWebShell(PRUint32 aChromeMask, PRBool aVisible, nsIWebShell *&aNewWebShell);