Part of the backout of bug 261074 that was missed in the previous backout at 2007-06-17.
git-svn-id: svn://10.0.0.236/trunk@233292 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -4661,16 +4661,12 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
|
||||
#endif
|
||||
|
||||
case WM_SETFOCUS:
|
||||
{
|
||||
nsWindow* topWindow = GetNSWindowPtr(::GetAncestor(mWnd, GA_ROOT));
|
||||
|
||||
result = DispatchFocus(NS_GOTFOCUS, PR_TRUE);
|
||||
|
||||
if ((HWND)wParam == NULL ||
|
||||
(topWindow && topWindow->mWnd != ::GetAncestor((HWND)wParam, GA_ROOT))) {
|
||||
result = DispatchFocus(NS_ACTIVATE, PR_TRUE);
|
||||
}
|
||||
}
|
||||
result = DispatchFocus(NS_GOTFOCUS, PR_TRUE);
|
||||
if (gJustGotActivate) {
|
||||
gJustGotActivate = PR_FALSE;
|
||||
gJustGotDeactivate = PR_FALSE;
|
||||
result = DispatchFocus(NS_ACTIVATE, PR_TRUE);
|
||||
}
|
||||
|
||||
#ifdef ACCESSIBILITY
|
||||
if (nsWindow::gIsAccessibilityOn) {
|
||||
|
||||
Reference in New Issue
Block a user