Fix for bug 25582. r=pinkerton

This commit is contained in:
saari%netscape.com 2000-01-29 03:58:47 +00:00
Родитель 6336aff6b5
Коммит 889fb4dea4
1 изменённых файлов: 10 добавлений и 10 удалений

Просмотреть файл

@ -201,15 +201,16 @@ void nsMacEventDispatchHandler::SetWidgetHit(nsWindow *aWidgetHit)
//-------------------------------------------------------------------------
void nsMacEventDispatchHandler::SetWidgetPointed(nsWindow *aWidgetPointed)
{
if (aWidgetPointed == mWidgetPointed)
if (aWidgetPointed == mWidgetPointed) {
return;
if (mWidgetPointed)
if (! mWidgetPointed->RemoveDeleteObserver(this))
}
if (mWidgetPointed)
if (! mWidgetPointed->RemoveDeleteObserver(this))
NS_WARNING("nsMacFocusHandler wasn't in the WidgetPointed observer list");
mWidgetPointed = aWidgetPointed;
if (mWidgetPointed)
mWidgetPointed->AddDeleteObserver(this);
}
@ -222,14 +223,13 @@ void nsMacEventDispatchHandler::NotifyDelete(void* aDeletedObject)
{
if (mActiveWidget == aDeletedObject)
mActiveWidget = nsnull;
else
if (mWidgetHit == aDeletedObject)
mWidgetHit = nsnull;
else
if (mWidgetPointed == aDeletedObject)
mWidgetPointed = nsnull;
else
NS_WARNING("NotifyDelete: unknown widget");
}