Bug 895274 part.8 Rename NS_XUL_CLOSE to eWindowClose r=smaug

This commit is contained in:
Masayuki Nakano 2015-08-29 08:58:26 +09:00
parent 6ed54238d7
commit 77a29cb60f
3 changed files with 4 additions and 4 deletions

View File

@ -692,7 +692,7 @@ NON_IDL_EVENT(command,
EventNameType_XUL, EventNameType_XUL,
eInputEventClass) eInputEventClass)
NON_IDL_EVENT(close, NON_IDL_EVENT(close,
NS_XUL_CLOSE, eWindowClose,
EventNameType_XUL, EventNameType_XUL,
eBasicEventClass) eBasicEventClass)
NON_IDL_EVENT(popupshowing, NON_IDL_EVENT(popupshowing,

View File

@ -17,7 +17,7 @@ NS_EVENT_MESSAGE(eAllEvents, 1)
NS_EVENT_MESSAGE(eWindowEventFirst, 100) NS_EVENT_MESSAGE(eWindowEventFirst, 100)
// Widget may be destroyed // Widget may be destroyed
NS_EVENT_MESSAGE(NS_XUL_CLOSE, eWindowEventFirst + 1) NS_EVENT_MESSAGE(eWindowClose, eWindowEventFirst + 1)
NS_EVENT_MESSAGE(NS_KEY_PRESS, eWindowEventFirst + 31) NS_EVENT_MESSAGE(NS_KEY_PRESS, eWindowEventFirst + 31)
NS_EVENT_MESSAGE(NS_KEY_UP, eWindowEventFirst + 32) NS_EVENT_MESSAGE(NS_KEY_UP, eWindowEventFirst + 32)

View File

@ -306,7 +306,7 @@ nsWebShellWindow::RequestWindowClose(nsIWidget* aWidget)
nsRefPtr<nsPresContext> presContext = presShell->GetPresContext(); nsRefPtr<nsPresContext> presContext = presShell->GetPresContext();
nsEventStatus status = nsEventStatus_eIgnore; nsEventStatus status = nsEventStatus_eIgnore;
WidgetMouseEvent event(true, NS_XUL_CLOSE, nullptr, WidgetMouseEvent event(true, eWindowClose, nullptr,
WidgetMouseEvent::eReal); WidgetMouseEvent::eReal);
if (NS_SUCCEEDED(eventTarget->DispatchDOMEvent(&event, nullptr, presContext, &status)) && if (NS_SUCCEEDED(eventTarget->DispatchDOMEvent(&event, nullptr, presContext, &status)) &&
status == nsEventStatus_eConsumeNoDefault) status == nsEventStatus_eConsumeNoDefault)
@ -717,7 +717,7 @@ bool nsWebShellWindow::ExecuteCloseHandler()
contentViewer->GetPresContext(getter_AddRefs(presContext)); contentViewer->GetPresContext(getter_AddRefs(presContext));
nsEventStatus status = nsEventStatus_eIgnore; nsEventStatus status = nsEventStatus_eIgnore;
WidgetMouseEvent event(true, NS_XUL_CLOSE, nullptr, WidgetMouseEvent event(true, eWindowClose, nullptr,
WidgetMouseEvent::eReal); WidgetMouseEvent::eReal);
nsresult rv = nsresult rv =