Bug 452414 – Building of qtport drag service is broken after landing 356295. r+sr=roc

This commit is contained in:
Oleg Romashin 2008-08-28 20:55:40 +10:00
parent d89090d9ee
commit 38b0f78619

View File

@ -39,6 +39,7 @@
#include "nsDragService.h" #include "nsDragService.h"
#include "nsISupportsPrimitives.h" #include "nsISupportsPrimitives.h"
#include "nsXPIDLString.h" #include "nsXPIDLString.h"
#include "nsIDOMMouseEvent.h"
#include "qmimedata.h" #include "qmimedata.h"
#include "qwidget.h" #include "qwidget.h"
@ -208,14 +209,16 @@ nsDragService::InvokeDragSessionWithImage(
nsIDOMNode* aImage, nsIDOMNode* aImage,
PRInt32 aImageX, PRInt32 aImageX,
PRInt32 aImageY, PRInt32 aImageY,
nsIDOMMouseEvent* aDragEvent) nsIDOMDragEvent* aDragEvent,
nsIDOMDataTransfer* aDataTransfer)
{ {
nsBaseDragService::InvokeDragSessionWithImage( nsBaseDragService::InvokeDragSessionWithImage(
aDOMNode, aTransferables, aDOMNode, aTransferables,
aRegion, aActionType, aRegion, aActionType,
aImage, aImage,
aImageX, aImageY, aImageX, aImageY,
aDragEvent ); aDragEvent,
aDataTransfer);
SetupDragSession( aTransferables, aActionType); SetupDragSession( aTransferables, aActionType);
@ -238,17 +241,21 @@ nsDragService::InvokeDragSessionWithImage(
return ExecuteDrag(); return ExecuteDrag();
} }
/* void invokeDragSessionWithSelection ( nsISelection selection , nsISupportsArray transferableArray , PRUint32 actionType , nsIDOMMouseEvent dragEvent ) */
NS_IMETHODIMP NS_IMETHODIMP
nsDragService::InvokeDragSessionWithSelection(nsISelection* aSelection, nsISupportsArray* aTransferables, PRUint32 aActionType, nsIDOMMouseEvent* aDragEvent) nsDragService::InvokeDragSessionWithSelection(nsISelection* aSelection,
nsISupportsArray* aTransferableArray,
PRUint32 aActionType,
nsIDOMDragEvent* aDragEvent,
nsIDOMDataTransfer* aDataTransfer)
{ {
nsBaseDragService::InvokeDragSessionWithSelection( nsBaseDragService::InvokeDragSessionWithSelection(
aSelection, aSelection,
aTransferables, aTransferableArray,
aActionType, aActionType,
aDragEvent ); aDragEvent,
aDataTransfer);
SetupDragSession( aTransferables, aActionType); SetupDragSession( aTransferableArray, aActionType);
// Setup selection related properties // Setup selection related properties
// There is however nothing that needs to be set // There is however nothing that needs to be set