зеркало из https://github.com/mozilla/gecko-dev.git
Bug 895274 part.80 Rename NS_DRAGDROP_DRAG to eDrag r=smaug
This commit is contained in:
Родитель
d2a0b19a04
Коммит
90a5ee8540
|
@ -179,7 +179,7 @@ EVENT(dblclick,
|
||||||
EventNameType_HTMLXUL,
|
EventNameType_HTMLXUL,
|
||||||
eMouseEventClass)
|
eMouseEventClass)
|
||||||
EVENT(drag,
|
EVENT(drag,
|
||||||
NS_DRAGDROP_DRAG,
|
eDrag,
|
||||||
EventNameType_HTMLXUL,
|
EventNameType_HTMLXUL,
|
||||||
eDragEventClass)
|
eDragEventClass)
|
||||||
EVENT(dragend,
|
EVENT(dragend,
|
||||||
|
|
|
@ -2195,7 +2195,7 @@ TabChild::RecvRealDragEvent(const WidgetDragEvent& aEvent,
|
||||||
if (dragService) {
|
if (dragService) {
|
||||||
// This will dispatch 'drag' event at the source if the
|
// This will dispatch 'drag' event at the source if the
|
||||||
// drag transaction started in this process.
|
// drag transaction started in this process.
|
||||||
dragService->FireDragEventAtSource(NS_DRAGDROP_DRAG);
|
dragService->FireDragEventAtSource(eDrag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -107,7 +107,7 @@ NS_EVENT_MESSAGE(NS_DRAGDROP_OVER, eDragDropEventFirst + 1)
|
||||||
NS_EVENT_MESSAGE(NS_DRAGDROP_EXIT, eDragDropEventFirst + 2)
|
NS_EVENT_MESSAGE(NS_DRAGDROP_EXIT, eDragDropEventFirst + 2)
|
||||||
NS_EVENT_MESSAGE(NS_DRAGDROP_DRAGDROP, eDragDropEventFirst + 3)
|
NS_EVENT_MESSAGE(NS_DRAGDROP_DRAGDROP, eDragDropEventFirst + 3)
|
||||||
NS_EVENT_MESSAGE(NS_DRAGDROP_GESTURE, eDragDropEventFirst + 4)
|
NS_EVENT_MESSAGE(NS_DRAGDROP_GESTURE, eDragDropEventFirst + 4)
|
||||||
NS_EVENT_MESSAGE(NS_DRAGDROP_DRAG, eDragDropEventFirst + 5)
|
NS_EVENT_MESSAGE(eDrag, eDragDropEventFirst + 5)
|
||||||
NS_EVENT_MESSAGE(eDragEnd, eDragDropEventFirst + 6)
|
NS_EVENT_MESSAGE(eDragEnd, eDragDropEventFirst + 6)
|
||||||
NS_EVENT_MESSAGE(eDragStart, eDragDropEventFirst + 7)
|
NS_EVENT_MESSAGE(eDragStart, eDragDropEventFirst + 7)
|
||||||
NS_EVENT_MESSAGE(eDrop, eDragDropEventFirst + 8)
|
NS_EVENT_MESSAGE(eDrop, eDragDropEventFirst + 8)
|
||||||
|
|
|
@ -104,7 +104,7 @@ WidgetEvent::HasDragEventMessage() const
|
||||||
case NS_DRAGDROP_EXIT:
|
case NS_DRAGDROP_EXIT:
|
||||||
case NS_DRAGDROP_DRAGDROP:
|
case NS_DRAGDROP_DRAGDROP:
|
||||||
case NS_DRAGDROP_GESTURE:
|
case NS_DRAGDROP_GESTURE:
|
||||||
case NS_DRAGDROP_DRAG:
|
case eDrag:
|
||||||
case eDragEnd:
|
case eDragEnd:
|
||||||
case eDragStart:
|
case eDragStart:
|
||||||
case eDrop:
|
case eDrop:
|
||||||
|
|
|
@ -5744,7 +5744,7 @@ PanGestureTypeForEvent(NSEvent* aEvent)
|
||||||
if (aMessage == NS_DRAGDROP_OVER) {
|
if (aMessage == NS_DRAGDROP_OVER) {
|
||||||
// fire the drag event at the source. Just ignore whether it was
|
// fire the drag event at the source. Just ignore whether it was
|
||||||
// cancelled or not as there isn't actually a means to stop the drag
|
// cancelled or not as there isn't actually a means to stop the drag
|
||||||
mDragService->FireDragEventAtSource(NS_DRAGDROP_DRAG);
|
mDragService->FireDragEventAtSource(eDrag);
|
||||||
dragSession->SetCanDrop(false);
|
dragSession->SetCanDrop(false);
|
||||||
} else if (aMessage == eDrop) {
|
} else if (aMessage == eDrop) {
|
||||||
// We make the assumption that the dragOver handlers have correctly set
|
// We make the assumption that the dragOver handlers have correctly set
|
||||||
|
|
|
@ -2036,7 +2036,7 @@ nsDragService::DispatchMotionEvents()
|
||||||
{
|
{
|
||||||
mCanDrop = false;
|
mCanDrop = false;
|
||||||
|
|
||||||
FireDragEventAtSource(NS_DRAGDROP_DRAG);
|
FireDragEventAtSource(eDrag);
|
||||||
|
|
||||||
mTargetWindow->
|
mTargetWindow->
|
||||||
DispatchDragEvent(NS_DRAGDROP_OVER, mTargetWindowPoint, mTargetTime);
|
DispatchDragEvent(NS_DRAGDROP_OVER, mTargetWindowPoint, mTargetTime);
|
||||||
|
|
|
@ -340,7 +340,7 @@ nsNativeDragTarget::DragOver(DWORD grfKeyState,
|
||||||
GetDropTargetHelper()->DragOver(&pt, *pdwEffect);
|
GetDropTargetHelper()->DragOver(&pt, *pdwEffect);
|
||||||
}
|
}
|
||||||
|
|
||||||
mDragService->FireDragEventAtSource(NS_DRAGDROP_DRAG);
|
mDragService->FireDragEventAtSource(eDrag);
|
||||||
// Now process the native drag state and then dispatch the event
|
// Now process the native drag state and then dispatch the event
|
||||||
ProcessDrag(NS_DRAGDROP_OVER, grfKeyState, ptl, pdwEffect);
|
ProcessDrag(NS_DRAGDROP_OVER, grfKeyState, ptl, pdwEffect);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче