diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index 84b28760d34a..9aa64a2a9405 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -2062,7 +2062,7 @@ nsDOMWindowUtils::SendContentCommandEvent(const nsAString& aType, else if (aType.EqualsLiteral("paste")) msg = eContentCommandPaste; else if (aType.EqualsLiteral("delete")) - msg = NS_CONTENT_COMMAND_DELETE; + msg = eContentCommandDelete; else if (aType.EqualsLiteral("undo")) msg = NS_CONTENT_COMMAND_UNDO; else if (aType.EqualsLiteral("redo")) diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index 8bee7d47a3fc..33ad3f69d090 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -750,7 +750,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext, case eContentCommandCut: case eContentCommandCopy: case eContentCommandPaste: - case NS_CONTENT_COMMAND_DELETE: + case eContentCommandDelete: case NS_CONTENT_COMMAND_UNDO: case NS_CONTENT_COMMAND_REDO: case eContentCommandPasteTransferable: @@ -5046,7 +5046,7 @@ EventStateManager::DoContentCommandEvent(WidgetContentCommandEvent* aEvent) case eContentCommandPaste: cmd = "cmd_paste"; break; - case NS_CONTENT_COMMAND_DELETE: + case eContentCommandDelete: cmd = "cmd_delete"; break; case NS_CONTENT_COMMAND_UNDO: diff --git a/widget/EventMessageList.h b/widget/EventMessageList.h index 72a71d11a105..2c50c8e097a2 100644 --- a/widget/EventMessageList.h +++ b/widget/EventMessageList.h @@ -303,7 +303,7 @@ NS_EVENT_MESSAGE(eContentCommandEventFirst, 3800) NS_EVENT_MESSAGE(eContentCommandCut, eContentCommandEventFirst) NS_EVENT_MESSAGE(eContentCommandCopy, eContentCommandEventFirst + 1) NS_EVENT_MESSAGE(eContentCommandPaste, eContentCommandEventFirst + 2) -NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_DELETE, eContentCommandEventFirst + 3) +NS_EVENT_MESSAGE(eContentCommandDelete, eContentCommandEventFirst + 3) NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_UNDO, eContentCommandEventFirst + 4) NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_REDO, eContentCommandEventFirst + 5) NS_EVENT_MESSAGE(eContentCommandPasteTransferable, eContentCommandEventFirst + 6) diff --git a/widget/cocoa/TextInputHandler.mm b/widget/cocoa/TextInputHandler.mm index c05029c31df5..68a9b2e997d1 100644 --- a/widget/cocoa/TextInputHandler.mm +++ b/widget/cocoa/TextInputHandler.mm @@ -2099,8 +2099,7 @@ TextInputHandler::InsertText(NSAttributedString* aAttrString, } // Delete the selected range. nsRefPtr kungFuDeathGrip(this); - WidgetContentCommandEvent deleteCommandEvent(true, - NS_CONTENT_COMMAND_DELETE, + WidgetContentCommandEvent deleteCommandEvent(true, eContentCommandDelete, mWidget); DispatchEvent(deleteCommandEvent); NS_ENSURE_TRUE_VOID(deleteCommandEvent.mSucceeded); diff --git a/widget/gtk/IMContextWrapper.cpp b/widget/gtk/IMContextWrapper.cpp index e4945538c687..23f6606f0cab 100644 --- a/widget/gtk/IMContextWrapper.cpp +++ b/widget/gtk/IMContextWrapper.cpp @@ -2080,8 +2080,7 @@ IMContextWrapper::DeleteText(GtkIMContext* aContext, } // Delete the selection - WidgetContentCommandEvent contentCommandEvent(true, - NS_CONTENT_COMMAND_DELETE, + WidgetContentCommandEvent contentCommandEvent(true, eContentCommandDelete, mLastFocusedWindow); mLastFocusedWindow->DispatchEvent(&contentCommandEvent, status); diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index cd0588c409ab..3d8eabe4bc57 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -5648,7 +5648,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, case WM_CLEAR: { - WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_DELETE, this); + WidgetContentCommandEvent command(true, eContentCommandDelete, this); DispatchWindowEvent(&command); result = true; }