Bug 494453 Part1 - [HiDPI] Update Javadocs that talk about pixels to

points

Change-Id: I0fd4dc514459abf1752677086f5e7bc410adff3e
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>

22 files changed, 92 insertions, 92 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
index a9915376cb..90266ef8c7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -809,7 +809,7 @@ public void setBackground(Image image) {
 
 }
 /**
- * Set the label's bottom margin, in pixels.
+ * Set the label's bottom margin, in points.
  *
  * @param bottomMargin the bottom margin of the label, which must be equal to or greater than zero
  *
@@ -850,7 +850,7 @@ public void setImage(Image image) {
 	}
 }
 /**
- * Set the label's horizontal left margin, in pixels.
+ * Set the label's horizontal left margin, in points.
  *
  * @param leftMargin the left margin of the label, which must be equal to or greater than zero
  *
@@ -868,7 +868,7 @@ public void setLeftMargin(int leftMargin) {
     redraw();
 }
 /**
- * Set the label's margins, in pixels.
+ * Set the label's margins, in points.
  *
  * @param leftMargin the left margin.
  * @param topMargin the top margin.
@@ -890,7 +890,7 @@ public void setMargins (int leftMargin, int topMargin, int rightMargin, int bott
 	redraw();
 }
 /**
- * Set the label's right margin, in pixels.
+ * Set the label's right margin, in points.
  *
  * @param rightMargin the right margin of the label, which must be equal to or greater than zero
  *
@@ -945,7 +945,7 @@ public void setToolTipText (String string) {
 	appToolTipText = super.getToolTipText();
 }
 /**
- * Set the label's top margin, in pixels.
+ * Set the label's top margin, in points.
  *
  * @param topMargin the top margin of the label, which must be equal to or greater than zero
  *
@@ -970,7 +970,7 @@ public void setTopMargin(int topMargin) {
  *
  * @param gc the gc to use for text measurement
  * @param t the text to shorten
- * @param width the width to shorten the text to, in pixels
+ * @param width the width to shorten the text to, in points
  * @return the shortened text
  */
 protected String shortenText(GC gc, String t, int width) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
index 02907d9ff0..202d75a488 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -58,14 +58,14 @@ import org.eclipse.swt.widgets.*;
 public class CTabFolder extends Composite {
 
 	/**
-	 * marginWidth specifies the number of pixels of horizontal margin
+	 * marginWidth specifies the number of points of horizontal margin
 	 * that will be placed along the left and right edges of the form.
 	 *
 	 * The default value is 0.
 	 */
  	public int marginWidth = 0;
 	/**
-	 * marginHeight specifies the number of pixels of vertical margin
+	 * marginHeight specifies the number of points of vertical margin
 	 * that will be placed along the top and bottom edges of the form.
 	 *
 	 * The default value is 0.
@@ -3472,7 +3472,7 @@ int getControlY(Point size, Rectangle[] rects, int borderBottom, int borderTop,
  * the default height is the height of the text or the image, whichever
  * is greater. Specifying a height of -1 will revert to the default height.
  *
- * @param height the pixel value of the height or -1
+ * @param height the point value of the height or -1
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java
index c6598f76b2..4b4958b4fe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -72,14 +72,14 @@ import org.eclipse.swt.widgets.*;
 public class StackLayout extends Layout {
 
  	/**
-	 * marginWidth specifies the number of pixels of horizontal margin
+	 * marginWidth specifies the number of points of horizontal margin
 	 * that will be placed along the left and right edges of the layout.
 	 *
 	 * The default value is 0.
 	 */
  	public int marginWidth = 0;
 	/**
-	 * marginHeight specifies the number of pixels of vertical margin
+	 * marginHeight specifies the number of points of vertical margin
 	 * that will be placed along the top and bottom edges of the layout.
 	 *
 	 * The default value is 0.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java
index ca3eb0cc39..c067e960c4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -44,21 +44,21 @@ import org.eclipse.swt.widgets.*;
 public class ViewForm extends Composite {
 
 	/**
-	 * marginWidth specifies the number of pixels of horizontal margin
+	 * marginWidth specifies the number of points of horizontal margin
 	 * that will be placed along the left and right edges of the form.
 	 *
 	 * The default value is 0.
 	 */
  	public int marginWidth = 0;
 	/**
-	 * marginHeight specifies the number of pixels of vertical margin
+	 * marginHeight specifies the number of points of vertical margin
 	 * that will be placed along the top and bottom edges of the form.
 	 *
 	 * The default value is 0.
 	 */
  	public int marginHeight = 0;
  	/**
-	 * horizontalSpacing specifies the number of pixels between the right
+	 * horizontalSpacing specifies the number of points between the right
 	 * edge of one cell and the left edge of its neighbouring cell to
 	 * the right.
 	 *
@@ -66,7 +66,7 @@ public class ViewForm extends Composite {
 	 */
  	public int horizontalSpacing = 1;
 	/**
-	 * verticalSpacing specifies the number of pixels between the bottom
+	 * verticalSpacing specifies the number of points between the bottom
 	 * edge of one cell and the top edge of its neighbouring cell underneath.
 	 *
 	 * The default value is 1.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataProvider.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataProvider.java
index 3c86a4b8c2..bfa0ec70a7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataProvider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataProvider.java
@@ -35,7 +35,7 @@ public interface ImageDataProvider {
 	 *
 	 * @param zoom
 	 *            The zoom level in % of the standard resolution (which is 1
-	 *            physical monitor pixel == 1 SWT logical pixel). Typically 100,
+	 *            physical monitor pixel == 1 SWT logical point). Typically 100,
 	 *            150, or 200.
 	 * @return the image data, or <code>null</code> if <code>zoom != 100</code>
 	 *         and no image is available for the given zoom level.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageFileNameProvider.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageFileNameProvider.java
index 00ed39b144..2413cda323 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageFileNameProvider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageFileNameProvider.java
@@ -34,7 +34,7 @@ public interface ImageFileNameProvider {
 	 *
 	 * @param zoom
 	 *            The zoom level in % of the standard resolution (which is 1
-	 *            physical monitor pixel == 1 SWT logical pixel). Typically 100,
+	 *            physical monitor pixel == 1 SWT logical point). Typically 100,
 	 *            150, or 200.
 	 * @return the image filePath, or <code>null</code> if
 	 *         <code>zoom != 100</code> and no image is available for the given
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java
index 0d0a4f9856..517389ee28 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -61,7 +61,7 @@ public final class FillLayout extends Layout {
 	public int type = SWT.HORIZONTAL;
 
 	/**
-	 * marginWidth specifies the number of pixels of horizontal margin
+	 * marginWidth specifies the number of points of horizontal margin
 	 * that will be placed along the left and right edges of the layout.
 	 *
 	 * The default value is 0.
@@ -71,7 +71,7 @@ public final class FillLayout extends Layout {
  	public int marginWidth = 0;
 
 	/**
-	 * marginHeight specifies the number of pixels of vertical margin
+	 * marginHeight specifies the number of points of vertical margin
 	 * that will be placed along the top and bottom edges of the layout.
 	 *
 	 * The default value is 0.
@@ -81,7 +81,7 @@ public final class FillLayout extends Layout {
  	public int marginHeight = 0;
 
  	/**
-	 * spacing specifies the number of pixels between the edge of one cell
+	 * spacing specifies the number of points between the edge of one cell
 	 * and the edge of its neighbouring cell.
 	 *
 	 * The default value is 0.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormAttachment.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormAttachment.java
index aa84475dbc..f3a9a079f9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormAttachment.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormAttachment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -95,7 +95,7 @@ public final class FormAttachment {
 	public int denominator = 100;
 
 	/**
-	 * offset specifies the offset, in pixels, of the control side
+	 * offset specifies the offset, in points, of the control side
 	 * from the attachment position.
 	 * If the offset is positive, then the control side is offset
 	 * to the right of or below the attachment position. If it is
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormData.java
index ef9288290f..cb0bf0e299 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -48,7 +48,7 @@ import org.eclipse.swt.widgets.*;
  */
 public final class FormData {
 	/**
-	 * width specifies the preferred width in pixels. This value
+	 * width specifies the preferred width in points. This value
 	 * is the wHint passed into Control.computeSize(int, int, boolean)
 	 * to determine the preferred size of the control.
 	 *
@@ -58,7 +58,7 @@ public final class FormData {
 	 */
 	public int width = SWT.DEFAULT;
 	/**
-	 * height specifies the preferred height in pixels. This value
+	 * height specifies the preferred height in points. This value
 	 * is the hHint passed into Control.computeSize(int, int, boolean)
 	 * to determine the preferred size of the control.
 	 *
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormLayout.java
index dd0a117892..151b7936fa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FormLayout.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -92,7 +92,7 @@ import org.eclipse.swt.widgets.*;
 public final class FormLayout extends Layout {
 
 	/**
-	 * marginWidth specifies the number of pixels of horizontal margin
+	 * marginWidth specifies the number of points of horizontal margin
 	 * that will be placed along the left and right edges of the layout.
 	 *
 	 * The default value is 0.
@@ -100,7 +100,7 @@ public final class FormLayout extends Layout {
  	public int marginWidth = 0;
 
 	/**
-	 * marginHeight specifies the number of pixels of vertical margin
+	 * marginHeight specifies the number of points of vertical margin
 	 * that will be placed along the top and bottom edges of the layout.
 	 *
 	 * The default value is 0.
@@ -109,7 +109,7 @@ public final class FormLayout extends Layout {
 
 
  	/**
-	 * marginLeft specifies the number of pixels of horizontal margin
+	 * marginLeft specifies the number of points of horizontal margin
 	 * that will be placed along the left edge of the layout.
 	 *
 	 * The default value is 0.
@@ -119,7 +119,7 @@ public final class FormLayout extends Layout {
 	public int marginLeft = 0;
 
 	/**
-	 * marginTop specifies the number of pixels of vertical margin
+	 * marginTop specifies the number of points of vertical margin
 	 * that will be placed along the top edge of the layout.
 	 *
 	 * The default value is 0.
@@ -129,7 +129,7 @@ public final class FormLayout extends Layout {
 	public int marginTop = 0;
 
 	/**
-	 * marginRight specifies the number of pixels of horizontal margin
+	 * marginRight specifies the number of points of horizontal margin
 	 * that will be placed along the right edge of the layout.
 	 *
 	 * The default value is 0.
@@ -139,7 +139,7 @@ public final class FormLayout extends Layout {
 	public int marginRight = 0;
 
 	/**
-	 * marginBottom specifies the number of pixels of vertical margin
+	 * marginBottom specifies the number of points of vertical margin
 	 * that will be placed along the bottom edge of the layout.
 	 *
 	 * The default value is 0.
@@ -149,7 +149,7 @@ public final class FormLayout extends Layout {
 	public int marginBottom = 0;
 
 	/**
-	 * spacing specifies the number of pixels between the edge of one control
+	 * spacing specifies the number of points between the edge of one control
 	 * and the edge of its neighbouring control.
 	 *
 	 * The default value is 0.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java
index a83ca5e2da..afd496d522 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -88,7 +88,7 @@ public final class GridData {
 	public int horizontalAlignment = BEGINNING;
 
 	/**
-	 * widthHint specifies the preferred width in pixels. This value
+	 * widthHint specifies the preferred width in points. This value
 	 * is the wHint passed into Control.computeSize(int, int, boolean)
 	 * to determine the preferred size of the control.
 	 *
@@ -99,7 +99,7 @@ public final class GridData {
 	public int widthHint = SWT.DEFAULT;
 
 	/**
-	 * heightHint specifies the preferred height in pixels. This value
+	 * heightHint specifies the preferred height in points. This value
 	 * is the hHint passed into Control.computeSize(int, int, boolean)
 	 * to determine the preferred size of the control.
 	 *
@@ -110,7 +110,7 @@ public final class GridData {
 	public int heightHint = SWT.DEFAULT;
 
 	/**
-	 * horizontalIndent specifies the number of pixels of indentation
+	 * horizontalIndent specifies the number of points of indentation
 	 * that will be placed along the left side of the cell.
 	 *
 	 * The default value is 0.
@@ -118,7 +118,7 @@ public final class GridData {
 	public int horizontalIndent = 0;
 
 	/**
-	 * verticalIndent specifies the number of pixels of indentation
+	 * verticalIndent specifies the number of points of indentation
 	 * that will be placed along the top side of the cell.
 	 *
 	 * The default value is 0.
@@ -206,7 +206,7 @@ public final class GridData {
 	public boolean grabExcessVerticalSpace = false;
 
 	/**
-	 * minimumWidth specifies the minimum width in pixels.  This value
+	 * minimumWidth specifies the minimum width in points.  This value
 	 * applies only if grabExcessHorizontalSpace is true. A value of
 	 * SWT.DEFAULT means that the minimum width will be the result
 	 * of Control.computeSize(int, int, boolean) where wHint is
@@ -221,7 +221,7 @@ public final class GridData {
 	public int minimumWidth = 0;
 
 	/**
-	 * minimumHeight specifies the minimum height in pixels.  This value
+	 * minimumHeight specifies the minimum height in points.  This value
 	 * applies only if grabExcessVerticalSpace is true.  A value of
 	 * SWT.DEFAULT means that the minimum height will be the result
 	 * of Control.computeSize(int, int, boolean) where hHint is
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java
index d8a3f66581..d7868ceb55 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -67,7 +67,7 @@ public final class GridLayout extends Layout {
 	public boolean makeColumnsEqualWidth = false;
 
 	/**
-	 * marginWidth specifies the number of pixels of horizontal margin
+	 * marginWidth specifies the number of points of horizontal margin
 	 * that will be placed along the left and right edges of the layout.
 	 *
 	 * The default value is 5.
@@ -75,7 +75,7 @@ public final class GridLayout extends Layout {
  	public int marginWidth = 5;
 
 	/**
-	 * marginHeight specifies the number of pixels of vertical margin
+	 * marginHeight specifies the number of points of vertical margin
 	 * that will be placed along the top and bottom edges of the layout.
 	 *
 	 * The default value is 5.
@@ -83,7 +83,7 @@ public final class GridLayout extends Layout {
  	public int marginHeight = 5;
 
  	/**
-	 * marginLeft specifies the number of pixels of horizontal margin
+	 * marginLeft specifies the number of points of horizontal margin
 	 * that will be placed along the left edge of the layout.
 	 *
 	 * The default value is 0.
@@ -93,7 +93,7 @@ public final class GridLayout extends Layout {
 	public int marginLeft = 0;
 
 	/**
-	 * marginTop specifies the number of pixels of vertical margin
+	 * marginTop specifies the number of points of vertical margin
 	 * that will be placed along the top edge of the layout.
 	 *
 	 * The default value is 0.
@@ -103,7 +103,7 @@ public final class GridLayout extends Layout {
 	public int marginTop = 0;
 
 	/**
-	 * marginRight specifies the number of pixels of horizontal margin
+	 * marginRight specifies the number of points of horizontal margin
 	 * that will be placed along the right edge of the layout.
 	 *
 	 * The default value is 0.
@@ -113,7 +113,7 @@ public final class GridLayout extends Layout {
 	public int marginRight = 0;
 
 	/**
-	 * marginBottom specifies the number of pixels of vertical margin
+	 * marginBottom specifies the number of points of vertical margin
 	 * that will be placed along the bottom edge of the layout.
 	 *
 	 * The default value is 0.
@@ -123,7 +123,7 @@ public final class GridLayout extends Layout {
 	public int marginBottom = 0;
 
 	/**
-	 * horizontalSpacing specifies the number of pixels between the right
+	 * horizontalSpacing specifies the number of points between the right
 	 * edge of one cell and the left edge of its neighbouring cell to
 	 * the right.
 	 *
@@ -132,7 +132,7 @@ public final class GridLayout extends Layout {
  	public int horizontalSpacing = 5;
 
 	/**
-	 * verticalSpacing specifies the number of pixels between the bottom
+	 * verticalSpacing specifies the number of points between the bottom
 	 * edge of one cell and the top edge of its neighbouring cell underneath.
 	 *
 	 * The default value is 5.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java
index 19c0c56d52..b85bfdb82c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -38,7 +38,7 @@ import org.eclipse.swt.graphics.*;
  */
 public final class RowData {
 	/**
-	 * width specifies the desired width in pixels. This value
+	 * width specifies the desired width in points. This value
 	 * is the wHint passed into Control.computeSize(int, int, boolean)
 	 * to determine the preferred size of the control.
 	 *
@@ -48,7 +48,7 @@ public final class RowData {
 	 */
 	public int width = SWT.DEFAULT;
 	/**
-	 * height specifies the preferred height in pixels. This value
+	 * height specifies the preferred height in points. This value
 	 * is the hHint passed into Control.computeSize(int, int, boolean)
 	 * to determine the preferred size of the control.
 	 *
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java
index 0072d6b8f0..e1c1d584f7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -76,7 +76,7 @@ public final class RowLayout extends Layout {
 	public int type = SWT.HORIZONTAL;
 
 	/**
-	 * marginWidth specifies the number of pixels of horizontal margin
+	 * marginWidth specifies the number of points of horizontal margin
 	 * that will be placed along the left and right edges of the layout.
 	 *
 	 * The default value is 0.
@@ -86,7 +86,7 @@ public final class RowLayout extends Layout {
  	public int marginWidth = 0;
 
 	/**
-	 * marginHeight specifies the number of pixels of vertical margin
+	 * marginHeight specifies the number of points of vertical margin
 	 * that will be placed along the top and bottom edges of the layout.
 	 *
 	 * The default value is 0.
@@ -96,7 +96,7 @@ public final class RowLayout extends Layout {
  	public int marginHeight = 0;
 
 	/**
-	 * spacing specifies the number of pixels between the edge of one cell
+	 * spacing specifies the number of points between the edge of one cell
 	 * and the edge of its neighbouring cell.
 	 *
 	 * The default value is 3.
@@ -153,7 +153,7 @@ public final class RowLayout extends Layout {
 	public boolean justify = false;
 
 	/**
-	 * marginLeft specifies the number of pixels of horizontal margin
+	 * marginLeft specifies the number of points of horizontal margin
 	 * that will be placed along the left edge of the layout.
 	 *
 	 * The default value is 3.
@@ -161,7 +161,7 @@ public final class RowLayout extends Layout {
 	public int marginLeft = 3;
 
 	/**
-	 * marginTop specifies the number of pixels of vertical margin
+	 * marginTop specifies the number of points of vertical margin
 	 * that will be placed along the top edge of the layout.
 	 *
 	 * The default value is 3.
@@ -169,7 +169,7 @@ public final class RowLayout extends Layout {
 	public int marginTop = 3;
 
 	/**
-	 * marginRight specifies the number of pixels of horizontal margin
+	 * marginRight specifies the number of points of horizontal margin
 	 * that will be placed along the right edge of the layout.
 	 *
 	 * The default value is 3.
@@ -177,7 +177,7 @@ public final class RowLayout extends Layout {
 	public int marginRight = 3;
 
 	/**
-	 * marginBottom specifies the number of pixels of vertical margin
+	 * marginBottom specifies the number of points of vertical margin
 	 * that will be placed along the bottom edge of the layout.
 	 *
 	 * The default value is 3.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java
index 9b0dce1676..6fc2f6b6b5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -322,7 +322,7 @@ public Control getControl () {
  * Returns the minimum size that the cool item can
  * be resized to using the cool item's gripper.
  *
- * @return a point containing the minimum width and height of the cool item, in pixels
+ * @return a point containing the minimum width and height of the cool item, in SWT logical points
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -484,8 +484,8 @@ public void setControl (Control control) {
  * Sets the minimum size that the cool item can be resized to
  * using the cool item's gripper, to the point specified by the arguments.
  *
- * @param width the minimum width of the cool item, in pixels
- * @param height the minimum height of the cool item, in pixels
+ * @param width the minimum width of the cool item, in points
+ * @param height the minimum height of the cool item, in points
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -504,7 +504,7 @@ public void setMinimumSize (int width, int height) {
  * Sets the minimum size that the cool item can be resized to
  * using the cool item's gripper, to the point specified by the argument.
  *
- * @param size a point representing the minimum width and height of the cool item, in pixels
+ * @param size a point representing the minimum width and height of the cool item, in SWT logical points
  *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
index 8b73c2acf6..5bca68c128 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -90,7 +90,7 @@ public boolean equals (Object object) {
  * Returns the ascent of the font described by the receiver. A
  * font's <em>ascent</em> is the distance from the baseline to the
  * top of actual characters, not including any of the leading area,
- * measured in pixels.
+ * measured in points.
  *
  * @return the ascent of the font
  */
@@ -99,7 +99,7 @@ public int getAscent() {
 }
 
 /**
- * Returns the average character width, measured in pixels,
+ * Returns the average character width, measured in points,
  * of the font described by the receiver.
  *
  * @return the average character width of the font
@@ -110,7 +110,7 @@ public double getAverageCharacterWidth() {
 }
 
 /**
- * Returns the average character width, measured in pixels,
+ * Returns the average character width, measured in points,
  * of the font described by the receiver.
  *
  * @return the average character width of the font
@@ -124,7 +124,7 @@ public int getAverageCharWidth() {
  * Returns the descent of the font described by the receiver. A
  * font's <em>descent</em> is the distance from the baseline to the
  * bottom of actual characters, not including any of the leading area,
- * measured in pixels.
+ * measured in points.
  *
  * @return the descent of the font
  */
@@ -134,7 +134,7 @@ public int getDescent() {
 
 /**
  * Returns the height of the font described by the receiver,
- * measured in pixels. A font's <em>height</em> is the sum of
+ * measured in points. A font's <em>height</em> is the sum of
  * its ascent, descent and leading area.
  *
  * @return the height of the font
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
index 694367356f..177756e280 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -183,8 +183,8 @@ public Path (Device device, PathData data) {
  * is (<code>x</code>, <code>y</code>) and whose size is specified by the
  * <code>width</code> and <code>height</code> arguments.
  * </p><p>
- * The resulting arc covers an area <code>width + 1</code> pixels wide
- * by <code>height + 1</code> pixels tall.
+ * The resulting arc covers an area <code>width + 1</code> points wide
+ * by <code>height + 1</code> points tall.
  * </p>
  *
  * @param x the x coordinate of the upper-left corner of the arc
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
index 27f27d8573..e3c730ca8f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
@@ -2896,7 +2896,7 @@ public void setAlignment (int alignment) {
 }
 
 /**
- * Sets the ascent of the receiver. The ascent is distance in pixels
+ * Sets the ascent of the receiver. The ascent is distance in points
  * from the baseline to the top of the line and it is applied to all
  * lines. The default value is <code>-1</code> which means that the
  * ascent is calculated from the line fonts.
@@ -2923,7 +2923,7 @@ public void setAscent (int ascent) {
 }
 
 /**
- * Sets the descent of the receiver. The descent is distance in pixels
+ * Sets the descent of the receiver. The descent is distance in points
  * from the baseline to the bottom of the line and it is applied to all
  * lines. The default value is <code>-1</code> which means that the
  * descent is calculated from the line fonts.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
index 73aabb64c8..05bbc0aa80 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -601,7 +601,7 @@ public void setSize (Point size) {
  * Returns the minimum size that the cool item can
  * be resized to using the cool item's gripper.
  *
- * @return a point containing the minimum width and height of the cool item, in pixels
+ * @return a point containing the minimum width and height of the cool item, in SWT logical points
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -633,8 +633,8 @@ Point getMinimumSizeInPixels () {
  * Sets the minimum size that the cool item can be resized to
  * using the cool item's gripper, to the point specified by the arguments.
  *
- * @param width the minimum width of the cool item, in pixels
- * @param height the minimum height of the cool item, in pixels
+ * @param width the minimum width of the cool item, in SWT logical points
+ * @param height the minimum height of the cool item, in SWT logical points
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -680,7 +680,7 @@ void setMinimumSizeInPixels (int width, int height) {
  * Sets the minimum size that the cool item can be resized to
  * using the cool item's gripper, to the point specified by the argument.
  *
- * @param size a point representing the minimum width and height of the cool item, in pixels
+ * @param size a point representing the minimum width and height of the cool item, in SWT logical points
  *
  * @exception IllegalArgumentException <ul>
  *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
index 0a784dc2df..90f8ee42d8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -552,7 +552,7 @@ void setScrollbar () {
 }
 
 /**
- * Sets the receiver's spacing. Spacing specifies the number of pixels allocated around
+ * Sets the receiver's spacing. Spacing specifies the number of points allocated around
  * each item.
  *
  * @param spacing the spacing around each item
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
index 3229874a2b..3554e74ff8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
@@ -2343,9 +2343,9 @@ int getFocusIndex () {
 }
 
 /**
- * Returns the width in pixels of a grid line.
+ * Returns the width in points of a grid line.
  *
- * @return the width of a grid line in pixels
+ * @return the width of a grid line in points
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
index 0300245b74..b92d9ad6cb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
@@ -2875,9 +2875,9 @@ TreeItem getFocusItem () {
 }
 
 /**
- * Returns the width in pixels of a grid line.
+ * Returns the width in points of a grid line.
  *
- * @return the width of a grid line in pixels
+ * @return the width of a grid line in points
  *
  * @exception SWTException <ul>
  *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>