From b84c1c028a168359befb14a1759443bf8a80b72c Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Sun, 14 Nov 1999 10:24:37 +0000 Subject: [PATCH] Removed QueryCapability to reflect removal in the nsIContentViewerContainer API. Changed call the nsIContentViewer::SetContainer() to cast to the right nsISupports. --- docshell/base/nsDocShell.cpp | 8 ++------ docshell/base/nsDocShell.h | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index afdb1718aac..a1965e677ef 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -186,7 +186,8 @@ nsDocShell::SetDocument(nsIDOMDocument *aDOMDoc, nsIDOMElement *aRootNode) NS_ERROR_FAILURE); // (2) Feed the docshell to the content viewer - NS_ENSURE_SUCCESS(documentViewer->SetContainer(this), NS_ERROR_FAILURE); + NS_ENSURE_SUCCESS(documentViewer->SetContainer((nsIDocShell*)this), + NS_ERROR_FAILURE); // (3) Tell the content viewer container to embed the content viewer. // (This step causes everything to be set up for an initial flow.) @@ -1541,11 +1542,6 @@ NS_IMETHODIMP nsDocShell::SizeToContent() //***************************************************************************** // nsDocShell::nsIContentViewerContainer //***************************************************************************** -NS_IMETHODIMP nsDocShell::QueryCapability(const nsIID &aIID, void** aResult) -{ - NS_ENSURE_SUCCESS(PR_FALSE, NS_ERROR_NOT_IMPLEMENTED); - return NS_OK; -}; NS_IMETHODIMP nsDocShell::Embed(nsIContentViewer* aContentViewer, const char * aCommand, diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h index 6c8e4dd9d44..7ed943a1846 100644 --- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -84,8 +84,6 @@ public: // XXX: move to a macro // nsIContentViewerContainer - NS_IMETHOD QueryCapability(const nsIID &aIID, void** aResult); - NS_IMETHOD Embed(nsIContentViewer* aDocViewer, const char* aCommand, nsISupports* aExtraInfo);