Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

focus fixes for 52150 et all. r=hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@79508 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
saari%netscape.com
2000-09-19 03:16:30 +00:00
parent bac8d2755d
commit b4f2be2aec
1 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
View File

@@ -472,12 +472,46 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
break;
}
case NS_MOUSE_ACTIVATE:
case NS_MOUSE_ACTIVATE:{
break;
}
case NS_ACTIVATE: {
#ifdef DEBUG_saari
printf("nsWebShellWindow::NS_ACTIVATE\n");
#endif
// Sucky platform specific code to get around event dispatch ordering
#ifdef WIN32
void* data;
aEvent->widget->GetClientData(data);
if (!data)
break;
nsCOMPtr<nsIDOMWindowInternal> domWindow;
((nsWebShellWindow *)data)->ConvertWebShellToDOMWindow(webShell, getter_AddRefs(domWindow));
/*
nsCOMPtr<nsIWebShell> contentShell;
((nsWebShellWindow *)data)->GetContentWebShell(getter_AddRefs(contentShell));
if (contentShell) {
if (NS_SUCCEEDED(((nsWebShellWindow *)data)->
ConvertWebShellToDOMWindow(contentShell, getter_AddRefs(domWindow)))) {
if(domWindow){
nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_QueryInterface(domWindow);
if(privateDOMWindow)
privateDOMWindow->Activate();
}
}
}
else */
if (domWindow) {
nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_QueryInterface(domWindow);
if(privateDOMWindow)
privateDOMWindow->Activate();
}
#endif
break;
}
case NS_DEACTIVATE: {
@@ -491,6 +525,8 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
break;
nsCOMPtr<nsIDOMWindowInternal> domWindow;
((nsWebShellWindow *)data)->ConvertWebShellToDOMWindow(webShell, getter_AddRefs(domWindow));
/*
nsCOMPtr<nsIWebShell> contentShell;
((nsWebShellWindow *)data)->GetContentWebShell(getter_AddRefs(contentShell));
if (contentShell) {
@@ -504,12 +540,12 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
}
}
}
else if (domWindow) {
else */
if (domWindow) {
nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_QueryInterface(domWindow);
if(privateDOMWindow)
privateDOMWindow->Deactivate();
}
break;
}