Bug 895274 part.164 Rename NS_CONTENT_COMMAND_COPY to eContentCommandCopy r=smaug

This commit is contained in:
Masayuki Nakano 2015-09-11 01:59:52 +09:00
parent 639ddbf13f
commit 45c425c6fb
7 changed files with 8 additions and 8 deletions

View File

@ -2058,7 +2058,7 @@ nsDOMWindowUtils::SendContentCommandEvent(const nsAString& aType,
if (aType.EqualsLiteral("cut"))
msg = eContentCommandCut;
else if (aType.EqualsLiteral("copy"))
msg = NS_CONTENT_COMMAND_COPY;
msg = eContentCommandCopy;
else if (aType.EqualsLiteral("paste"))
msg = NS_CONTENT_COMMAND_PASTE;
else if (aType.EqualsLiteral("delete"))

View File

@ -748,7 +748,7 @@ EventStateManager::PreHandleEvent(nsPresContext* aPresContext,
aEvent->AsSelectionEvent());
break;
case eContentCommandCut:
case NS_CONTENT_COMMAND_COPY:
case eContentCommandCopy:
case NS_CONTENT_COMMAND_PASTE:
case NS_CONTENT_COMMAND_DELETE:
case NS_CONTENT_COMMAND_UNDO:
@ -5040,7 +5040,7 @@ EventStateManager::DoContentCommandEvent(WidgetContentCommandEvent* aEvent)
case eContentCommandCut:
cmd = "cmd_cut";
break;
case NS_CONTENT_COMMAND_COPY:
case eContentCommandCopy:
cmd = "cmd_copy";
break;
case NS_CONTENT_COMMAND_PASTE:

View File

@ -301,7 +301,7 @@ NS_EVENT_MESSAGE(eSetSelection, eSelectionEventFirst)
// Events of commands for the contents
NS_EVENT_MESSAGE(eContentCommandEventFirst, 3800)
NS_EVENT_MESSAGE(eContentCommandCut, eContentCommandEventFirst)
NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_COPY, eContentCommandEventFirst + 1)
NS_EVENT_MESSAGE(eContentCommandCopy, eContentCommandEventFirst + 1)
NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_PASTE, eContentCommandEventFirst + 2)
NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_DELETE, eContentCommandEventFirst + 3)
NS_EVENT_MESSAGE(NS_CONTENT_COMMAND_UNDO, eContentCommandEventFirst + 4)

View File

@ -3037,7 +3037,7 @@ nsWindow::OnKeyPressEvent(GdkEventKey *aEvent)
return DispatchCommandEvent(nsGkAtoms::Home);
case XF86XK_Copy:
case GDK_F16: // F16, F20, F18, F14 are old keysyms for Copy Cut Paste Undo
return DispatchContentCommandEvent(NS_CONTENT_COMMAND_COPY);
return DispatchContentCommandEvent(eContentCommandCopy);
case XF86XK_Cut:
case GDK_F20:
return DispatchContentCommandEvent(eContentCommandCut);

View File

@ -1202,7 +1202,7 @@ nsWindow::keyPressEvent(QKeyEvent* aEvent)
return DispatchCommandEvent(nsGkAtoms::Home);
case Qt::Key_Copy:
case Qt::Key_F16: // F16, F20, F18, F14 are old keysyms for Copy Cut Paste Undo
return DispatchContentCommandEvent(NS_CONTENT_COMMAND_COPY);
return DispatchContentCommandEvent(eContentCommandCopy);
case Qt::Key_Cut:
case Qt::Key_F20:
return DispatchContentCommandEvent(eContentCommandCut);

View File

@ -1354,7 +1354,7 @@ NativeKey::HandleAppCommandMessage() const
// Use content command for following commands:
case APPCOMMAND_COPY:
contentCommandMessage = NS_CONTENT_COMMAND_COPY;
contentCommandMessage = eContentCommandCopy;
break;
case APPCOMMAND_CUT:
contentCommandMessage = eContentCommandCut;

View File

@ -5664,7 +5664,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam,
case WM_COPY:
{
WidgetContentCommandEvent command(true, NS_CONTENT_COMMAND_COPY, this);
WidgetContentCommandEvent command(true, eContentCommandCopy, this);
DispatchWindowEvent(&command);
result = true;
}