Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIx for bug 109081. Do not try to activate or set the focus on a disabled window. R=rods, SR=alecf, A=asa

Browse Source
This commit is contained in:
ducarroz%netscape.com 2002-03-02 21:07:32 +00:00
parent 7c3c087416
commit 7bf3bef1da
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dom/src/base/nsGlobalWindow.cpp
View File

@ -2063,6 +2063,13 @@ GlobalWindowImpl::Focus()
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin;
GetTreeOwner(getter_AddRefs(treeOwnerAsWin));
if (treeOwnerAsWin) {
PRBool isEnabled = PR_TRUE;
treeOwnerAsWin->GetEnabled(&isEnabled);
if (!isEnabled) {
NS_WARNING( "Should not try to set the focus on a disabled window" );
return NS_ERROR_FAILURE;
}
treeOwnerAsWin->SetVisibility(PR_TRUE);
nsCOMPtr<nsIEmbeddingSiteWindow> embeddingWin(do_GetInterface(treeOwnerAsWin));
if (embeddingWin)
@ -3413,8 +3420,16 @@ GlobalWindowImpl::Activate()
*/
nsCOMPtr<nsIBaseWindow> treeOwnerAsWin;
GetTreeOwner(getter_AddRefs(treeOwnerAsWin));
if (treeOwnerAsWin)
if (treeOwnerAsWin) {
PRBool isEnabled = PR_TRUE;
treeOwnerAsWin->GetEnabled(&isEnabled);
if (!isEnabled) {
NS_WARNING( "Should not try to activate a disabled window" );
return NS_ERROR_FAILURE;
}
treeOwnerAsWin->SetVisibility(PR_TRUE);
}
nsCOMPtr<nsIPresShell> presShell;
mDocShell->GetPresShell(getter_AddRefs(presShell));