disable drag images in table and tree for custom draw (w2k)

2 files changed, 4 insertions, 0 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
index 8c9a5f8044..00699ac3d4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -145,6 +145,8 @@ public class TableDragSourceEffect extends DragSourceEffect {
 			return null;
 		}
 		Table table = (Table) control;
+		//TEMPORARY CODE
+		if (table.isListening (SWT.EraseItem) || table.isListening (SWT.PaintItem)) return null;
 		TableItem[] selection = table.getSelection();
 		if (selection.length == 0) return null;
 		int /*long*/ tableImageList = OS.SendMessage (table.handle, OS.LVM_GETIMAGELIST, OS.LVSIL_SMALL, 0);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
index 236e25b3e1..6d15887034 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -134,6 +134,8 @@ public class TreeDragSourceEffect extends DragSourceEffect {
 		}
 		
 		Tree tree = (Tree) control;
+		//TEMPORARY CODE
+		if (tree.isListening (SWT.EraseItem) || tree.isListening (SWT.PaintItem)) return null;
 		TreeItem[] selection = tree.getSelection();
 		if (selection.length == 0) return null;
 		int /*long*/ treeImageList = OS.SendMessage (tree.handle, OS.TVM_GETIMAGELIST, OS.TVSIL_NORMAL, 0);