diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2020-01-07 09:48:00 -0500 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2020-01-07 18:33:24 -0500 |
| commit | 52bda2a828364a9a2b3847a005587fa0ea952b30 (patch) | |
| tree | ecd9e09c98e8a46660f5d404553158b1c8212519 | |
| parent | 25e85f99ce64a048b8035222f0f501de546a1db5 (diff) | |
| download | UXP-52bda2a828364a9a2b3847a005587fa0ea952b30.tar UXP-52bda2a828364a9a2b3847a005587fa0ea952b30.tar.gz UXP-52bda2a828364a9a2b3847a005587fa0ea952b30.tar.lz UXP-52bda2a828364a9a2b3847a005587fa0ea952b30.tar.xz UXP-52bda2a828364a9a2b3847a005587fa0ea952b30.zip | |
Bug 1379728 part 1. Remove the double-definition of the 'close' event from EventNameList.h.
Tag #1343
| -rw-r--r-- | dom/events/EventNameList.h | 6 | ||||
| -rw-r--r-- | xpfe/appshell/nsWebShellWindow.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/dom/events/EventNameList.h b/dom/events/EventNameList.h index c299133e3..94e8a589b 100644 --- a/dom/events/EventNameList.h +++ b/dom/events/EventNameList.h @@ -174,7 +174,7 @@ EVENT(click, eMouseEventClass) EVENT(close, eClose, - EventNameType_HTML, + EventNameType_HTMLXUL, eBasicEventClass) EVENT(contextmenu, eContextMenu, @@ -777,10 +777,6 @@ NON_IDL_EVENT(command, eXULCommand, EventNameType_XUL, eInputEventClass) -NON_IDL_EVENT(close, - eWindowClose, - EventNameType_XUL, - eBasicEventClass) NON_IDL_EVENT(popupshowing, eXULPopupShowing, EventNameType_XUL, diff --git a/xpfe/appshell/nsWebShellWindow.cpp b/xpfe/appshell/nsWebShellWindow.cpp index 288d94759..f703be728 100644 --- a/xpfe/appshell/nsWebShellWindow.cpp +++ b/xpfe/appshell/nsWebShellWindow.cpp @@ -323,7 +323,7 @@ nsWebShellWindow::RequestWindowClose(nsIWidget* aWidget) RefPtr<nsPresContext> presContext = presShell->GetPresContext(); nsEventStatus status = nsEventStatus_eIgnore; - WidgetMouseEvent event(true, eWindowClose, nullptr, + WidgetMouseEvent event(true, eClose, nullptr, WidgetMouseEvent::eReal); if (NS_SUCCEEDED(eventTarget->DispatchDOMEvent(&event, nullptr, presContext, &status)) && status == nsEventStatus_eConsumeNoDefault) @@ -759,7 +759,7 @@ bool nsWebShellWindow::ExecuteCloseHandler() contentViewer->GetPresContext(getter_AddRefs(presContext)); nsEventStatus status = nsEventStatus_eIgnore; - WidgetMouseEvent event(true, eWindowClose, nullptr, + WidgetMouseEvent event(true, eClose, nullptr, WidgetMouseEvent::eReal); nsresult rv = |