diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse')
9 files changed, 38 insertions, 25 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontMetrics.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontMetrics.java index f7e15959d7..cbf707d4a6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontMetrics.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontMetrics.java @@ -52,7 +52,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 */ @@ -61,7 +61,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 @@ -72,7 +72,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 @@ -87,7 +87,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 */ @@ -97,7 +97,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/gtk/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java index aa8871cb3d..5b503353c3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/GC.java @@ -667,8 +667,8 @@ void destroy() { * 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 to be drawn @@ -922,7 +922,7 @@ void drawLineInPixels(int x1, int y1, int x2, int y2) { * <code>width</code>, and <code>height</code> arguments. * </p><p> * The oval covers an area that is <code>width + 1</code> - * pixels wide and <code>height + 1</code> pixels tall. + * points wide and <code>height + 1</code> points tall. * </p> * * @param x the x coordinate of the upper left corner of the oval to be drawn @@ -1005,7 +1005,7 @@ public void drawPath(Path path) { } /** - * Draws a pixel, using the foreground color, at the specified + * Draws an SWT logical point, using the foreground color, at the specified * point (<code>x</code>, <code>y</code>). * <p> * Note that the receiver's line attributes do not affect this @@ -1445,8 +1445,8 @@ public boolean equals(Object object) { * 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 to be filled diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java index 2abaa29789..ccaef78224 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java @@ -1133,7 +1133,7 @@ public ImageData getImageDataAtCurrentZoom () { * * @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 an <code>ImageData</code> containing the image's data and * attributes at the given zoom level diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java index ae5ddcd5dc..3f42472bee 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java @@ -1727,7 +1727,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. @@ -1753,7 +1753,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/gtk/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java index c4bcb95a76..ffb9c51a53 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Display.java @@ -1545,6 +1545,19 @@ public Rectangle getBounds () { return DPIUtil.autoScaleDown (getBoundsInPixels ()); } +/** + * Returns a rectangle which describes the area of the + * receiver which is capable of displaying data. + * + * @return the client area + * + * @exception SWTException <ul> + * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li> + * <li>ERROR_DEVICE_DISPOSED - if the receiver has been disposed</li> + * </ul> + * + * @see #getBounds + */ @Override public Rectangle getClientArea () { if (OS.isX11()) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java index a468cd069a..ac750606eb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java @@ -513,7 +513,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/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java index 648eca932e..abe91217a6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java @@ -1394,9 +1394,9 @@ TableItem 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> diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java index f14fa0882d..a43c243c4f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java @@ -1417,19 +1417,19 @@ public int getTopIndex () { } /** - * Returns the top pixel. + * Returns the top SWT logical point. * <p> - * The top pixel is the pixel position of the line + * The top point is the SWT logical point position of the line * that is currently at the top of the widget. On * some platforms, a text widget can be scrolled by - * pixels instead of lines so that a partial line + * points instead of lines so that a partial line * is displayed at the top of the widget. * </p><p> - * The top pixel changes when the widget is scrolled. - * The top pixel does not include the widget trimming. + * The top SWT logical point changes when the widget is scrolled. + * The top SWT logical point does not include the widget trimming. * </p> * - * @return the pixel position of the top line + * @return the SWT logical point position of the top line * * @exception SWTException <ul> * <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li> diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java index e18408debd..ec84a7ccef 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java @@ -1432,9 +1432,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> |