build 122v122

6 files changed, 23 insertions, 5 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TreeDragUnderEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TreeDragUnderEffect.java
index 910eb5bcc2..85ea33c175 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TreeDragUnderEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TreeDragUnderEffect.java
@@ -36,16 +36,34 @@ void show(int effect, int x, int y) {
 private TreeItem findItem(int x , int y){

 	Point coordinates = new Point(x, y);

 	coordinates = tree.toControl(coordinates);

+	Rectangle area = tree.getClientArea();

+	if (!area.contains(coordinates)) return null;

+	

 	TreeItem item = tree.getItem(coordinates);

 	if (item != null) return item;

 

-	Rectangle area = tree.getClientArea();

 	for (int x1 = area.x; x1 < area.x + area.width; x1++) {

-		coordinates = new Point(x1, y);

-		coordinates = tree.toControl(coordinates);

+		coordinates = new Point(x1, coordinates.y);

 		item = tree.getItem(coordinates);

 		if (item != null) return item;

 	}

+	// Check if we are just below the last item of the tree

+	coordinates = new Point(x, y);

+	coordinates = tree.toControl(coordinates);

+	if (coordinates.y > area.y + area.height - tree.getItemHeight()) {;

+		int y1 = area.y + area.height - tree.getItemHeight();

+		coordinates = new Point(coordinates.x, y1);

+		

+		item = tree.getItem(coordinates);	

+		if (item != null) return item;

+		

+		// Scan across the width of the tree just above the bottom..

+		for (int x1 = area.x; x1 < area.x + area.width; x1++) {

+			coordinates = new Point(x1, y1);

+			item = tree.getItem(coordinates);

+			if (item != null) return item;

+		}

+	}

 	return null;

 }

 private void setDragUnderEffect(int effect, TreeItem item) {

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh
index c161fad71f..5a07ec1c09 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/library/build.csh
@@ -10,7 +10,7 @@
 # calls so java can query the swt shared library version number
 
 setenv MAJOR_VER  0
-setenv MINOR_VER  121
+setenv MINOR_VER  122
 setenv BUILD_NUM  0
 
 # Some UNIX/Linux compilers don't like <CR>'s in files (DOS format).
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak b/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak
index 1ad237c00a..029d6a6c03 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/library/makefile.mak
@@ -4,7 +4,7 @@
 # All Rights Reserved.
 
 maj_ver=0
-min_ver=120
+min_ver=122
 revision=0
 
 #assumes IVE_HOME is set in the environment
diff --git a/bundles/org.eclipse.swt/ws/motif/libswt-gnome0121.so b/bundles/org.eclipse.swt/ws/motif/libswt-gnome0122.so
index 3c3ba7ecda..3c3ba7ecda 100755
--- a/bundles/org.eclipse.swt/ws/motif/libswt-gnome0121.so
+++ b/bundles/org.eclipse.swt/ws/motif/libswt-gnome0122.so
diff --git a/bundles/org.eclipse.swt/ws/motif/libswt0121.so b/bundles/org.eclipse.swt/ws/motif/libswt0122.so
index 595e9e3427..7d025a7769 100755
--- a/bundles/org.eclipse.swt/ws/motif/libswt0121.so
+++ b/bundles/org.eclipse.swt/ws/motif/libswt0122.so
diff --git a/bundles/org.eclipse.swt/ws/photon/libswt0122.so b/bundles/org.eclipse.swt/ws/photon/libswt0122.so
new file mode 100755
index 0000000000..59e5bd92b7
--- /dev/null
+++ b/bundles/org.eclipse.swt/ws/photon/libswt0122.so