corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New argument to nsIWebShellContainer::FocusAvailable method

Browse Source
This commit is contained in:
joki@netscape.com
1999-04-12 21:25:08 +00:00
parent 3e1467d574
commit a57fa8b32c
15 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docshell/base/nsWebShell.cpp
View File

@@ -229,7 +229,7 @@ public:
PRBool aVisible, PRBool aVisible,
nsIWebShell *&aNewWebShell); nsIWebShell *&aNewWebShell);
NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult);
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
// nsILinkHandler // nsILinkHandler
NS_IMETHOD OnLinkClick(nsIContent* aContent, NS_IMETHOD OnLinkClick(nsIContent* aContent,
@@ -1771,11 +1771,11 @@ nsWebShell::FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsWebShell::FocusAvailable(nsIWebShell* aFocusedWebShell) nsWebShell::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken)
{ {
//If the WebShell with focus is us, pass this up to container //If the WebShell with focus is us, pass this up to container
if (this == aFocusedWebShell && nsnull != mContainer) { if (this == aFocusedWebShell && nsnull != mContainer) {
mContainer->FocusAvailable(this); mContainer->FocusAvailable(this, aFocusTaken);
} }
nsIWebShell* shell = nsnull; nsIWebShell* shell = nsnull;
@@ -1791,7 +1791,7 @@ nsWebShell::FocusAvailable(nsIWebShell* aFocusedWebShell)
break; break;
} }
else if (nsnull != mContainer) { else if (nsnull != mContainer) {
mContainer->FocusAvailable(this); mContainer->FocusAvailable(this, aFocusTaken);
break; break;
} }
} }

2
webshell/embed/ActiveX/WebShellContainer.cpp
View File

@@ -218,7 +218,7 @@ CWebShellContainer::FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& a
} }
NS_IMETHODIMP NS_IMETHODIMP
CWebShellContainer::FocusAvailable(nsIWebShell* aFocusedWebShell) CWebShellContainer::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken)
{ {
NG_TRACE(_T("CWebShellContainer::FocusAvailable()\n")); NG_TRACE(_T("CWebShellContainer::FocusAvailable()\n"));
return NS_OK; return NS_OK;

2
webshell/embed/ActiveX/WebShellContainer.h
View File

@@ -52,7 +52,7 @@ public:
PRBool aVisible, PRBool aVisible,
nsIWebShell *&aNewWebShell); nsIWebShell *&aNewWebShell);
NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult);
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
// nsIStreamObserver // nsIStreamObserver
NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType); NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType);

2
webshell/public/nsIWebShell.h
View File

@@ -97,7 +97,7 @@ public:
* contents). The container can choose to set focus to themselves * contents). The container can choose to set focus to themselves
* or ignore the message and let the contained keep focus * or ignore the message and let the contained keep focus
*/ */
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell) = 0; NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken) = 0;
// NS_IMETHOD SetHistoryIndex(PRInt32 aIndex, PRInt32 aMaxIndex) = 0; // NS_IMETHOD SetHistoryIndex(PRInt32 aIndex, PRInt32 aMaxIndex) = 0;

8
webshell/src/nsWebShell.cpp
View File

@@ -229,7 +229,7 @@ public:
PRBool aVisible, PRBool aVisible,
nsIWebShell *&aNewWebShell); nsIWebShell *&aNewWebShell);
NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult);
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
// nsILinkHandler // nsILinkHandler
NS_IMETHOD OnLinkClick(nsIContent* aContent, NS_IMETHOD OnLinkClick(nsIContent* aContent,
@@ -1771,11 +1771,11 @@ nsWebShell::FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsWebShell::FocusAvailable(nsIWebShell* aFocusedWebShell) nsWebShell::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken)
{ {
//If the WebShell with focus is us, pass this up to container //If the WebShell with focus is us, pass this up to container
if (this == aFocusedWebShell && nsnull != mContainer) { if (this == aFocusedWebShell && nsnull != mContainer) {
mContainer->FocusAvailable(this); mContainer->FocusAvailable(this, aFocusTaken);
} }
nsIWebShell* shell = nsnull; nsIWebShell* shell = nsnull;
@@ -1791,7 +1791,7 @@ nsWebShell::FocusAvailable(nsIWebShell* aFocusedWebShell)
break; break;
} }
else if (nsnull != mContainer) { else if (nsnull != mContainer) {
mContainer->FocusAvailable(this); mContainer->FocusAvailable(this, aFocusTaken);
break; break;
} }
} }

2
webshell/tests/viewer/nsBrowserWindow.cpp
View File

@@ -1760,7 +1760,7 @@ nsBrowserWindow::FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aRes
} }
NS_IMETHODIMP NS_IMETHODIMP
nsBrowserWindow::FocusAvailable(nsIWebShell* aFocusedWebShell) nsBrowserWindow::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken)
{ {
return NS_OK; return NS_OK;
} }

2
webshell/tests/viewer/nsBrowserWindow.h
View File

@@ -107,7 +107,7 @@ public:
PRBool aVisible, PRBool aVisible,
nsIWebShell *&aNewWebShell); nsIWebShell *&aNewWebShell);
NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult);
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
// nsINetSupport // nsINetSupport
NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(void) Alert(const nsString &aText);

2
webshell/tests/viewer/nsXPBaseWindow.cpp
View File

@@ -458,7 +458,7 @@ NS_IMETHODIMP nsXPBaseWindow::FindWebShellWithName(const PRUnichar* aName, nsIWe
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP nsXPBaseWindow::FocusAvailable(nsIWebShell* aFocusedWebShell) NS_IMETHODIMP nsXPBaseWindow::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken)
{ {
return NS_OK; return NS_OK;
} }

2
webshell/tests/viewer/nsXPBaseWindow.h
View File

@@ -98,7 +98,7 @@ public:
PRBool aVisible, PRBool aVisible,
nsIWebShell *&aNewWebShell); nsIWebShell *&aNewWebShell);
NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult);
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
// nsINetSupport // nsINetSupport
NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(void) Alert(const nsString &aText);

2
xpfe/appshell/src/nsWebShellWindow.cpp
View File

@@ -708,7 +708,7 @@ NS_IMETHODIMP nsWebShellWindow::FindWebShellWithName(const PRUnichar* aName,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsWebShellWindow::FocusAvailable(nsIWebShell* aFocusedWebShell) nsWebShellWindow::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken)
{ {
return NS_OK; return NS_OK;
} }

2
xpfe/appshell/src/nsWebShellWindow.h
View File

@@ -88,7 +88,7 @@ public:
NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, NS_IMETHOD FindWebShellWithName(const PRUnichar* aName,
nsIWebShell*& aResult); nsIWebShell*& aResult);
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
// nsIWebShellWindow methods... // nsIWebShellWindow methods...

2
xpfe/xpviewer/src/nsBrowserWindow.cpp
View File

@@ -2408,7 +2408,7 @@ nsBrowserWindow::FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aRes
} }
NS_IMETHODIMP NS_IMETHODIMP
nsBrowserWindow::FocusAvailable(nsIWebShell* aFocusedWebShell) nsBrowserWindow::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken)
{ {
return NS_OK; return NS_OK;
} }

2
xpfe/xpviewer/src/nsBrowserWindow.h
View File

@@ -110,7 +110,7 @@ public:
PRBool aVisible, PRBool aVisible,
nsIWebShell *&aNewWebShell); nsIWebShell *&aNewWebShell);
NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult);
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
// nsINetSupport // nsINetSupport
NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(void) Alert(const nsString &aText);

2
xpfe/xpviewer/src/nsXPBaseWindow.cpp
View File

@@ -454,7 +454,7 @@ NS_IMETHODIMP nsXPBaseWindow::FindWebShellWithName(const PRUnichar* aName, nsIWe
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP nsXPBaseWindow::FocusAvailable(nsIWebShell* aFocusedWebShell) NS_IMETHODIMP nsXPBaseWindow::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken)
{ {
return NS_OK; return NS_OK;
} }

2
xpfe/xpviewer/src/nsXPBaseWindow.h
View File

@@ -98,7 +98,7 @@ public:
PRBool aVisible, PRBool aVisible,
nsIWebShell *&aNewWebShell); nsIWebShell *&aNewWebShell);
NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult); NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult);
NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell); NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
// nsINetSupport // nsINetSupport
NS_IMETHOD_(void) Alert(const nsString &aText); NS_IMETHOD_(void) Alert(const nsString &aText);