Add drag over image support

5 files changed, 27 insertions, 2 deletions

diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
index ade3c36898..038dd2c2eb 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.carbon.OS.properties
@@ -3959,6 +3959,12 @@ OS_SetDragDropAction=
 OS_SetDragDropAction_0=cast=(DragRef)
 OS_SetDragDropAction_1=cast=(DragActions)
 
+OS_SetDragImageWithCGImage=
+OS_SetDragImageWithCGImage_0=cast=(DragRef)
+OS_SetDragImageWithCGImage_1=cast=(CGImageRef)
+OS_SetDragImageWithCGImage_2=cast=(HIPoint *)
+OS_SetDragImageWithCGImage_3=cast=(DragImageFlags)
+
 OS_SetDragInputProc=
 OS_SetDragInputProc_0=cast=(DragRef)
 OS_SetDragInputProc_1=cast=(DragInputUPP)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
index 1f0a8ad4b8..55100cf0bb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os.c
@@ -10695,6 +10695,22 @@ JNIEXPORT jint JNICALL OS_NATIVE(SetDragDropAction)
 }
 #endif
 
+#ifndef NO_SetDragImageWithCGImage
+JNIEXPORT jint JNICALL OS_NATIVE(SetDragImageWithCGImage)
+	(JNIEnv *env, jclass that, jint arg0, jint arg1, jobject arg2, jint arg3)
+{
+	CGPoint _arg2, *lparg2=NULL;
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, SetDragImageWithCGImage_FUNC);
+	if (arg2) if ((lparg2 = getCGPointFields(env, arg2, &_arg2)) == NULL) goto fail;
+	rc = (jint)SetDragImageWithCGImage((DragRef)arg0, (CGImageRef)arg1, (HIPoint *)lparg2, (DragImageFlags)arg3);
+fail:
+	if (arg2 && lparg2) setCGPointFields(env, arg2, lparg2);
+	OS_NATIVE_EXIT(env, that, SetDragImageWithCGImage_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_SetDragInputProc
 JNIEXPORT jint JNICALL OS_NATIVE(SetDragInputProc)
 	(JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
index 57594e3de9..4ff33f4b68 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.c
@@ -14,8 +14,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 899;
-int OS_nativeFunctionCallCount[899];
+int OS_nativeFunctionCount = 900;
+int OS_nativeFunctionCallCount[900];
 char * OS_nativeFunctionNames[] = {
 	"AECountItems",
 	"AEGetNthPtr",
@@ -772,6 +772,7 @@ char * OS_nativeFunctionNames[] = {
 	"SetDataBrowserTarget",
 	"SetDragAllowableActions",
 	"SetDragDropAction",
+	"SetDragImageWithCGImage",
 	"SetDragInputProc",
 	"SetDragItemFlavorData",
 	"SetDragSendProc",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
index 979c954f07..d334c1f8c6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/library/os_stats.h
@@ -776,6 +776,7 @@ typedef enum {
 	SetDataBrowserTarget_FUNC,
 	SetDragAllowableActions_FUNC,
 	SetDragDropAction_FUNC,
+	SetDragImageWithCGImage_FUNC,
 	SetDragInputProc_FUNC,
 	SetDragItemFlavorData_FUNC,
 	SetDragSendProc_FUNC,
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
index 613a9686e8..dcdae614f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/carbon/OS.java
@@ -1609,6 +1609,7 @@ public static final native int SetDataBrowserTableViewRowHeight(int browser, sho
 public static final native int SetDataBrowserTarget(int cHandle, int rootID);
 public static final native int SetDragAllowableActions(int theDrag, int inActions, boolean isLocal);
 public static final native int SetDragDropAction(int theDrag, int inAction);
+public static final native int SetDragImageWithCGImage(int inDrag, int inCGImage, CGPoint inImageOffsetPt, int inImageFlags);
 public static final native int SetDragInputProc(int theDrag, int inputProc, int dragInputRefCon);
 public static final native int SetDragItemFlavorData (int theDrag, int theItemRef, int theType, byte[] dataPtr, int dataSize, int dataOffset);
 public static final native int SetDragSendProc(int theDrag, int sendProc, int dragSendRefCon);