Changeset 137:3665cb9211b2

Timestamp:

02/13/08 08:52:31 (1 year ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

DropTarget?

Files:

• dwt/dnd/DropTarget.d (modified) (19 diffs)
• dwt/dnd/TableDropTargetEffect.d (modified) (3 diffs)
• dwt/dnd/TreeDropTargetEffect.d (modified) (4 diffs)
• dwt/internal/win32/OS.d (modified) (1 diff)
• dwt/internal/win32/WINAPI.d (modified) (1 diff)

dwt/dnd/DropTarget.d

@@ -36 +36 @@
-import dwt.dnd.DNDEvent;
-import dwt.dnd.DND;
+import dwt.dnd.TableDropTargetEffect;
+import dwt.dnd.TreeDropTargetEffect;
+
+import dwt.dwthelper.utils;
-
-/**
@@ -155 +159 @@
-    this.AddRef();
-
-.getAddress()
+
-        DND.error(DND.ERROR_CANNOT_INIT_DROP);
-.getAddress()
+
-        DND.error(DND.ERROR_CANNOT_INIT_DROP);
-
@@ -234 +238 @@
-}
-
-int
+ULONG
-    refCount++;
-    return refCount;
@@ -256 +260 @@
-}
-
-int DragEnter(int pDataObject, int grfKeyState, int pt_x, int pt_y, int
+HRESULT DragEnter(IDataObject pDataObject, DWORD grfKeyState, POINTL pt, DWORD*
-    selectedDataType = null;
-    selectedOperation = DND.DROP_NONE;
@@ -263 +267 @@
-
-    DNDEvent event = new DNDEvent();
-_x, pt_y
+
-        *pdwEffect = COM.DROPEFFECT_NONE;
-        return COM.S_FALSE;
@@ -269 +273 @@
-
-    // Remember the iDataObject because it is not passed into the DragOver callback
-new IDataObject(pDataObject)
+pDataObject
-    iDataObject.AddRef();
-
@@ -298 +302 @@
-}
-
-int
+HRESULT
-    keyOperation = -1;
-
@@ -315 +319 @@
-}
-
-int DragOver(int grfKeyState, int pt_x, int pt_y, int
+HRESULT DragOver(int grfKeyState, POINTL pt, DWORD*
-    if (iDataObject is null) return COM.S_FALSE;
-    int oldKeyOperation = keyOperation;
-
-    DNDEvent event = new DNDEvent();
-.getAddress(), grfKeyState, pt_x, pt_y
+, grfKeyState, pt
-        keyOperation = -1;
-        *pdwEffect = COM.DROPEFFECT_NONE;
@@ -361 +365 @@
-}
-
-int Drop(int pDataObject, int grfKeyState, int pt_x, int pt_y, int
+HRESULT Drop(IDataObject pDataObject, int grfKeyState, POINTL pt, DWORD*
-    DNDEvent event = new DNDEvent();
-    event.widget = this;
-    event.time = OS.GetMessageTime();
-    if (dropEffect !is null) {
-_x, pt_
+.x, pt.
-    }
-    event.detail = DND.DROP_NONE;
@@ -373 +377 @@
-
-    event = new DNDEvent();
-_x, pt_y
+
-        keyOperation = -1;
-        *pdwEffect = COM.DROPEFFECT_NONE;
@@ -494 +498 @@
-    control = null;
-
-.getAddress()
+
-
-    this.Release();
@@ -533 +537 @@
- * must be incremented before returning.  Caller is responsible for releasing ppvObject.
- */
-int QueryInterface(int riid, int
+HRESULT QueryInterface(REFIID riid, void **
-
-    if (riid is null || ppvObject is null)
-        return COM.E_INVALIDARG;
-    if (COM.IsEqualGUID(riid, &COM.IIDIUnknown) || COM.IsEqualGUID(riid, &COM.IIDIDropTarget)) {
-Unknown) iDropTarget.getAddress()
+DropTarget) iDropTarget
-        AddRef();
-        return COM.S_OK;
@@ -547 +551 @@
-}
-
-int
+ULONG
-    refCount--;
-
@@ -560 +564 @@
-void refresh() {
-    if (control is null || control.isDisposed()) return;
-int
+auto
-    RECT lpRect;
-    if (OS.GetUpdateRect(handle, &lpRect, false)) {
-        OS.ImageList_DragShowNolock(false);
-*lpRect, 0
+&lpRect, null
-        OS.ImageList_DragShowNolock(true);
-    }
@@ -609 +613 @@
-}
-
-int pDataObject, int grfKeyState, int pt_x, int pt_y, int
-0 || pdwEffect is 0
+IDataObject pDataObject, int grfKeyState, POINTL pt, DWORD*
+null || pdwEffect is null
-
-    // get allowed operations
@@ -632 +636 @@
-    // Get allowed transfer types
-    TransferData[] dataTypes = new TransferData[0];
-new IDataObject(pDataObject)
+pDataObject
-    dataObject.AddRef();
-    try {
-int
+IEnumFORMATETC
-        if (dataObject.EnumFormatEtc(COM.DATADIR_GET, address.ptr) !is COM.S_OK) {
-            return false;
-        }
-new IEnumFORMATETC(address[0])
+address[0]
-        try {
-            // Loop over enumerator and save any types that match what we are looking for
-int rgelt =
+auto rgelt = cast(FORMATETC*)
-            try {
-int[] pceltFetched = new int[1]
+uint[1] pceltFetched
-                enumFormatetc.Reset();
-
+.ptr
-                    TransferData transferData = new TransferData();
-                    transferData.formatetc = new FORMATETC();
@@ -675 +679 @@
-
-    event.widget = this;
-_
-_
+.
+.
-    event.time = OS.GetMessageTime();
-    event.feedback = DND.FEEDBACK_SELECT;
@@ -682 +686 @@
-    event.dataType = dataTypes[0];
-    if (dropEffect !is null) {
-_x, pt_
+.x, pt.
-    }
-    event.operations = operations[0];
@@ -718 +722 @@
-    ULONG Release() { return parent.Release(); }
-
-
+L
-        return parent.DragEnter(pDataObj, grfKeyState, pt, pdwEffect);
-    }
-
+L
-        return parent.DragOver(grfKeyState, pt, pdwEffect);
-    }
-    HRESULT DragLeave(){ return parent.DragLeave(); }
-
+L
-        return parent.Drop(pDataObj, grfKeyState, pt, pdwEffect);
-    }

dwt/dnd/TableDropTargetEffect.d

@@ -17 +17 @@
-import dwt.widgets.Table;
-import dwt.widgets.TableItem;
+
+import dwt.dnd.DropTargetEffect;
+import dwt.dnd.DropTargetEvent;
-
-/**
@@ -106 +109 @@
-     */
-    public void dragLeave(DropTargetEvent event) {
-
+cast
-        int handle = table.handle;
-        if (dropHighlight !is null) {
@@ -136 +139 @@
-     */
-    public void dragOver(DropTargetEvent event) {
-
+cast
-        int effect = checkEffect(event.feedback);
-        int handle = table.handle;

dwt/dnd/TreeDropTargetEffect.d

@@ -17 +17 @@
-import dwt.widgets.Tree;
-import dwt.widgets.TreeItem;
+
+import dwt.dnd.DropTargetEffect;
+import dwt.dnd.DropTargetEvent;
-
-/**
@@ -117 +120 @@
-     */
-    public void dragLeave(DropTargetEvent event) {
-
+cast
-        int handle = tree.handle;
-        if (dropIndex !is -1) {
@@ -157 +160 @@
-     */
-    public void dragOver(DropTargetEvent event) {
-
+cast
-        int effect = checkEffect(event.feedback);
-        int handle = tree.handle;
@@ -258 +261 @@
-            * use the Tree API rather than calling the OS directly.
-            */
-
+cast
-            if (item !is null) {
-                if (item !is insertItem || before !is insertBefore) {

dwt/internal/win32/OS.d

@@ -4660 +4660 @@
-alias WINAPI.ImageList_DragLeave ImageList_DragLeave;
-alias WINAPI.ImageList_DragMove ImageList_DragMove;
+alias WINAPI.ImageList_DragShowNolock ImageList_DragShowNolock;
-alias WINAPI.ImageList_EndDrag ImageList_EndDrag;
-alias WINAPI.ImageList_GetIcon ImageList_GetIcon;

dwt/internal/win32/WINAPI.d

@@ -1606 +1606 @@
-    WINBOOL ImageList_DragMove(int, int);
-//     WINBOOL ImageList_SetDragCursorImage(HIMAGELIST, int, int, int);
-// 
+
-//     HIMAGELIST ImageList_GetDragImage(POINT*, POINT*);
-//     WINBOOL ImageList_GetIconSize(HIMAGELIST, int*, int*);