From aebc8bbb678502936c3a5f73c6bca233f53f77f6 Mon Sep 17 00:00:00 2001
From: "locka%iol.ie" <locka%iol.ie@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 2 Feb 2001 15:49:16 +0000
Subject: [PATCH] Changed control to use nsIWebBrowserSiteWindow interface.
 b=46852, sr=blizzard@mozilla.org

git-svn-id: svn://10.0.0.236/trunk@86101 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/activex/src/control/StdAfx.h      |  1 +
 .../src/control/WebBrowserContainer.cpp       | 77 +------------------
 .../activex/src/control/WebBrowserContainer.h |  4 +-
 3 files changed, 6 insertions(+), 76 deletions(-)

diff --git a/mozilla/embedding/browser/activex/src/control/StdAfx.h b/mozilla/embedding/browser/activex/src/control/StdAfx.h
index 2ef0c615b61..7169f2f7a7f 100644
--- a/mozilla/embedding/browser/activex/src/control/StdAfx.h
+++ b/mozilla/embedding/browser/activex/src/control/StdAfx.h
@@ -62,6 +62,7 @@
 #include "nsIURL.h"
 #include "nsIBaseWindow.h"
 #include "nsIWebBrowser.h"
+#include "nsIWebBrowserSiteWindow.h"
 #include "nsIDocShell.h"
 #include "nsIDocShellTreeItem.h"
 #include "nsIDocShellTreeOwner.h"
diff --git a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp
index bef7f110475..3cd67b0ca9c 100644
--- a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp
+++ b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.cpp
@@ -57,7 +57,7 @@ NS_INTERFACE_MAP_BEGIN(CWebBrowserContainer)
 	NS_INTERFACE_MAP_ENTRY(nsIWebBrowserChrome)
 	NS_INTERFACE_MAP_ENTRY(nsIURIContentListener)
 	NS_INTERFACE_MAP_ENTRY(nsIDocShellTreeOwner)
-	NS_INTERFACE_MAP_ENTRY(nsIBaseWindow)
+	NS_INTERFACE_MAP_ENTRY(nsIWebBrowserSiteWindow)
 	NS_INTERFACE_MAP_ENTRY(nsIStreamObserver)
 	NS_INTERFACE_MAP_ENTRY(nsIDocumentLoaderObserver)
 	NS_INTERFACE_MAP_ENTRY(nsIWebProgressListener)
@@ -536,21 +536,7 @@ NS_IMETHODIMP CWebBrowserContainer::GetNewWindow(PRInt32 aChromeFlags,
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// nsIBaseWindow
-
-NS_IMETHODIMP 
-CWebBrowserContainer::InitWindow(nativeWindow parentNativeWindow, nsIWidget * parentWidget, PRInt32 x, PRInt32 y, PRInt32 cx, PRInt32 cy)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP 
-CWebBrowserContainer::Create(void)
-{
-	return NS_ERROR_FAILURE;
-}
-
+// nsIWebBrowserSiteWindow
 
 NS_IMETHODIMP 
 CWebBrowserContainer::Destroy(void)
@@ -600,58 +586,8 @@ CWebBrowserContainer::GetPositionAndSize(PRInt32 *x, PRInt32 *y, PRInt32 *cx, PR
 	return NS_ERROR_FAILURE;
 }
 
-
 NS_IMETHODIMP 
-CWebBrowserContainer::Repaint(PRBool force)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP 
-CWebBrowserContainer::GetParentWidget(nsIWidget * *aParentWidget)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP 
-CWebBrowserContainer::SetParentWidget(nsIWidget * aParentWidget)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP 
-CWebBrowserContainer::GetParentNativeWindow(nativeWindow *aParentNativeWindow)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP 
-CWebBrowserContainer::SetParentNativeWindow(nativeWindow aParentNativeWindow)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP 
-CWebBrowserContainer::GetVisibility(PRBool *aVisibility)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP 
-CWebBrowserContainer::SetVisibility(PRBool aVisibility)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
-NS_IMETHODIMP 
-CWebBrowserContainer::GetMainWidget(nsIWidget * *aMainWidget)
+CWebBrowserContainer::GetSiteWindow(void **aParentNativeWindow)
 {
 	return NS_ERROR_FAILURE;
 }
@@ -664,13 +600,6 @@ CWebBrowserContainer::SetFocus(void)
 }
 
 
-NS_IMETHODIMP 
-CWebBrowserContainer::FocusAvailable(nsIBaseWindow *aCurrentFocus, PRBool *aTookFocus)
-{
-	return NS_ERROR_FAILURE;
-}
-
-
 NS_IMETHODIMP 
 CWebBrowserContainer::GetTitle(PRUnichar * *aTitle)
 {
diff --git a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h
index b10c88e05fb..3531d4a34c7 100644
--- a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h
+++ b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h
@@ -33,7 +33,7 @@
 // interfaces into the web shell and so forth.
 
 class CWebBrowserContainer :
-		public nsIBaseWindow,
+		public nsIWebBrowserSiteWindow,
 		public nsIWebBrowserChrome,
 		public nsIWebProgressListener,
 		public nsIStreamObserver,
@@ -65,7 +65,7 @@ protected:
 
 public:
 	NS_DECL_ISUPPORTS
-	NS_DECL_NSIBASEWINDOW
+	NS_DECL_NSIWEBBROWSERSITEWINDOW
 	NS_DECL_NSIWEBBROWSERCHROME
 	NS_DECL_NSIDOCSHELLTREEOWNER
 	NS_DECL_NSIURICONTENTLISTENER