Bug 454590: Link widget should not scroll its contentsI20150120-0800

3 files changed, 12 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index 13fd2f9889..88324b5c08 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -2874,6 +2874,10 @@
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
+		<method selector="setVerticalScrollElasticity:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="setVerticalScroller:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
@@ -4896,6 +4900,7 @@
 	<enum name="NSRoundedBezelStyle" swt_gen="true"></enum>
 	<enum name="NSRoundedDisclosureBezelStyle" swt_gen="true"></enum>
 	<enum name="NSScaleNone" swt_gen="true"></enum>
+	<enum name="NSScrollElasticityNone" swt_gen="true"></enum>
 	<enum name="NSScrollWheel" swt_gen="true"></enum>
 	<enum name="NSScrollerDecrementLine" swt_gen="true"></enum>
 	<enum name="NSScrollerDecrementPage" swt_gen="true"></enum>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
index 19620bf088..3c586cf885 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -90,6 +90,10 @@ public void setHorizontalScroller(NSScroller anObject) {
 	OS.objc_msgSend(this.id, OS.sel_setHorizontalScroller_, anObject != null ? anObject.id : 0);
 }
 
+public void setVerticalScrollElasticity(long /*int*/ elasticity) {
+	OS.objc_msgSend(this.id, OS.sel_setVerticalScrollElasticity_, elasticity);
+}
+
 public void setVerticalScroller(NSScroller anObject) {
 	OS.objc_msgSend(this.id, OS.sel_setVerticalScroller_, anObject != null ? anObject.id : 0);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index d24676406a..9e3d914cfd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -2082,6 +2082,7 @@ public static final long /*int*/ sel_setValue_forHTTPHeaderField_ = sel_register
 public static final long /*int*/ sel_setValue_forKey_ = sel_registerName("setValue:forKey:");
 public static final long /*int*/ sel_setValueWraps_ = sel_registerName("setValueWraps:");
 public static final long /*int*/ sel_setValues_forParameter_ = sel_registerName("setValues:forParameter:");
+public static final long /*int*/ sel_setVerticalScrollElasticity_ = sel_registerName("setVerticalScrollElasticity:");
 public static final long /*int*/ sel_setVerticalScroller_ = sel_registerName("setVerticalScroller:");
 public static final long /*int*/ sel_setView_ = sel_registerName("setView:");
 public static final long /*int*/ sel_setVisible_ = sel_registerName("setVisible:");
@@ -2485,6 +2486,7 @@ public static final int NSRoundLineJoinStyle = 1;
 public static final int NSRoundedBezelStyle = 1;
 public static final int NSRoundedDisclosureBezelStyle = 14;
 public static final int NSScaleNone = 2;
+public static final int NSScrollElasticityNone = 1;
 public static final int NSScrollWheel = 22;
 public static final int NSScrollerDecrementLine = 4;
 public static final int NSScrollerDecrementPage = 1;